Skip to content

Commit 89fb338

Browse files
authored
Migrate expression compiler test (#1693)
1 parent 0cc9fa5 commit 89fb338

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

dwds/lib/src/services/expression_compiler_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class _Compiler {
3030
Future<Map<String, Object>> _send(Map<String, Object> request) async {
3131
_sendPort.send(request);
3232
return await _responseQueue.hasNext
33-
? await _responseQueue.next as Map<String, Object>
33+
? Map<String, Object>.from(await _responseQueue.next)
3434
: {
3535
'succeeded': false,
3636
'errors': ['compilation service response stream closed'],

dwds/test/expression_compiler_service_test.dart

Lines changed: 19 additions & 15 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:async';
97
import 'dart:convert';
@@ -19,21 +17,27 @@ import 'package:test/test.dart';
1917

2018
import 'fixtures/logging.dart';
2119

20+
ExpressionCompilerService get service => _service!;
21+
late ExpressionCompilerService? _service;
22+
23+
HttpServer get server => _server!;
24+
late HttpServer? _server;
25+
26+
StreamController<String> get output => _output!;
27+
late StreamController<String>? _output;
28+
2229
void main() async {
2330
group('expression compiler service with fake asset server', () {
2431
final logger = Logger('ExpressionCompilerServiceTest');
25-
ExpressionCompilerService service;
26-
HttpServer server;
27-
StreamController<String> output;
28-
Directory outputDir;
32+
late Directory outputDir;
2933

3034
Future<void> stop() async {
31-
await service?.stop();
32-
await server?.close();
33-
await output?.close();
34-
service = null;
35-
server = null;
36-
output = null;
35+
await _service?.stop();
36+
await _server?.close();
37+
await _output?.close();
38+
_service = null;
39+
_server = null;
40+
_output = null;
3741
}
3842

3943
setUp(() async {
@@ -47,21 +51,21 @@ void main() async {
4751
final dartdevc = p.join(binDir, 'snapshots', 'dartdevc.dart.snapshot');
4852

4953
// redirect logs for testing
50-
output = StreamController<String>.broadcast();
54+
_output = StreamController<String>.broadcast();
5155
output.stream.listen(printOnFailure);
5256

5357
configureLogWriter(
5458
customLogWriter: (level, message, {error, loggerName, stackTrace}) =>
5559
output.add('[$level] $loggerName: $message'));
5660

5761
// start asset server
58-
server = await startHttpServer('localhost');
62+
_server = await startHttpServer('localhost');
5963
final port = server.port;
6064

6165
// start expression compilation service
6266
Response assetHandler(request) =>
6367
Response(200, body: File.fromUri(kernel).readAsBytesSync());
64-
service = ExpressionCompilerService('localhost', port, verbose: false);
68+
_service = ExpressionCompilerService('localhost', port, verbose: false);
6569

6670
await service.initialize(moduleFormat: 'amd');
6771

0 commit comments

Comments
 (0)