Skip to content

Commit 41e92be

Browse files
author
Anna Gringauze
authored
Create test_common package (#1945)
* Validate only needed summaries in expression_compiler_service * Move shared test functionality into test_common package * Rebase on master * Fix bad merge * Add comments * Run expression compiler service test with sound null safety
1 parent 443f820 commit 41e92be

31 files changed

+571
-205
lines changed

.github/workflows/dart.yml

Lines changed: 288 additions & 119 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- Fill `BoundField.name` for records.
1111
- Display records as a container of fields.
1212
- Remove test-only code from `sdk_configuration.dart`.
13+
- Move shared test-only code to a new `test_common` package.
1314

1415
**Breaking changes**
1516
- Require `sdkConfigurationProvider` in `ExpressionCompilerService`

dwds/pubspec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,6 @@ dev_dependencies:
5555
puppeteer: ^2.19.0
5656
stream_channel: ^2.1.0
5757
test: ^1.21.1
58+
test_common:
59+
path: ../test_common
5860
webdriver: ^3.0.0

dwds/test/build_daemon_callstack_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import 'dart:async';
99
import 'package:dwds/src/connections/debug_connection.dart';
1010
import 'package:dwds/src/services/chrome_proxy_service.dart';
1111
import 'package:test/test.dart';
12+
import 'package:test_common/logging.dart';
1213
import 'package:vm_service/vm_service.dart';
1314
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1415

1516
import 'fixtures/context.dart';
16-
import 'fixtures/logging.dart';
1717

1818
class TestSetup {
1919
static final contextUnsound = TestContext.withWeakNullSafety(

dwds/test/chrome_proxy_service_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import 'package:dwds/src/utilities/shared.dart';
1616
import 'package:http/http.dart' as http;
1717
import 'package:path/path.dart' as path;
1818
import 'package:test/test.dart';
19+
import 'package:test_common/logging.dart';
1920
import 'package:vm_service/vm_service.dart';
2021
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
2122

2223
import 'fixtures/context.dart';
23-
import 'fixtures/logging.dart';
2424

2525
final context = TestContext.withSoundNullSafety();
2626

dwds/test/dart_uri_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import 'package:dwds/src/loaders/strategy.dart';
99
import 'package:dwds/src/utilities/dart_uri.dart';
1010
import 'package:test/test.dart';
11+
import 'package:test_common/logging.dart';
1112

1213
import 'fixtures/fakes.dart';
13-
import 'fixtures/logging.dart';
1414

1515
class TestStrategy extends FakeStrategy {
1616
@override

dwds/test/evaluate_circular_common.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import 'dart:async';
99
import 'package:dwds/src/connections/debug_connection.dart';
1010
import 'package:dwds/src/services/chrome_proxy_service.dart';
1111
import 'package:test/test.dart';
12+
import 'package:test_common/logging.dart';
1213
import 'package:vm_service/vm_service.dart';
1314
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1415

1516
import 'fixtures/context.dart';
16-
import 'fixtures/logging.dart';
1717

1818
class TestSetup {
1919
static TestContext contextUnsound(String index) =>

dwds/test/evaluate_common.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import 'dart:async';
99
import 'package:dwds/src/connections/debug_connection.dart';
1010
import 'package:dwds/src/services/chrome_proxy_service.dart';
1111
import 'package:test/test.dart';
12+
import 'package:test_common/logging.dart';
1213
import 'package:vm_service/vm_service.dart';
1314
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1415

1516
import 'fixtures/context.dart';
16-
import 'fixtures/logging.dart';
1717

1818
class TestSetup {
1919
static TestContext contextUnsound(String index) =>

dwds/test/events_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import 'package:dwds/src/events.dart';
1111
import 'package:dwds/src/services/chrome_proxy_service.dart';
1212
import 'package:dwds/src/utilities/server.dart';
1313
import 'package:test/test.dart';
14+
import 'package:test_common/logging.dart';
1415
import 'package:vm_service/vm_service.dart';
1516
import 'package:webdriver/async_core.dart';
1617
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1718

1819
import 'fixtures/context.dart';
19-
import 'fixtures/logging.dart';
2020

2121
ChromeProxyService get service =>
2222
fetchChromeProxyService(context.debugConnection);

dwds/test/expression_compiler_service_test.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ import 'dart:convert';
99
import 'dart:io';
1010

1111
import 'package:dwds/expression_compiler.dart';
12+
import 'package:dwds/sdk_configuration.dart';
1213
import 'package:dwds/src/services/expression_compiler_service.dart';
13-
import 'package:dwds/src/utilities/sdk_configuration.dart';
1414
import 'package:dwds/src/utilities/server.dart';
1515
import 'package:logging/logging.dart';
1616
import 'package:shelf/shelf.dart';
1717
import 'package:test/test.dart';
18-
19-
import 'fixtures/logging.dart';
18+
import 'package:test_common/logging.dart';
2019

2120
ExpressionCompilerService get service => _service!;
2221
late ExpressionCompilerService? _service;
@@ -47,10 +46,12 @@ void main() async {
4746
final source = outputDir.uri.resolve('try.dart');
4847
final packages = outputDir.uri.resolve('package_config.json');
4948
final kernel = outputDir.uri.resolve('try.full.dill');
49+
// Expression compiler service does not need any extra assets
50+
// generated in the SDK, so we use the current SDK layout and
51+
// configuration.
5052
final executable = Platform.resolvedExecutable;
5153
final dartdevc =
5254
SdkConfiguration.defaultConfiguration.compilerWorkerPath!;
53-
5455
// redirect logs for testing
5556
_output = StreamController<String>.broadcast();
5657
output.stream.listen(printOnFailure);
@@ -76,7 +77,7 @@ void main() async {
7677
sdkConfigurationProvider: DefaultSdkConfigurationProvider(),
7778
);
7879

79-
await service.initialize(moduleFormat: 'amd');
80+
await service.initialize(moduleFormat: 'amd', soundNullSafety: true);
8081

8182
// setup asset server
8283
serveHttpRequests(server, assetHandler, (e, s) {

0 commit comments

Comments
 (0)