Migrate a handful of tests to null-safety (#1713)

Author: elliette

dwds/test/dart_uri_file_uri_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 @TestOn('vm')
 import 'dart:io';
 

dwds/test/debug_extension_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 // When run locally this test may require a manifest key. This makes it easy to
 // just skip it.
 @Tags(['extension'])
@@ -242,7 +240,7 @@ void main() async {
           'http://localhost:${context.port}/hello_world/main.dart$bootstrapJsExtension'));
       expect(result.body.contains('dartExtensionUri'), isTrue);
       final extensionUri =
-          Uri.parse(uriPattern.firstMatch(result.body).group(1));
+          Uri.parse(uriPattern.firstMatch(result.body)!.group(1)!);
       expect(
           extensionUri.host,
           anyOf(

dwds/test/debug_service_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 @TestOn('vm')
 import 'dart:async';
 import 'dart:convert';

dwds/test/devtools_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 @Timeout(Duration(minutes: 5))
 @TestOn('vm')
 import 'dart:io';

dwds/test/listviews_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'package:test/test.dart';
 
 import 'fixtures/context.dart';
@@ -23,12 +21,12 @@ void main() {
     final serviceMethod = '_flutter.listViews';
     final service = context.debugConnection.vmService;
     final vm = await service.getVM();
-    final isolates = vm.isolates;
+    final isolates = vm.isolates!;
 
     final expected = <String, Object>{
       'views': <Object>[
         for (var isolate in isolates)
-          <String, Object>{
+          <String, Object?>{
             'id': isolate.id,
             'isolate': isolate.toJson(),
           }

dwds/test/readers/proxy_server_asset_reader_test.dart

@@ -2,16 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'package:dwds/src/readers/proxy_server_asset_reader.dart';
 import 'package:test/test.dart';
 
 import '../fixtures/context.dart';
 
 void main() {
   final context = TestContext();
-  ProxyServerAssetReader assetReader;
+  late ProxyServerAssetReader assetReader;
   setUpAll(() async {
     await context.setUp();
     assetReader = context.testServer.assetReader as ProxyServerAssetReader;

dwds/test/refresh_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 /// Tests that require a fresh context to run, and can interfere with other
 /// tests.
 @TestOn('vm')
@@ -26,7 +24,7 @@ WipConnection get tabConnection => context.tabConnection;
 
 void main() {
   group('fresh context', () {
-    VM vm;
+    late VM vm;
     setUpAll(() async {
       await context.setUp();
       vm = await service.getVM();
@@ -48,18 +46,18 @@ void main() {
       // Wait for the refresh to propagate through.
       final isolateStart =
           await stream.firstWhere((e) => e.kind != EventKind.kIsolateStart);
-      final isolateId = isolateStart.isolate.id;
+      final isolateId = isolateStart.isolate!.id!;
       final refreshedScriptList = await service.getScripts(isolateId);
-      final refreshedMain = refreshedScriptList.scripts
-          .lastWhere((each) => each.uri.contains('main.dart'));
+      final refreshedMain = refreshedScriptList.scripts!
+          .lastWhere((each) => each.uri!.contains('main.dart'));
       final bpLine = await context.findBreakpointLine(
           'printHelloWorld', isolateId, refreshedMain);
       final bp =
-          await service.addBreakpoint(isolateId, refreshedMain.id, bpLine);
-      final isolate = await service.getIsolate(vm.isolates.first.id);
+          await service.addBreakpoint(isolateId, refreshedMain.id!, bpLine);
+      final isolate = await service.getIsolate(vm.isolates!.first.id!);
       expect(isolate.breakpoints, [bp]);
       expect(bp.id, isNotNull);
-      await service.removeBreakpoint(isolateId, bp.id);
+      await service.removeBreakpoint(isolateId, bp.id!);
       expect(isolate.breakpoints, isEmpty);
     });
   });

dwds/test/screenshot_test.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'package:test/test.dart';
 
 import 'fixtures/context.dart';
@@ -22,6 +20,6 @@ void main() {
   test('can take screenshots', () async {
     final response = await context.debugConnection.vmService
         .callServiceExtension('ext.dwds.screenshot');
-    expect(response.json['data'], isNotNull);
+    expect(response.json!['data'], isNotNull);
   });
 }