Fix network cancellation test lints and typing

Author: rishika0212

packages/devtools_app/test/screens/network/network_model_test.dart

@@ -10,8 +10,8 @@ import 'package:devtools_test/devtools_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_infra/test_data/network.dart';
 import '../../test_infra/test_data/http_get_cancelled_json.dart';
+import '../../test_infra/test_data/network.dart';
 import 'utils/network_test_utils.dart';
 
 void main() {
@@ -511,9 +511,7 @@ void main() {
   test('cancelled request should not remain pending', () {
     // No controller needed — construct directly from fixture
     final cancelledRequest = DartIOHttpRequestData(
-      HttpProfileRequest.parse(
-        Map<String, dynamic>.from(httpGetCancelledJson),
-      )!,
+      HttpProfileRequest.parse(Map<String, dynamic>.of(httpGetCancelledJson))!,
       requestFullDataFromVmService: false,
     );
 
@@ -523,24 +521,27 @@ void main() {
     expect(cancelledRequest.duration, isNotNull);
   });
 
-  test('request with cancellation evidence is cancelled even with null endTime', () {
-    final inFlightData = Map<String, dynamic>.from(httpGetCancelledJson)
-      ..['endTime'] = null;
+  test(
+    'request with cancellation evidence is cancelled even with null endTime',
+    () {
+      final inFlightData = Map<String, dynamic>.of(httpGetCancelledJson)
+        ..['endTime'] = null;
 
-    final inFlightRequest = DartIOHttpRequestData(
-      HttpProfileRequest.parse(inFlightData)!,
-      requestFullDataFromVmService: false,
-    );
+      final inFlightRequest = DartIOHttpRequestData(
+        HttpProfileRequest.parse(inFlightData)!,
+        requestFullDataFromVmService: false,
+      );
 
-    expect(inFlightRequest.isCancelled, true);
-    expect(inFlightRequest.inProgress, false);
-    expect(inFlightRequest.status, 'Cancelled');
-    expect(inFlightRequest.duration, Duration.zero);
-  });
+      expect(inFlightRequest.isCancelled, true);
+      expect(inFlightRequest.inProgress, false);
+      expect(inFlightRequest.status, 'Cancelled');
+      expect(inFlightRequest.duration, Duration.zero);
+    },
+  );
 
   test('request without response and endTime is cancelled', () {
     final pendingRequest = DartIOHttpRequestData(
-      HttpProfileRequest.parse(Map<String, dynamic>.from(httpGetPendingJson))!,
+      HttpProfileRequest.parse(Map<String, dynamic>.of(httpGetPendingJson))!,
       requestFullDataFromVmService: false,
     );
 
@@ -551,7 +552,7 @@ void main() {
   });
 
   test('request without response and null endTime remains pending', () {
-    final pendingData = Map<String, dynamic>.from(httpGetPendingJson)
+    final pendingData = Map<String, dynamic>.of(httpGetPendingJson)
       ..['endTime'] = null;
 
     final pendingRequest = DartIOHttpRequestData(
@@ -566,11 +567,11 @@ void main() {
   });
 
   test('request with incomplete response and status code is completed', () {
-    final responseData = Map<String, dynamic>.from(
-      (httpGetJson['response'] as Map).cast<String, dynamic>(),
+    final responseData = Map<String, dynamic>.of(
+      httpGetJson['response'] as Map<String, Object?>,
     )..['endTime'] = null;
 
-    final cancelledWithStatusData = Map<String, dynamic>.from(httpGetJson)
+    final cancelledWithStatusData = Map<String, dynamic>.of(httpGetJson)
       ..['response'] = responseData;
 
     final cancelledWithStatusRequest = DartIOHttpRequestData(
@@ -585,13 +586,12 @@ void main() {
   });
 
   test('request with partial response and cancellation error is cancelled', () {
-    final responseData = Map<String, dynamic>.from(
-      (httpGetJson['response'] as Map).cast<String, dynamic>(),
-    )
-      ..['endTime'] = null
-      ..['error'] = 'Response stream aborted by client cancellation';
+    final responseData =
+        Map<String, dynamic>.of(httpGetJson['response'] as Map<String, Object?>)
+          ..['endTime'] = null
+          ..['error'] = 'Response stream aborted by client cancellation';
 
-    final cancelledDuringResponseData = Map<String, dynamic>.from(httpGetJson)
+    final cancelledDuringResponseData = Map<String, dynamic>.of(httpGetJson)
       ..['response'] = responseData;
 
     final cancelledDuringResponseRequest = DartIOHttpRequestData(
@@ -605,33 +605,36 @@ void main() {
     expect(cancelledDuringResponseRequest.duration, Duration.zero);
   });
 
-  test('request with partial response and generic response error is not cancelled', () {
-    final responseData = Map<String, dynamic>.from(
-      (httpGetJson['response'] as Map).cast<String, dynamic>(),
-    )
-      ..['endTime'] = null
-      ..['error'] = 'Connection closed before full response was received';
-
-    final cancelledDuringResponseData = Map<String, dynamic>.from(httpGetJson)
-      ..['response'] = responseData;
-
-    final cancelledDuringResponseRequest = DartIOHttpRequestData(
-      HttpProfileRequest.parse(cancelledDuringResponseData)!,
-      requestFullDataFromVmService: false,
-    );
+  test(
+    'request with partial response and generic response error is not cancelled',
+    () {
+      final responseData =
+          Map<String, dynamic>.of(
+              httpGetJson['response'] as Map<String, Object?>,
+            )
+            ..['endTime'] = null
+            ..['error'] = 'Connection closed before full response was received';
+
+      final cancelledDuringResponseData = Map<String, dynamic>.of(httpGetJson)
+        ..['response'] = responseData;
+
+      final cancelledDuringResponseRequest = DartIOHttpRequestData(
+        HttpProfileRequest.parse(cancelledDuringResponseData)!,
+        requestFullDataFromVmService: false,
+      );
 
-    expect(cancelledDuringResponseRequest.isCancelled, false);
-    expect(cancelledDuringResponseRequest.status, '200');
-  });
+      expect(cancelledDuringResponseRequest.isCancelled, false);
+      expect(cancelledDuringResponseRequest.status, '200');
+    },
+  );
 
   test('request with response hasError and status code is not cancelled', () {
-    final responseData = Map<String, dynamic>.from(
-      (httpGetJson['response'] as Map).cast<String, dynamic>(),
-    )
-      ..['error'] = 'HttpException: connection terminated'
-      ..['endTime'] = httpGetJson['endTime'];
+    final responseData =
+        Map<String, dynamic>.of(httpGetJson['response'] as Map<String, Object?>)
+          ..['error'] = 'HttpException: connection terminated'
+          ..['endTime'] = httpGetJson['endTime'];
 
-    final cancelledData = Map<String, dynamic>.from(httpGetJson)
+    final cancelledData = Map<String, dynamic>.of(httpGetJson)
       ..['response'] = responseData;
 
     final cancelledRequest = DartIOHttpRequestData(
@@ -644,11 +647,11 @@ void main() {
   });
 
   test('request with request hasError and response present is cancelled', () {
-    final requestData = Map<String, dynamic>.from(
-      (httpGetJson['request'] as Map).cast<String, dynamic>(),
+    final requestData = Map<String, dynamic>.of(
+      httpGetJson['request'] as Map<String, Object?>,
     )..['error'] = 'Cancelled by client before completion';
 
-    final cancelledData = Map<String, dynamic>.from(httpGetJson)
+    final cancelledData = Map<String, dynamic>.of(httpGetJson)
       ..['request'] = requestData;
 
     final cancelledRequest = DartIOHttpRequestData(
@@ -661,11 +664,11 @@ void main() {
   });
 
   test('request with request error and incomplete response is cancelled', () {
-    final requestData = Map<String, dynamic>.from(
-      (httpGetJson['request'] as Map).cast<String, dynamic>(),
+    final requestData = Map<String, dynamic>.of(
+      httpGetJson['request'] as Map<String, Object?>,
     )..['error'] = 'SocketException: connection reset by peer';
 
-    final cancelledData = Map<String, dynamic>.from(httpGetJson)
+    final cancelledData = Map<String, dynamic>.of(httpGetJson)
       ..['request'] = requestData
       ..['response'] = null;
 

packages/devtools_app/test/test_infra/test_data/http_get_cancelled_json.dart

@@ -13,22 +13,22 @@ const httpGetCancelledJson = <String, dynamic>{
   'isolateId': 'isolates/123',
   'method': 'GET',
   'uri': 'https://jsonplaceholder.typicode.com/albums/1',
-  'events': <dynamic>[
+  'events': <Map<String, Object>>[
     {'timestamp': 6326379935, 'event': 'Request cancelled by client'},
   ],
-  'startTime': 6326279935,  // microseconds
-  'endTime': 6326479935,    // 200ms later
+  'startTime': 6326279935, // microseconds
+  'endTime': 6326479935, // 200ms later
   'request': <String, dynamic>{
     'headers': <String, dynamic>{},
     'compressionState': 'HttpClientRequestCompressionState.notCompressed',
     'connectionInfo': null,
     'contentLength': 0,
-    'cookies': <dynamic>[],
+    'cookies': <Object>[],
     'followRedirects': true,
     'maxRedirects': 5,
     'method': 'GET',
     'persistentConnection': true,
     'uri': 'https://jsonplaceholder.typicode.com/albums/1',
   },
-  'response': null,   // ← key: no response
+  'response': null, // ← key: no response
 };