Skip to content

Commit b1a2742

Browse files
authored
Migrate extension_debugger_test, dart_uri_test, and location_test to null-safety (#1703)
1 parent 1e51b41 commit b1a2742

File tree

5 files changed

+15
-67
lines changed

5 files changed

+15
-67
lines changed

dwds/lib/src/servers/extension_debugger.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ class ExtensionDebugger implements RemoteDebugger {
4646

4747
Stream<WipEvent> get onNotification => _notificationController.stream;
4848

49-
final _closeController = StreamController<WipEvent>.broadcast();
49+
final _closeController = StreamController<Object>.broadcast();
5050

5151
@override
52-
Stream<WipEvent> get onClose => _closeController.stream;
52+
Stream<Object> get onClose => _closeController.stream;
5353

5454
@override
5555
Stream<ConsoleAPIEvent> get onConsoleAPICalled => eventStream(
@@ -153,7 +153,7 @@ class ExtensionDebugger implements RemoteDebugger {
153153

154154
@override
155155
void close() => _closed ??= () {
156-
_closeController.add(WipEvent({}));
156+
_closeController.add({});
157157
return Future.wait([
158158
sseConnection.sink.close(),
159159
_notificationController.close(),

dwds/test/dart_uri_test.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart = 2.9
6-
75
@TestOn('vm')
86
import 'dart:io';
97

@@ -18,7 +16,7 @@ import 'fixtures/fakes.dart';
1816

1917
class TestStrategy extends FakeStrategy {
2018
@override
21-
String serverPathForAppUri(String appUri) {
19+
String? serverPathForAppUri(String appUri) {
2220
if (appUri.startsWith('org-dartlang-app:')) return 'foo';
2321
return null;
2422
}
@@ -90,7 +88,7 @@ void main() {
9088
});
9189

9290
group('initialized with other SDK directory', () {
93-
Directory outputDir;
91+
late Directory outputDir;
9492

9593
setUpAll(() async {
9694
final systemTempDir = Directory.systemTemp;
@@ -117,7 +115,7 @@ void main() {
117115

118116
tearDownAll(() async {
119117
DartUri.clear();
120-
await outputDir?.delete(recursive: true);
118+
await outputDir.delete(recursive: true);
121119
});
122120

123121
test('can resolve uris', () {
@@ -133,11 +131,11 @@ void main() {
133131
});
134132

135133
group('initialized with other SDK directory with no libraries spec', () {
136-
Directory outputDir;
134+
late Directory outputDir;
137135
final logs = <String>[];
138136

139137
void logWriter(level, message,
140-
{String error, String loggerName, String stackTrace}) {
138+
{String? error, String? loggerName, String? stackTrace}) {
141139
final errorMessage = error == null ? '' : ':\n$error';
142140
final stackMessage = stackTrace == null ? '' : ':\n$stackTrace';
143141
logs.add('[$level] $loggerName: $message'
@@ -164,7 +162,7 @@ void main() {
164162

165163
tearDownAll(() async {
166164
DartUri.clear();
167-
await outputDir?.delete(recursive: true);
165+
await outputDir.delete(recursive: true);
168166
});
169167

170168
test('cannot resolve uris', () {

dwds/test/extension_debugger_test.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart = 2.9
6-
75
import 'dart:async';
86
import 'dart:convert';
97

@@ -17,8 +15,8 @@ import 'package:test/test.dart';
1715
import 'fixtures/debugger_data.dart';
1816
import 'fixtures/fakes.dart';
1917

20-
FakeSseConnection connection;
21-
ExtensionDebugger extensionDebugger;
18+
late FakeSseConnection connection;
19+
late ExtensionDebugger extensionDebugger;
2220

2321
void main() async {
2422
setUp(() async {

dwds/test/fixtures/fakes.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class FakeStrategy implements LoadStrategy {
302302
String loadClientSnippet(String clientScript) => 'dummy-load-client-snippet';
303303

304304
@override
305-
Future<String> moduleForServerPath(
305+
Future<String?> moduleForServerPath(
306306
String entrypoint, String serverPath) async =>
307307
'';
308308

@@ -316,7 +316,7 @@ class FakeStrategy implements LoadStrategy {
316316
'';
317317

318318
@override
319-
String serverPathForAppUri(String appUri) => '';
319+
String? serverPathForAppUri(String appUri) => '';
320320

321321
@override
322322
MetadataProvider metadataProviderFor(String entrypoint) =>

dwds/test/location_test.dart

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// @dart = 2.9
6-
7-
import 'package:dwds/expression_compiler.dart';
85
import 'package:dwds/src/debugging/location.dart';
9-
import 'package:dwds/src/debugging/metadata/provider.dart';
106
import 'package:dwds/src/debugging/modules.dart';
117
import 'package:dwds/src/loaders/strategy.dart';
128
import 'package:dwds/src/utilities/dart_uri.dart';
13-
import 'package:shelf/shelf.dart' as shelf;
149
import 'package:test/test.dart';
1510

1611
import 'fixtures/fakes.dart';
@@ -183,42 +178,9 @@ const _module = 'packages/module';
183178
const _serverPath = 'package/module.js';
184179
const _sourceMapPath = 'packages/module.js.map';
185180

186-
class MockLoadStrategy implements LoadStrategy {
187-
@override
188-
Future<String> bootstrapFor(String entrypoint) async => 'dummy_bootstrap';
189-
190-
@override
191-
shelf.Handler get handler =>
192-
(request) => (request.url.path == 'someDummyPath')
193-
? shelf.Response.ok('some dummy response')
194-
: null;
195-
196-
@override
197-
String get id => 'dummy-id';
198-
181+
class MockLoadStrategy extends FakeStrategy {
199182
@override
200-
String get moduleFormat => 'dummy-format';
201-
202-
@override
203-
String get loadLibrariesModule => '';
204-
205-
@override
206-
String get loadLibrariesSnippet => '';
207-
208-
@override
209-
String loadLibrarySnippet(String libraryUri) => '';
210-
211-
@override
212-
String get loadModuleSnippet => '';
213-
214-
@override
215-
ReloadConfiguration get reloadConfiguration => ReloadConfiguration.none;
216-
217-
@override
218-
String loadClientSnippet(String clientScript) => 'dummy-load-client-snippet';
219-
220-
@override
221-
Future<String> moduleForServerPath(
183+
Future<String?> moduleForServerPath(
222184
String entrypoint, String serverPath) async =>
223185
_module;
224186

@@ -233,16 +195,6 @@ class MockLoadStrategy implements LoadStrategy {
233195

234196
@override
235197
String serverPathForAppUri(String appUri) => _serverPath;
236-
237-
@override
238-
MetadataProvider metadataProviderFor(String entrypoint) => null;
239-
240-
@override
241-
void trackEntrypoint(String entrypoint) {}
242-
243-
@override
244-
Future<Map<String, ModuleInfo>> moduleInfoForEntrypoint(String entrypoint) =>
245-
throw UnimplementedError();
246198
}
247199

248200
class MockModules implements Modules {

0 commit comments

Comments
 (0)