Migrate extension_debugger_test, dart_uri_test, and location_test to null-safety (#1703)

Author: elliette

dwds/lib/src/servers/extension_debugger.dart

@@ -46,10 +46,10 @@ class ExtensionDebugger implements RemoteDebugger {
 
   Stream<WipEvent> get onNotification => _notificationController.stream;
 
-  final _closeController = StreamController<WipEvent>.broadcast();
+  final _closeController = StreamController<Object>.broadcast();
 
   @override
-  Stream<WipEvent> get onClose => _closeController.stream;
+  Stream<Object> get onClose => _closeController.stream;
 
   @override
   Stream<ConsoleAPIEvent> get onConsoleAPICalled => eventStream(
@@ -153,7 +153,7 @@ class ExtensionDebugger implements RemoteDebugger {
 
   @override
   void close() => _closed ??= () {
-        _closeController.add(WipEvent({}));
+        _closeController.add({});
         return Future.wait([
           sseConnection.sink.close(),
           _notificationController.close(),

dwds/test/dart_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';
 
@@ -18,7 +16,7 @@ import 'fixtures/fakes.dart';
 
 class TestStrategy extends FakeStrategy {
   @override
-  String serverPathForAppUri(String appUri) {
+  String? serverPathForAppUri(String appUri) {
     if (appUri.startsWith('org-dartlang-app:')) return 'foo';
     return null;
   }
@@ -90,7 +88,7 @@ void main() {
     });
 
     group('initialized with other SDK directory', () {
-      Directory outputDir;
+      late Directory outputDir;
 
       setUpAll(() async {
         final systemTempDir = Directory.systemTemp;
@@ -117,7 +115,7 @@ void main() {
 
       tearDownAll(() async {
         DartUri.clear();
-        await outputDir?.delete(recursive: true);
+        await outputDir.delete(recursive: true);
       });
 
       test('can resolve uris', () {
@@ -133,11 +131,11 @@ void main() {
     });
 
     group('initialized with other SDK directory with no libraries spec', () {
-      Directory outputDir;
+      late Directory outputDir;
       final logs = <String>[];
 
       void logWriter(level, message,
-          {String error, String loggerName, String stackTrace}) {
+          {String? error, String? loggerName, String? stackTrace}) {
         final errorMessage = error == null ? '' : ':\n$error';
         final stackMessage = stackTrace == null ? '' : ':\n$stackTrace';
         logs.add('[$level] $loggerName: $message'
@@ -164,7 +162,7 @@ void main() {
 
       tearDownAll(() async {
         DartUri.clear();
-        await outputDir?.delete(recursive: true);
+        await outputDir.delete(recursive: true);
       });
 
       test('cannot resolve uris', () {

dwds/test/extension_debugger_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 'dart:async';
 import 'dart:convert';
 
@@ -17,8 +15,8 @@ import 'package:test/test.dart';
 import 'fixtures/debugger_data.dart';
 import 'fixtures/fakes.dart';
 
-FakeSseConnection connection;
-ExtensionDebugger extensionDebugger;
+late FakeSseConnection connection;
+late ExtensionDebugger extensionDebugger;
 
 void main() async {
   setUp(() async {

dwds/test/fixtures/fakes.dart

@@ -302,7 +302,7 @@ class FakeStrategy implements LoadStrategy {
   String loadClientSnippet(String clientScript) => 'dummy-load-client-snippet';
 
   @override
-  Future<String> moduleForServerPath(
+  Future<String?> moduleForServerPath(
           String entrypoint, String serverPath) async =>
       '';
 
@@ -316,7 +316,7 @@ class FakeStrategy implements LoadStrategy {
       '';
 
   @override
-  String serverPathForAppUri(String appUri) => '';
+  String? serverPathForAppUri(String appUri) => '';
 
   @override
   MetadataProvider metadataProviderFor(String entrypoint) =>

dwds/test/location_test.dart

@@ -2,15 +2,10 @@
 // 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/expression_compiler.dart';
 import 'package:dwds/src/debugging/location.dart';
-import 'package:dwds/src/debugging/metadata/provider.dart';
 import 'package:dwds/src/debugging/modules.dart';
 import 'package:dwds/src/loaders/strategy.dart';
 import 'package:dwds/src/utilities/dart_uri.dart';
-import 'package:shelf/shelf.dart' as shelf;
 import 'package:test/test.dart';
 
 import 'fixtures/fakes.dart';
@@ -183,42 +178,9 @@ const _module = 'packages/module';
 const _serverPath = 'package/module.js';
 const _sourceMapPath = 'packages/module.js.map';
 
-class MockLoadStrategy implements LoadStrategy {
-  @override
-  Future<String> bootstrapFor(String entrypoint) async => 'dummy_bootstrap';
-
-  @override
-  shelf.Handler get handler =>
-      (request) => (request.url.path == 'someDummyPath')
-          ? shelf.Response.ok('some dummy response')
-          : null;
-
-  @override
-  String get id => 'dummy-id';
-
+class MockLoadStrategy extends FakeStrategy {
   @override
-  String get moduleFormat => 'dummy-format';
-
-  @override
-  String get loadLibrariesModule => '';
-
-  @override
-  String get loadLibrariesSnippet => '';
-
-  @override
-  String loadLibrarySnippet(String libraryUri) => '';
-
-  @override
-  String get loadModuleSnippet => '';
-
-  @override
-  ReloadConfiguration get reloadConfiguration => ReloadConfiguration.none;
-
-  @override
-  String loadClientSnippet(String clientScript) => 'dummy-load-client-snippet';
-
-  @override
-  Future<String> moduleForServerPath(
+  Future<String?> moduleForServerPath(
           String entrypoint, String serverPath) async =>
       _module;
 
@@ -233,16 +195,6 @@ class MockLoadStrategy implements LoadStrategy {
 
   @override
   String serverPathForAppUri(String appUri) => _serverPath;
-
-  @override
-  MetadataProvider metadataProviderFor(String entrypoint) => null;
-
-  @override
-  void trackEntrypoint(String entrypoint) {}
-
-  @override
-  Future<Map<String, ModuleInfo>> moduleInfoForEntrypoint(String entrypoint) =>
-      throw UnimplementedError();
 }
 
 class MockModules implements Modules {