Add and use TestSdkConfigurationProvider.verbose (#2796)
diff --git a/dwds/test/integration/build_daemon_circular_evaluate_test.dart b/dwds/test/integration/build_daemon_circular_evaluate_test.dart
index 760fb0b..7e8823e 100644
--- a/dwds/test/integration/build_daemon_circular_evaluate_test.dart
+++ b/dwds/test/integration/build_daemon_circular_evaluate_test.dart
@@ -19,9 +19,5 @@
final provider = TestSdkConfigurationProvider(verbose: debug);
tearDownAll(provider.dispose);
- testAll(
- provider: provider,
- compilationMode: CompilationMode.buildDaemon,
- debug: debug,
- );
+ testAll(provider: provider, compilationMode: CompilationMode.buildDaemon);
}
diff --git a/dwds/test/integration/build_daemon_evaluate_test.dart b/dwds/test/integration/build_daemon_evaluate_test.dart
index 2f59d55..ec756c4 100644
--- a/dwds/test/integration/build_daemon_evaluate_test.dart
+++ b/dwds/test/integration/build_daemon_evaluate_test.dart
@@ -20,9 +20,5 @@
final provider = TestSdkConfigurationProvider(verbose: debug);
tearDownAll(provider.dispose);
- testAll(
- provider: provider,
- compilationMode: CompilationMode.buildDaemon,
- debug: debug,
- );
+ testAll(provider: provider, compilationMode: CompilationMode.buildDaemon);
}
diff --git a/dwds/test/integration/build_daemon_parts_evaluate_test.dart b/dwds/test/integration/build_daemon_parts_evaluate_test.dart
index fab3fba..bafb960 100644
--- a/dwds/test/integration/build_daemon_parts_evaluate_test.dart
+++ b/dwds/test/integration/build_daemon_parts_evaluate_test.dart
@@ -19,9 +19,5 @@
final provider = TestSdkConfigurationProvider(verbose: debug);
tearDownAll(provider.dispose);
- testAll(
- provider: provider,
- compilationMode: CompilationMode.buildDaemon,
- debug: debug,
- );
+ testAll(provider: provider, compilationMode: CompilationMode.buildDaemon);
}
diff --git a/dwds/test/integration/chrome_proxy_service_amd_test.dart b/dwds/test/integration/chrome_proxy_service_amd_test.dart
index a236798..cf7eca6 100644
--- a/dwds/test/integration/chrome_proxy_service_amd_test.dart
+++ b/dwds/test/integration/chrome_proxy_service_amd_test.dart
@@ -35,7 +35,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart b/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart
index 8a562b3..6e598f4 100644
--- a/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/chrome_proxy_service_ddc_library_bundle_test.dart
@@ -34,7 +34,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -52,7 +51,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/common/chrome_proxy_service_common.dart b/dwds/test/integration/common/chrome_proxy_service_common.dart
index a717a40..a27fda7 100644
--- a/dwds/test/integration/common/chrome_proxy_service_common.dart
+++ b/dwds/test/integration/common/chrome_proxy_service_common.dart
@@ -32,14 +32,13 @@
required ModuleFormat moduleFormat,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final project = TestProject.test;
final context = TestContext(project, provider);
group('shared context', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
enableExpressionEvaluation: true,
@@ -64,7 +63,7 @@
late ScriptRef mainScript;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
vm = await service.getVM();
isolate = await service.getIsolate(vm.isolates!.first.id!);
@@ -223,7 +222,7 @@
late ChromeProxyService service;
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
});
@@ -318,7 +317,7 @@
late VmServiceInterface service;
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
});
@@ -365,7 +364,7 @@
LibraryRef? bootstrap;
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolate = await service.getIsolate(vm.isolates!.first.id!);
@@ -374,7 +373,7 @@
group('top level methods', () {
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('can return strings', () async {
@@ -466,7 +465,7 @@
group('with provided scope', () {
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
Future<InstanceRef> createRemoteObject(String message) async {
@@ -549,7 +548,7 @@
group('getIsolate', () {
late VmServiceInterface service;
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
});
@@ -586,7 +585,7 @@
Library? rootLibrary;
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolate = await service.getIsolate(vm.isolates!.first.id!);
@@ -596,7 +595,7 @@
});
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('root Library', () async {
@@ -1423,7 +1422,7 @@
late VmServiceInterface service;
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
});
@@ -1489,7 +1488,7 @@
late ScriptRef mainScript;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id;
@@ -1542,7 +1541,7 @@
ScriptRef mainScript;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id;
@@ -1625,7 +1624,7 @@
late ScriptRef mainScript;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id;
@@ -1808,7 +1807,7 @@
late InstanceRef testInstance;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
vm = await service.getVM();
isolate = await service.getIsolate(vm.isolates!.first.id!);
@@ -2351,7 +2350,7 @@
late Stream<Event> eventStream;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
expect(
await service.streamListen('Debug'),
@@ -2415,7 +2414,7 @@
late Stream<Event> eventStream;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
expect(
await service.streamListen('Extension'),
diff --git a/dwds/test/integration/common/hot_restart_common.dart b/dwds/test/integration/common/hot_restart_common.dart
index 1eb768d..843fc7a 100644
--- a/dwds/test/integration/common/hot_restart_common.dart
+++ b/dwds/test/integration/common/hot_restart_common.dart
@@ -28,7 +28,6 @@
required ModuleFormat moduleFormat,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final context = TestContext(TestProject.testAppendBody, provider);
@@ -86,7 +85,7 @@
() {
group('and with debugging', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.liveReload,
@@ -111,7 +110,7 @@
group('and without debugging', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.liveReload,
@@ -139,7 +138,7 @@
group('and without debugging using WebSockets', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.liveReload,
@@ -175,7 +174,7 @@
late VmService fakeClient;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
enableExpressionEvaluation: true,
@@ -479,7 +478,7 @@
() {
group('and with debugging', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.hotRestart,
@@ -532,7 +531,7 @@
group('and without debugging', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.hotRestart,
@@ -573,7 +572,7 @@
late VmService fakeClient;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
enableExpressionEvaluation: true,
diff --git a/dwds/test/integration/common/hot_restart_correctness_common.dart b/dwds/test/integration/common/hot_restart_correctness_common.dart
index 3285f2c..15eafaa 100644
--- a/dwds/test/integration/common/hot_restart_correctness_common.dart
+++ b/dwds/test/integration/common/hot_restart_correctness_common.dart
@@ -31,7 +31,6 @@
required ModuleFormat moduleFormat,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
tearDownAll(provider.dispose);
@@ -77,7 +76,7 @@
VmService? fakeClient;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
enableExpressionEvaluation: true,
@@ -146,7 +145,7 @@
() {
group('and with debugging', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.hotRestart,
@@ -172,7 +171,7 @@
group('and without debugging', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
reloadConfiguration: ReloadConfiguration.hotRestart,
diff --git a/dwds/test/integration/dds_port_common.dart b/dwds/test/integration/dds_port_common.dart
index 8899963..1a40ac6 100644
--- a/dwds/test/integration/dds_port_common.dart
+++ b/dwds/test/integration/dds_port_common.dart
@@ -13,14 +13,11 @@
import 'fixtures/project.dart';
import 'fixtures/utilities.dart';
-void testAll({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testAll({required TestSdkConfigurationProvider provider}) {
late TestContext context;
setUp(() {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
context = TestContext(TestProject.test, provider);
});
@@ -36,7 +33,7 @@
await context.setUp(
testSettings: TestSettings(
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
@@ -56,7 +53,7 @@
await context.setUp(
testSettings: TestSettings(
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
diff --git a/dwds/test/integration/dds_port_ddc_library_bundle_test.dart b/dwds/test/integration/dds_port_ddc_library_bundle_test.dart
index 41093db..44c8fbd 100644
--- a/dwds/test/integration/dds_port_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/dds_port_ddc_library_bundle_test.dart
@@ -24,5 +24,5 @@
);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/dwds/test/integration/debug_service_common.dart b/dwds/test/integration/debug_service_common.dart
index 2051a67..5ae7c44 100644
--- a/dwds/test/integration/debug_service_common.dart
+++ b/dwds/test/integration/debug_service_common.dart
@@ -14,17 +14,14 @@
import 'fixtures/project.dart';
import 'fixtures/utilities.dart';
-void testAll({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testAll({required TestSdkConfigurationProvider provider}) {
final context = TestContext(TestProject.test, provider);
setUpAll(() async {
// Disable DDS as we're testing DWDS behavior.
await context.setUp(
testSettings: TestSettings(
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
diff --git a/dwds/test/integration/debug_service_ddc_library_bundle_test.dart b/dwds/test/integration/debug_service_ddc_library_bundle_test.dart
index 3d3cd59..cf6c3f3 100644
--- a/dwds/test/integration/debug_service_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/debug_service_ddc_library_bundle_test.dart
@@ -23,5 +23,5 @@
);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/dwds/test/integration/evaluate_circular_common.dart b/dwds/test/integration/evaluate_circular_common.dart
index 2e8821e..c5a0287 100644
--- a/dwds/test/integration/evaluate_circular_common.dart
+++ b/dwds/test/integration/evaluate_circular_common.dart
@@ -21,7 +21,6 @@
CompilationMode compilationMode = CompilationMode.buildDaemon,
IndexBaseMode indexBaseMode = IndexBaseMode.noBase,
bool useDebuggerModuleNames = false,
- bool debug = false,
}) {
if (compilationMode == CompilationMode.buildDaemon &&
indexBaseMode == IndexBaseMode.base) {
@@ -64,13 +63,13 @@
group('shared context with evaluation', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
useDebuggerModuleNames: useDebuggerModuleNames,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
),
);
});
@@ -79,7 +78,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
group('evaluateInFrame', () {
late VmServiceInterface service;
@@ -92,7 +91,7 @@
late Stream<Event> stream;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
vm = await service.getVM();
isolate = await service.getIsolate(vm.isolates!.first.id!);
diff --git a/dwds/test/integration/evaluate_common.dart b/dwds/test/integration/evaluate_common.dart
index b440626..e08f282 100644
--- a/dwds/test/integration/evaluate_common.dart
+++ b/dwds/test/integration/evaluate_common.dart
@@ -25,7 +25,6 @@
CompilationMode compilationMode = CompilationMode.buildDaemon,
IndexBaseMode indexBaseMode = IndexBaseMode.noBase,
bool useDebuggerModuleNames = false,
- bool debug = false,
}) {
if (compilationMode == CompilationMode.buildDaemon &&
indexBaseMode == IndexBaseMode.base) {
@@ -72,14 +71,14 @@
group('Shared context with evaluation |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
moduleFormat: provider.ddcModuleFormat,
enableExpressionEvaluation: true,
useDebuggerModuleNames: useDebuggerModuleNames,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
canaryFeatures: provider.canaryFeatures,
),
);
@@ -89,7 +88,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
group('evaluateInFrame |', () {
VM vm;
@@ -105,7 +104,7 @@
setUp(() async {
output = StreamController<String>.broadcast();
- output.stream.listen(debug ? print : printOnFailure);
+ output.stream.listen(provider.verbose ? print : printOnFailure);
configureLogWriter(
customLogWriter: (level, message, {error, loggerName, stackTrace}) {
@@ -643,7 +642,7 @@
late String isolateId;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
final service = context.service;
vm = await service.getVM();
isolate = await service.getIsolate(vm.isolates!.first.id!);
@@ -808,13 +807,13 @@
group('shared context with no evaluation |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
moduleFormat: provider.ddcModuleFormat,
enableExpressionEvaluation: false,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
canaryFeatures: provider.canaryFeatures,
),
);
@@ -824,7 +823,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
group('evaluateInFrame |', () {
VM vm;
diff --git a/dwds/test/integration/evaluate_parts_common.dart b/dwds/test/integration/evaluate_parts_common.dart
index 7b207dd..7282b89 100644
--- a/dwds/test/integration/evaluate_parts_common.dart
+++ b/dwds/test/integration/evaluate_parts_common.dart
@@ -19,7 +19,6 @@
CompilationMode compilationMode = CompilationMode.buildDaemon,
IndexBaseMode indexBaseMode = IndexBaseMode.noBase,
bool useDebuggerModuleNames = false,
- bool debug = false,
}) {
if (compilationMode == CompilationMode.buildDaemon &&
indexBaseMode == IndexBaseMode.base) {
@@ -69,13 +68,13 @@
late Stream<Event> stream;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
useDebuggerModuleNames: useDebuggerModuleNames,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
diff --git a/dwds/test/integration/events_common.dart b/dwds/test/integration/events_common.dart
index a9fd7e2..ce534f3 100644
--- a/dwds/test/integration/events_common.dart
+++ b/dwds/test/integration/events_common.dart
@@ -17,10 +17,7 @@
import 'fixtures/project.dart';
import 'fixtures/utilities.dart';
-void testWithDwds({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testWithDwds({required TestSdkConfigurationProvider provider}) {
final context = TestContext(TestProject.test, provider);
group(
@@ -68,7 +65,7 @@
}
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
initialEvents = expectLater(
pipe(eventStream, timeout: const Timeout.factor(5)),
emitsThrough(
@@ -82,7 +79,7 @@
testSettings: TestSettings(
enableExpressionEvaluation: true,
moduleFormat: provider.ddcModuleFormat,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
canaryFeatures: provider.canaryFeatures,
),
debugSettings: TestDebugSettings.withDevToolsLaunch(context),
@@ -145,7 +142,7 @@
late String bootstrapId;
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
final isolate = await service.getIsolate(vm.isolates!.first.id!);
@@ -154,7 +151,7 @@
});
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('emits EVALUATE events on evaluation success', () async {
@@ -194,7 +191,7 @@
late ScriptRef mainScript;
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
@@ -208,7 +205,7 @@
});
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('emits EVALUATE_IN_FRAME events on RPC error', () async {
@@ -306,7 +303,7 @@
late ScriptRef mainScript;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id!;
@@ -334,7 +331,7 @@
late String isolateId;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id!;
@@ -355,7 +352,7 @@
late String isolateId;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id!;
@@ -373,7 +370,7 @@
group('getVM', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('emits GET_VM events', () async {
@@ -388,7 +385,7 @@
group('hotRestart', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('emits HOT_RESTART event', () async {
@@ -410,7 +407,7 @@
late String isolateId;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
service = context.service;
final vm = await service.getVM();
isolateId = vm.isolates!.first.id!;
@@ -455,7 +452,7 @@
group('fullReload', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
});
test('emits FULL_RELOAD event', () async {
diff --git a/dwds/test/integration/events_ddc_library_bundle_test.dart b/dwds/test/integration/events_ddc_library_bundle_test.dart
index bd502d3..fd37660 100644
--- a/dwds/test/integration/events_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/events_ddc_library_bundle_test.dart
@@ -22,5 +22,5 @@
);
tearDownAll(provider.dispose);
- testWithDwds(provider: provider, debug: debug);
+ testWithDwds(provider: provider);
}
diff --git a/dwds/test/integration/frontend_server_circular_evaluate_test.dart b/dwds/test/integration/frontend_server_circular_evaluate_test.dart
index 33b0eda..2e8e921 100644
--- a/dwds/test/integration/frontend_server_circular_evaluate_test.dart
+++ b/dwds/test/integration/frontend_server_circular_evaluate_test.dart
@@ -32,7 +32,6 @@
compilationMode: CompilationMode.frontendServer,
indexBaseMode: indexBaseMode,
useDebuggerModuleNames: true,
- debug: debug,
);
},
skip:
diff --git a/dwds/test/integration/frontend_server_ddc_evaluate_test.dart b/dwds/test/integration/frontend_server_ddc_evaluate_test.dart
index 4ed878a..dc58202 100644
--- a/dwds/test/integration/frontend_server_ddc_evaluate_test.dart
+++ b/dwds/test/integration/frontend_server_ddc_evaluate_test.dart
@@ -39,7 +39,6 @@
compilationMode: CompilationMode.frontendServer,
indexBaseMode: indexBaseMode,
useDebuggerModuleNames: useDebuggerModuleNames,
- debug: debug,
);
},
// https://github.com/dart-lang/sdk/issues/49277
diff --git a/dwds/test/integration/frontend_server_ddc_library_bundle_evaluate_test.dart b/dwds/test/integration/frontend_server_ddc_library_bundle_evaluate_test.dart
index fade610..4a27968 100644
--- a/dwds/test/integration/frontend_server_ddc_library_bundle_evaluate_test.dart
+++ b/dwds/test/integration/frontend_server_ddc_library_bundle_evaluate_test.dart
@@ -40,7 +40,6 @@
compilationMode: CompilationMode.frontendServer,
indexBaseMode: indexBaseMode,
useDebuggerModuleNames: useDebuggerModuleNames,
- debug: debug,
);
},
skip: indexBaseMode == IndexBaseMode.base && Platform.isWindows
diff --git a/dwds/test/integration/frontend_server_evaluate_test.dart b/dwds/test/integration/frontend_server_evaluate_test.dart
index 02d7986..71495fe 100644
--- a/dwds/test/integration/frontend_server_evaluate_test.dart
+++ b/dwds/test/integration/frontend_server_evaluate_test.dart
@@ -34,7 +34,6 @@
compilationMode: CompilationMode.frontendServer,
indexBaseMode: indexBaseMode,
useDebuggerModuleNames: useDebuggerModuleNames,
- debug: debug,
);
},
// https://github.com/dart-lang/sdk/issues/49277
diff --git a/dwds/test/integration/frontend_server_parts_evaluate_test.dart b/dwds/test/integration/frontend_server_parts_evaluate_test.dart
index 9d8b7a0..e64b799 100644
--- a/dwds/test/integration/frontend_server_parts_evaluate_test.dart
+++ b/dwds/test/integration/frontend_server_parts_evaluate_test.dart
@@ -32,7 +32,6 @@
compilationMode: CompilationMode.frontendServer,
indexBaseMode: indexBaseMode,
useDebuggerModuleNames: true,
- debug: debug,
);
},
skip:
diff --git a/dwds/test/integration/handlers/asset_handler_common.dart b/dwds/test/integration/handlers/asset_handler_common.dart
index 97bb49f..220db99 100644
--- a/dwds/test/integration/handlers/asset_handler_common.dart
+++ b/dwds/test/integration/handlers/asset_handler_common.dart
@@ -11,19 +11,16 @@
import '../fixtures/project.dart';
import '../fixtures/utilities.dart';
-void testAll({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testAll({required TestSdkConfigurationProvider provider}) {
group('Asset handler', () {
final context = TestContext(TestProject.test, provider);
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
@@ -34,7 +31,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
Future<void> readAsString(String path) async {
final request = Request('GET', Uri.parse('http://foo:0000/$path'));
diff --git a/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart b/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart
index 2f29670..92a6a8b 100644
--- a/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/handlers/asset_handler_ddc_library_bundle_test.dart
@@ -22,5 +22,5 @@
);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/dwds/test/integration/hot_restart_amd_test.dart b/dwds/test/integration/hot_restart_amd_test.dart
index bb7a691..451d518 100644
--- a/dwds/test/integration/hot_restart_amd_test.dart
+++ b/dwds/test/integration/hot_restart_amd_test.dart
@@ -32,6 +32,5 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
}
diff --git a/dwds/test/integration/hot_restart_breakpoints_test.dart b/dwds/test/integration/hot_restart_breakpoints_test.dart
index 0cbcb24..c0a34fe 100644
--- a/dwds/test/integration/hot_restart_breakpoints_test.dart
+++ b/dwds/test/integration/hot_restart_breakpoints_test.dart
@@ -36,23 +36,17 @@
runTests(
provider: provider,
compilationMode: CompilationMode.frontendServer,
- debug: debug,
);
});
group('Build Daemon', () {
- runTests(
- provider: provider,
- compilationMode: CompilationMode.buildDaemon,
- debug: debug,
- );
+ runTests(provider: provider, compilationMode: CompilationMode.buildDaemon);
});
}
void runTests({
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
- required bool debug,
}) {
final project = TestProject.testHotRestartBreakpoints;
final context = TestContext(project, provider);
@@ -77,7 +71,7 @@
StreamSubscription<ConsoleAPIEvent>? consoleSubscription;
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
enableExpressionEvaluation: true,
diff --git a/dwds/test/integration/hot_restart_correctness_amd_test.dart b/dwds/test/integration/hot_restart_correctness_amd_test.dart
index a559944..6feea49 100644
--- a/dwds/test/integration/hot_restart_correctness_amd_test.dart
+++ b/dwds/test/integration/hot_restart_correctness_amd_test.dart
@@ -32,6 +32,5 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
}
diff --git a/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart b/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart
index 27cd787..448ccaa 100644
--- a/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_restart_correctness_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -48,7 +47,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart b/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart
index e6b6b4c..880d3e6 100644
--- a/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/hot_restart_ddc_library_bundle_test.dart
@@ -33,7 +33,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
moduleFormat: moduleFormat,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/class_inspection_amd_test.dart b/dwds/test/integration/instances/class_inspection_amd_test.dart
index ebb11f5..c4b898a 100644
--- a/dwds/test/integration/instances/class_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/class_inspection_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart
index 39ab126..afa45f0 100644
--- a/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/class_inspection_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/common/class_inspection_common.dart b/dwds/test/integration/instances/common/class_inspection_common.dart
index ed0d22f..ba8f946 100644
--- a/dwds/test/integration/instances/common/class_inspection_common.dart
+++ b/dwds/test/integration/instances/common/class_inspection_common.dart
@@ -21,7 +21,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final context = TestContext(TestProject.testExperiment, provider);
final testInspector = TestInspector(context);
@@ -43,12 +42,12 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
experiments: ['dot-shorthands'],
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
@@ -72,7 +71,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
tearDown(() => service.resume(isolateId));
group('calling getObject for an existent class', () {
diff --git a/dwds/test/integration/instances/common/dot_shorthands_common.dart b/dwds/test/integration/instances/common/dot_shorthands_common.dart
index 9c09be1..4503adc 100644
--- a/dwds/test/integration/instances/common/dot_shorthands_common.dart
+++ b/dwds/test/integration/instances/common/dot_shorthands_common.dart
@@ -17,7 +17,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final context = TestContext(TestProject.testDotShorthands, provider);
final testInspector = TestInspector(context);
@@ -43,12 +42,12 @@
group('$compilationMode | dot shorthands:', () {
setUp(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
experiments: ['dot-shorthands'],
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
diff --git a/dwds/test/integration/instances/common/instance_common.dart b/dwds/test/integration/instances/common/instance_common.dart
index 392e83a..2b1ae8c 100644
--- a/dwds/test/integration/instances/common/instance_common.dart
+++ b/dwds/test/integration/instances/common/instance_common.dart
@@ -20,7 +20,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final project = TestProject.testScopes;
@@ -29,11 +28,11 @@
late ChromeAppInspector inspector;
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
canaryFeatures: canaryFeatures,
),
);
@@ -67,7 +66,7 @@
''';
group('compiler', () {
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
test('uses correct type system', () async {
final remoteObject = await inspector.jsEvaluate(
@@ -83,7 +82,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final project = TestProject.testScopes;
final context = TestContext(project, provider);
@@ -92,11 +90,11 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
),
@@ -142,7 +140,7 @@
'constructors at runtime.';
group('instanceRef', () {
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
test('for a null', () async {
final remoteObject = await getLibraryPublicFinalRef();
@@ -324,7 +322,7 @@
});
group('instance', () {
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
test('for an object', () async {
final remoteObject = await getLibraryPublicFinalRef();
final instance = await inspector.instanceFor(remoteObject);
diff --git a/dwds/test/integration/instances/common/instance_inspection_common.dart b/dwds/test/integration/instances/common/instance_inspection_common.dart
index 185c5cd..c3ac0f1 100644
--- a/dwds/test/integration/instances/common/instance_inspection_common.dart
+++ b/dwds/test/integration/instances/common/instance_inspection_common.dart
@@ -16,7 +16,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final project = TestProject.testPackage();
final context = TestContext(project, provider);
@@ -54,12 +53,12 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
canaryFeatures: canaryFeatures,
experiments: ['records'],
moduleFormat: provider.ddcModuleFormat,
@@ -81,7 +80,7 @@
tearDownAll(context.tearDown);
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
tearDown(() async {
try {
await service.resume(isolateId);
diff --git a/dwds/test/integration/instances/common/patterns_inspection_common.dart b/dwds/test/integration/instances/common/patterns_inspection_common.dart
index 7ee7b25..9680dee 100644
--- a/dwds/test/integration/instances/common/patterns_inspection_common.dart
+++ b/dwds/test/integration/instances/common/patterns_inspection_common.dart
@@ -16,7 +16,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final context = TestContext(TestProject.testExperiment, provider);
final testInspector = TestInspector(context);
@@ -50,12 +49,12 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
experiments: ['dot-shorthands'],
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
@@ -79,7 +78,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
tearDown(() => service.resume(isolateId));
test('pattern match case 1', () async {
diff --git a/dwds/test/integration/instances/common/record_inspection_common.dart b/dwds/test/integration/instances/common/record_inspection_common.dart
index 25e404d..1cce6db 100644
--- a/dwds/test/integration/instances/common/record_inspection_common.dart
+++ b/dwds/test/integration/instances/common/record_inspection_common.dart
@@ -16,7 +16,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final context = TestContext(TestProject.testExperiment, provider);
final testInspector = TestInspector(context);
@@ -57,12 +56,12 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
experiments: ['dot-shorthands'],
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
@@ -86,7 +85,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
tearDown(() => service.resume(isolateId));
test('simple record display', () async {
diff --git a/dwds/test/integration/instances/common/record_type_inspection_common.dart b/dwds/test/integration/instances/common/record_type_inspection_common.dart
index 5ee5d35..7bb1763 100644
--- a/dwds/test/integration/instances/common/record_type_inspection_common.dart
+++ b/dwds/test/integration/instances/common/record_type_inspection_common.dart
@@ -16,7 +16,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final context = TestContext(TestProject.testExperiment, provider);
final testInspector = TestInspector(context);
@@ -55,12 +54,12 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
experiments: ['dot-shorthands'],
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
@@ -84,7 +83,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
tearDown(() => service.resume(isolateId));
test('simple record type', () async {
diff --git a/dwds/test/integration/instances/common/type_inspection_common.dart b/dwds/test/integration/instances/common/type_inspection_common.dart
index ce19097..e71d65c 100644
--- a/dwds/test/integration/instances/common/type_inspection_common.dart
+++ b/dwds/test/integration/instances/common/type_inspection_common.dart
@@ -17,7 +17,6 @@
required TestSdkConfigurationProvider provider,
required CompilationMode compilationMode,
required bool canaryFeatures,
- required bool debug,
}) {
final project = TestProject.testExperiment;
final context = TestContext(project, provider);
@@ -78,12 +77,12 @@
group('$compilationMode |', () {
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
compilationMode: compilationMode,
enableExpressionEvaluation: true,
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
experiments: ['dot-shorthands'],
canaryFeatures: canaryFeatures,
moduleFormat: provider.ddcModuleFormat,
@@ -107,7 +106,7 @@
await context.tearDown();
});
- setUp(() => setCurrentLogWriter(debug: debug));
+ setUp(() => setCurrentLogWriter(debug: provider.verbose));
tearDown(() => service.resume(isolateId));
test('String type', () async {
diff --git a/dwds/test/integration/instances/dot_shorthands_amd_test.dart b/dwds/test/integration/instances/dot_shorthands_amd_test.dart
index b4f01a6..f45627e 100644
--- a/dwds/test/integration/instances/dot_shorthands_amd_test.dart
+++ b/dwds/test/integration/instances/dot_shorthands_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart b/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart
index 71b95ac..9960d71 100644
--- a/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/dot_shorthands_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/instance_amd_test.dart b/dwds/test/integration/instances/instance_amd_test.dart
index 95839ad..c67433b 100644
--- a/dwds/test/integration/instances/instance_amd_test.dart
+++ b/dwds/test/integration/instances/instance_amd_test.dart
@@ -32,14 +32,12 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
runTests(
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -57,14 +55,12 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
runTests(
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -82,14 +78,12 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
runTests(
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -107,14 +101,12 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
runTests(
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart b/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart
index 2726277..6a6c889 100644
--- a/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/instance_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -49,7 +48,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/instance_inspection_amd_test.dart b/dwds/test/integration/instances/instance_inspection_amd_test.dart
index 61e20b6..ae7f9fc 100644
--- a/dwds/test/integration/instances/instance_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/instance_inspection_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart
index a1389e9..d4f6353 100644
--- a/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/instance_inspection_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/patterns_inspection_amd_test.dart b/dwds/test/integration/instances/patterns_inspection_amd_test.dart
index 71da621..408061b 100644
--- a/dwds/test/integration/instances/patterns_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/patterns_inspection_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart
index 4aa9997..ef6802f 100644
--- a/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/patterns_inspection_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/record_inspection_amd_test.dart b/dwds/test/integration/instances/record_inspection_amd_test.dart
index 101166e..735d517 100644
--- a/dwds/test/integration/instances/record_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/record_inspection_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart
index 1b6b9a5..b97e15a 100644
--- a/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/record_inspection_ddc_library_bundle_test.dart
@@ -31,7 +31,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -47,7 +46,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/record_type_inspection_amd_test.dart b/dwds/test/integration/instances/record_type_inspection_amd_test.dart
index 7190d2a..428bd30 100644
--- a/dwds/test/integration/instances/record_type_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/record_type_inspection_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart
index 7e48872..18382d3 100644
--- a/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/record_type_inspection_ddc_library_bundle_test.dart
@@ -31,7 +31,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -47,7 +46,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/type_inspection_amd_test.dart b/dwds/test/integration/instances/type_inspection_amd_test.dart
index eec1329..5ec5ddc 100644
--- a/dwds/test/integration/instances/type_inspection_amd_test.dart
+++ b/dwds/test/integration/instances/type_inspection_amd_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -68,7 +66,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -86,7 +83,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart b/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart
index 8c74e5d..ec2c312 100644
--- a/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/instances/type_inspection_ddc_library_bundle_test.dart
@@ -32,7 +32,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
@@ -50,7 +49,6 @@
provider: provider,
compilationMode: compilationMode,
canaryFeatures: canaryFeatures,
- debug: debug,
);
});
}
diff --git a/dwds/test/integration/refresh_common.dart b/dwds/test/integration/refresh_common.dart
index 5cad998..51b9d29 100644
--- a/dwds/test/integration/refresh_common.dart
+++ b/dwds/test/integration/refresh_common.dart
@@ -14,20 +14,17 @@
import 'fixtures/project.dart';
import 'fixtures/utilities.dart';
-void testAll({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testAll({required TestSdkConfigurationProvider provider}) {
final context = TestContext(TestProject.test, provider);
group('fresh context', () {
late VmServiceInterface service;
late VM vm;
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
diff --git a/dwds/test/integration/refresh_ddc_library_bundle_test.dart b/dwds/test/integration/refresh_ddc_library_bundle_test.dart
index 9faedee..3a24127 100644
--- a/dwds/test/integration/refresh_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/refresh_ddc_library_bundle_test.dart
@@ -26,5 +26,5 @@
);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/dwds/test/integration/screenshot_common.dart b/dwds/test/integration/screenshot_common.dart
index a85802a..dffae94 100644
--- a/dwds/test/integration/screenshot_common.dart
+++ b/dwds/test/integration/screenshot_common.dart
@@ -10,17 +10,14 @@
import 'fixtures/project.dart';
import 'fixtures/utilities.dart';
-void testAll({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testAll({required TestSdkConfigurationProvider provider}) {
final context = TestContext(TestProject.test, provider);
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
diff --git a/dwds/test/integration/screenshot_ddc_library_bundle_test.dart b/dwds/test/integration/screenshot_ddc_library_bundle_test.dart
index 9990d84..31e1f68 100644
--- a/dwds/test/integration/screenshot_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/screenshot_ddc_library_bundle_test.dart
@@ -23,5 +23,5 @@
);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/dwds/test/integration/variable_scope_amd_test.dart b/dwds/test/integration/variable_scope_amd_test.dart
index a7bee9b..e47257b 100644
--- a/dwds/test/integration/variable_scope_amd_test.dart
+++ b/dwds/test/integration/variable_scope_amd_test.dart
@@ -18,5 +18,5 @@
final provider = TestSdkConfigurationProvider(verbose: debug);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/dwds/test/integration/variable_scope_common.dart b/dwds/test/integration/variable_scope_common.dart
index 6333ad5..6354e61 100644
--- a/dwds/test/integration/variable_scope_common.dart
+++ b/dwds/test/integration/variable_scope_common.dart
@@ -15,17 +15,14 @@
import 'fixtures/project.dart';
import 'fixtures/utilities.dart';
-void testAll({
- required TestSdkConfigurationProvider provider,
- bool debug = false,
-}) {
+void testAll({required TestSdkConfigurationProvider provider}) {
final context = TestContext(TestProject.testScopes, provider);
setUpAll(() async {
- setCurrentLogWriter(debug: debug);
+ setCurrentLogWriter(debug: provider.verbose);
await context.setUp(
testSettings: TestSettings(
- verboseCompiler: debug,
+ verboseCompiler: provider.verbose,
moduleFormat: provider.ddcModuleFormat,
canaryFeatures: provider.canaryFeatures,
),
@@ -37,7 +34,7 @@
});
group('temporary variable regular expression', () {
- setUpAll(() => setCurrentLogWriter(debug: debug));
+ setUpAll(() => setCurrentLogWriter(debug: provider.verbose));
test('matches correctly for pre-patterns temporary variables', () {
expect(previousDdcTemporaryVariableRegExp.hasMatch(r't4$'), isTrue);
expect(previousDdcTemporaryVariableRegExp.hasMatch(r't4$0'), isTrue);
@@ -168,7 +165,7 @@
};
}
- setUpAll(() => setCurrentLogWriter(debug: debug));
+ setUpAll(() => setCurrentLogWriter(debug: provider.verbose));
setUp(() async {
service = context.service;
diff --git a/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart b/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart
index 7467e8d..dd225f1 100644
--- a/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart
+++ b/dwds/test/integration/variable_scope_ddc_library_bundle_test.dart
@@ -24,5 +24,5 @@
);
tearDownAll(provider.dispose);
- testAll(provider: provider, debug: debug);
+ testAll(provider: provider);
}
diff --git a/test_common/lib/test_sdk_configuration.dart b/test_common/lib/test_sdk_configuration.dart
index c5ddb5d..cfc0315 100644
--- a/test_common/lib/test_sdk_configuration.dart
+++ b/test_common/lib/test_sdk_configuration.dart
@@ -19,7 +19,7 @@
class TestSdkConfigurationProvider extends SdkConfigurationProvider {
final _logger = Logger('TestSdkConfigurationProvider');
- final bool _verbose;
+ final bool verbose;
final bool canaryFeatures;
final ModuleFormat ddcModuleFormat;
late final Directory _sdkDirectory;
@@ -29,9 +29,9 @@
TestSdkConfigurationProvider({
this.canaryFeatures = false,
- bool verbose = false,
+ this.verbose = false,
this.ddcModuleFormat = ModuleFormat.amd,
- }) : _verbose = verbose {
+ }) {
_sdkDirectory = Directory.systemTemp.createTempSync('sdk_copy');
sdkLayout = TestSdkLayout.createDefault(_sdkDirectory.path);
}
@@ -61,7 +61,7 @@
final assetGenerator = SdkAssetGenerator(
sdkLayout: sdkLayout,
canaryFeatures: canaryFeatures,
- verbose: _verbose,
+ verbose: verbose,
ddcModuleFormat: ddcModuleFormat,
);