diff --git a/dwds/test/dart_uri_test.dart b/dwds/test/dart_uri_test.dart index b2274e6b2..d3479e1d2 100644 --- a/dwds/test/dart_uri_test.dart +++ b/dwds/test/dart_uri_test.dart @@ -49,7 +49,7 @@ class G3TestStrategy extends FakeStrategy { void main() { group('DartUri', () { setUpAll(() { - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: TestStrategy( FakeAssetReader(), ), @@ -209,7 +209,7 @@ void main() { group('initialized to handle g3-relative paths', () { setUpAll(() async { - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: G3TestStrategy(FakeAssetReader()), appMetadata: AppMetadata(isInternalBuild: true), ); diff --git a/dwds/test/debug_extension_test.dart b/dwds/test/debug_extension_test.dart index 6b69f144c..8d70d2420 100644 --- a/dwds/test/debug_extension_test.dart +++ b/dwds/test/debug_extension_test.dart @@ -11,6 +11,7 @@ 'linux': Skip('https://github.com/dart-lang/webdev/issues/2114'), }) +import 'package:dwds/config.dart'; import 'package:dwds/src/connections/debug_connection.dart'; import 'package:dwds/src/handlers/injector.dart'; import 'package:http/http.dart' as http; @@ -61,9 +62,10 @@ void main() async { group('Without encoding', () { setUp(() async { await context.setUp( - enableDebugExtension: true, - serveDevTools: true, - useSse: useSse, + debugSettings: TestDebugSettings.withDevTools(context).copyWith( + enableDebugExtension: true, + useSse: useSse, + ), ); await context.extensionConnection.sendCommand('Runtime.evaluate', { 'expression': 'fakeClick()', @@ -124,9 +126,10 @@ void main() async { group('With a sharded Dart app', () { setUp(() async { await context.setUp( - enableDebugExtension: true, - serveDevTools: true, - useSse: useSse, + debugSettings: TestDebugSettings.withDevTools(context).copyWith( + enableDebugExtension: true, + useSse: useSse, + ), ); final htmlTag = await context.webDriver.findElement(const By.tagName('html')); @@ -158,9 +161,10 @@ void main() async { group('With an internal Dart app', () { setUp(() async { await context.setUp( - enableDebugExtension: true, - serveDevTools: true, - useSse: false, + debugSettings: TestDebugSettings.withDevTools(context).copyWith( + enableDebugExtension: true, + useSse: false, + ), ); final htmlTag = await context.webDriver.findElement(const By.tagName('html')); @@ -227,9 +231,11 @@ void main() async { group('With encoding', () { setUp(() async { await context.setUp( - enableDebugExtension: true, - urlEncoder: (url) async => - url.endsWith(r'/$debug') ? 'http://some-encoded-url:8081/' : url, + debugSettings: TestDebugSettings.noDevTools().copyWith( + enableDebugExtension: true, + urlEncoder: (url) async => + url.endsWith(r'/$debug') ? 'http://some-encoded-url:8081/' : url, + ), ); }); @@ -252,7 +258,11 @@ void main() async { final uriPattern = RegExp(r'dartExtensionUri = "([^"]+)";'); setUp(() async { - await context.setUp(enableDebugExtension: true, hostname: 'any'); + await context.setUp( + debugSettings: + TestDebugSettings.noDevTools().copyWith(enableDebugExtension: true), + appMetadata: AppMetadata(hostname: 'any'), + ); }); tearDown(() async { diff --git a/dwds/test/debug_service_test.dart b/dwds/test/debug_service_test.dart index 04a63e54a..fabf60633 100644 --- a/dwds/test/debug_service_test.dart +++ b/dwds/test/debug_service_test.dart @@ -13,6 +13,7 @@ import 'package:test_common/test_sdk_configuration.dart'; import 'fixtures/context.dart'; import 'fixtures/project.dart'; +import 'fixtures/utilities.dart'; void main() { final provider = TestSdkConfigurationProvider(); @@ -22,7 +23,11 @@ void main() { setUpAll(() async { // Disable DDS as we're testing DWDS behavior. - await context.setUp(spawnDds: false); + await context.setUp( + debugSettings: TestDebugSettings.noDevTools().copyWith( + spawnDds: false, + ), + ); }); tearDownAll(() async { diff --git a/dwds/test/debugger_test.dart b/dwds/test/debugger_test.dart index 96e8f8321..6a327bd6e 100644 --- a/dwds/test/debugger_test.dart +++ b/dwds/test/debugger_test.dart @@ -87,7 +87,7 @@ void main() async { webkitDebugger = FakeWebkitDebugger(scripts: scripts); pausedController = StreamController(); webkitDebugger.onPaused = pausedController.stream; - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: TestStrategy(FakeAssetReader()), ); setGlobalsForTesting( diff --git a/dwds/test/devtools_test.dart b/dwds/test/devtools_test.dart index 961cae076..b7e1ddf1b 100644 --- a/dwds/test/devtools_test.dart +++ b/dwds/test/devtools_test.dart @@ -14,6 +14,7 @@ import 'package:webdriver/io.dart'; import 'fixtures/context.dart'; import 'fixtures/project.dart'; +import 'fixtures/utilities.dart'; Future _waitForPageReady(TestContext context) async { var attempt = 100; @@ -34,7 +35,7 @@ void main() { group('Injected client', () { setUp(() async { await context.setUp( - serveDevTools: true, + debugSettings: TestDebugSettings.withDevTools(context), ); await context.webDriver.driver.keyboard.sendChord([Keyboard.alt, 'd']); // Wait for DevTools to actually open. @@ -136,9 +137,13 @@ void main() { ); }); - group('Injected client without DevTools', () { + group('Injected client without a DevTools server', () { setUp(() async { - await context.setUp(serveDevTools: false); + await context.setUp( + debugSettings: TestDebugSettings.noDevTools().copyWith( + enableDevToolsLaunch: true, + ), + ); }); tearDown(() async { @@ -160,7 +165,10 @@ void main() { 'Injected client with debug extension and without DevTools', () { setUp(() async { - await context.setUp(enableDebugExtension: true, serveDevTools: false); + await context.setUp( + debugSettings: TestDebugSettings.noDevTools() + .copyWith(enableDebugExtension: true), + ); }); tearDown(() async { diff --git a/dwds/test/events_test.dart b/dwds/test/events_test.dart index af0ca94ba..f072bf27b 100644 --- a/dwds/test/events_test.dart +++ b/dwds/test/events_test.dart @@ -16,6 +16,7 @@ import 'package:webdriver/async_core.dart'; import 'fixtures/context.dart'; import 'fixtures/project.dart'; +import 'fixtures/utilities.dart'; void main() { final provider = TestSdkConfigurationProvider(); @@ -131,7 +132,7 @@ void main() { ), ); await context.setUp( - serveDevTools: true, + debugSettings: TestDebugSettings.withDevTools(context), enableExpressionEvaluation: true, ); vmService = context.debugConnection.vmService; diff --git a/dwds/test/expression_evaluator_test.dart b/dwds/test/expression_evaluator_test.dart index 61349d3d1..288057601 100644 --- a/dwds/test/expression_evaluator_test.dart +++ b/dwds/test/expression_evaluator_test.dart @@ -36,7 +36,7 @@ void main() async { late StreamController debugEventController; setUp(() async { final assetReader = FakeAssetReader(sourceMap: ''); - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: FakeStrategy(assetReader), ); setGlobalsForTesting( diff --git a/dwds/test/fixtures/context.dart b/dwds/test/fixtures/context.dart index 0e7854265..d0b4e33bc 100644 --- a/dwds/test/fixtures/context.dart +++ b/dwds/test/fixtures/context.dart @@ -136,46 +136,21 @@ class TestContext { Future setUp({ ReloadConfiguration reloadConfiguration = ReloadConfiguration.none, - bool serveDevTools = false, - bool enableDebugExtension = false, + AppMetadata? appMetadata, + TestDebugSettings? debugSettings, bool autoRun = true, - bool enableDebugging = true, - bool useSse = true, - bool spawnDds = true, - String hostname = 'localhost', bool waitToDebug = false, - UrlEncoder? urlEncoder, CompilationMode compilationMode = CompilationMode.buildDaemon, bool enableExpressionEvaluation = false, bool verboseCompiler = false, bool useDebuggerModuleNames = false, bool launchChrome = true, - bool isFlutterApp = false, - bool isInternalBuild = false, List experiments = const [], bool canaryFeatures = false, - String? workspaceName, }) async { + appMetadata ??= TestAppMetadata.externalDartApp(); + debugSettings ??= TestDebugSettings.noDevTools(); final sdkLayout = sdkConfigurationProvider.sdkLayout; - final toolConfiguration = createToolConfiguration( - debugSettings: DebugSettings( - enableDebugging: enableDebugging, - enableDebugExtension: enableDebugExtension, - useSseForDebugBackend: useSse, - useSseForDebugProxy: useSse, - useSseForInjectedClient: useSse, - spawnDds: spawnDds, - enableDevToolsLaunch: serveDevTools, - urlEncoder: urlEncoder, - ), - appMetadata: AppMetadata( - hostname: hostname, - isInternalBuild: isInternalBuild, - isFlutterApp: () => Future.value(isFlutterApp), - workspaceName: workspaceName, - ), - ); - setGlobalsForTesting(toolConfiguration: toolConfiguration); try { // Make sure configuration was created correctly. final configuration = await sdkConfigurationProvider.configuration; @@ -333,7 +308,7 @@ class TestContext { _webRunner = ResidentWebRunner( mainUri: entry, - urlTunneler: urlEncoder, + urlTunneler: debugSettings.urlEncoder, projectDirectory: p.toUri(project.absolutePackageDirectory), packageConfigFile: project.packageConfigFile, packageUriMapper: packageUriMapper, @@ -350,7 +325,7 @@ class TestContext { final assetServerPort = await findUnusedPort(); await webRunner.run( fileSystem, - hostname, + appMetadata.hostname, assetServerPort, filePathToServe, ); @@ -383,6 +358,7 @@ class TestContext { // then Chrome will be launched with a UI rather than headless. // If the extension is enabled, then Chrome will be launched with a UI // since headless Chrome does not support extensions. + final enableDebugExtension = debugSettings.enableDebugExtension; final headless = Platform.environment['DWDS_DEBUG_CHROME'] != 'true' && !enableDebugExtension; if (enableDebugExtension) { @@ -410,27 +386,17 @@ class TestContext { final connection = ChromeConnection('localhost', debugPort); _testServer = await TestServer.start( - hostname, - port, - assetHandler, - assetReader, - requireStrategy, - project.directoryToServe, - buildResults, - () async => connection, - serveDevTools, - enableDebugExtension, - autoRun, - enableDebugging, - useSse, - urlEncoder, - expressionCompiler, - spawnDds, - ddcService, - isFlutterApp, - isInternalBuild, - workspaceName, - sdkLayout, + debugSettings: + debugSettings.copyWith(expressionCompiler: expressionCompiler), + appMetadata: appMetadata, + port: port, + assetHandler: assetHandler, + assetReader: assetReader, + strategy: requireStrategy, + target: project.directoryToServe, + buildResults: buildResults, + chromeConnection: () async => connection, + autoRun: autoRun, ); _appUrl = basePath.isEmpty @@ -448,14 +414,14 @@ class TestContext { throw StateError('Unable to connect to tab.'); } - if (enableDebugExtension) { + if (debugSettings.enableDebugExtension) { final extensionTab = await _fetchDartDebugExtensionTab(connection); extensionConnection = await extensionTab.connect(); await extensionConnection.runtime.enable(); } appConnection = await testServer.dwds.connectedApps.first; - if (enableDebugging && !waitToDebug) { + if (debugSettings.enableDebugging && !waitToDebug) { await startDebugging(); } } diff --git a/dwds/test/fixtures/fakes.dart b/dwds/test/fixtures/fakes.dart index 262d780d3..78f3269fb 100644 --- a/dwds/test/fixtures/fakes.dart +++ b/dwds/test/fixtures/fakes.dart @@ -181,7 +181,7 @@ class FakeWebkitDebugger implements WebkitDebugger { FakeWebkitDebugger({Map? scripts}) : _scripts = scripts { setGlobalsForTesting( - toolConfiguration: createToolConfiguration( + toolConfiguration: TestToolConfiguration.forTests( loadStrategy: RequireStrategy( ReloadConfiguration.none, (_) async => {}, diff --git a/dwds/test/fixtures/server.dart b/dwds/test/fixtures/server.dart index d4fd0f8dc..88562e73f 100644 --- a/dwds/test/fixtures/server.dart +++ b/dwds/test/fixtures/server.dart @@ -5,19 +5,14 @@ import 'dart:io'; import 'package:build_daemon/data/build_status.dart' as daemon; -import 'package:dds/devtools_server.dart'; import 'package:dwds/asset_reader.dart'; import 'package:dwds/dart_web_debug_service.dart'; import 'package:dwds/data/build_result.dart'; -import 'package:dwds/expression_compiler.dart'; import 'package:dwds/src/config/tool_configuration.dart'; import 'package:dwds/src/loaders/require.dart'; -import 'package:dwds/src/servers/devtools.dart'; -import 'package:dwds/src/services/expression_compiler_service.dart'; import 'package:dwds/src/utilities/server.dart'; import 'package:logging/logging.dart'; import 'package:shelf/shelf.dart'; -import 'package:test_common/test_sdk_layout.dart'; import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; Logger _logger = Logger('TestServer'); @@ -62,29 +57,18 @@ class TestServer { await _server.close(force: true); } - static Future start( - String hostname, + static Future start({ + required DebugSettings debugSettings, + required AppMetadata appMetadata, + required Handler assetHandler, + required AssetReader assetReader, + required RequireStrategy strategy, + required String target, + required Stream buildResults, + required Future Function() chromeConnection, + required bool autoRun, int? port, - Handler assetHandler, - AssetReader assetReader, - RequireStrategy strategy, - String target, - Stream buildResults, - Future Function() chromeConnection, - bool serveDevTools, - bool enableDebugExtension, - bool autoRun, - bool enableDebugging, - bool useSse, - UrlEncoder? urlEncoder, - ExpressionCompiler? expressionCompiler, - bool spawnDds, - ExpressionCompilerService? ddcService, - bool isFlutterApp, - bool isInternalBuild, - String? workspaceName, - TestSdkLayout sdkLayout, - ) async { + }) async { var pipeline = const Pipeline(); pipeline = pipeline.addMiddleware(_interceptFavicon); @@ -105,37 +89,6 @@ class TestServer { throw StateError('Unexpected Daemon build result: $result'); }); - final debugSettings = DebugSettings( - spawnDds: spawnDds, - enableDebugExtension: enableDebugExtension, - enableDebugging: enableDebugging, - useSseForDebugProxy: useSse, - useSseForDebugBackend: useSse, - useSseForInjectedClient: useSse, - urlEncoder: urlEncoder, - expressionCompiler: expressionCompiler, - devToolsLauncher: serveDevTools - ? (hostname) async { - final server = await DevToolsServer().serveDevTools( - hostname: hostname, - enableStdinCommands: false, - customDevToolsPath: sdkLayout.devToolsDirectory, - ); - if (server == null) { - throw StateError('DevTools server could not be started.'); - } - return DevTools(server.address.host, server.port, server); - } - : null, - ); - - final appMetadata = AppMetadata( - hostname: hostname, - isInternalBuild: isInternalBuild, - isFlutterApp: () => Future.value(isFlutterApp), - workspaceName: workspaceName, - ); - final toolConfiguration = ToolConfiguration( loadStrategy: strategy, debugSettings: debugSettings, diff --git a/dwds/test/fixtures/utilities.dart b/dwds/test/fixtures/utilities.dart index 5ce25253d..4e1e00090 100644 --- a/dwds/test/fixtures/utilities.dart +++ b/dwds/test/fixtures/utilities.dart @@ -7,9 +7,13 @@ import 'dart:io'; import 'package:build_daemon/client.dart'; import 'package:build_daemon/constants.dart'; import 'package:build_daemon/data/server_log.dart'; +import 'package:dds/devtools_server.dart'; import 'package:dwds/src/config/tool_configuration.dart'; import 'package:dwds/src/loaders/strategy.dart'; +import 'package:dwds/src/servers/devtools.dart'; +import 'package:dwds/src/services/expression_compiler.dart'; +import 'context.dart'; import 'fakes.dart'; /// Connects to the `build_runner` daemon. @@ -92,21 +96,121 @@ Future retryFnAsync( ); } -ToolConfiguration createToolConfiguration({ - LoadStrategy? loadStrategy, - AppMetadata? appMetadata, - DebugSettings? debugSettings, -}) => - ToolConfiguration( - loadStrategy: loadStrategy ?? FakeStrategy(FakeAssetReader()), - debugSettings: debugSettings ?? DebugSettings(), - appMetadata: appMetadata ?? AppMetadata(), +class TestDebugSettings extends DebugSettings { + TestDebugSettings.withDevTools(TestContext context) + : super( + devToolsLauncher: (hostname) async { + final server = await DevToolsServer().serveDevTools( + hostname: hostname, + enableStdinCommands: false, + customDevToolsPath: + context.sdkConfigurationProvider.sdkLayout.devToolsDirectory, + ); + if (server == null) { + throw StateError('DevTools server could not be started.'); + } + return DevTools(server.address.host, server.port, server); + }, + ); + + TestDebugSettings.noDevTools() : super(enableDevToolsLaunch: false); + + TestDebugSettings._({ + required bool enableDebugging, + required bool enableDebugExtension, + required bool useSseForDebugBackend, + required bool useSseForDebugProxy, + required bool useSseForInjectedClient, + required bool spawnDds, + required bool enableDevToolsLaunch, + required bool launchDevToolsInNewWindow, + required bool emitDebugEvents, + required DevToolsLauncher? devToolsLauncher, + required ExpressionCompiler? expressionCompiler, + required UrlEncoder? urlEncoder, + }) : super( + enableDebugging: enableDebugging, + enableDebugExtension: enableDebugExtension, + useSseForDebugBackend: useSseForDebugBackend, + useSseForDebugProxy: useSseForDebugProxy, + useSseForInjectedClient: useSseForInjectedClient, + spawnDds: spawnDds, + enableDevToolsLaunch: enableDevToolsLaunch, + launchDevToolsInNewWindow: launchDevToolsInNewWindow, + emitDebugEvents: emitDebugEvents, + devToolsLauncher: devToolsLauncher, + expressionCompiler: expressionCompiler, + urlEncoder: urlEncoder, + ); + + TestDebugSettings copyWith({ + bool? enableDebugging, + bool? enableDebugExtension, + bool? useSse, + bool? spawnDds, + bool? enableDevToolsLaunch, + bool? launchDevToolsInNewWindow, + bool? emitDebugEvents, + DevToolsLauncher? devToolsLauncher, + ExpressionCompiler? expressionCompiler, + UrlEncoder? urlEncoder, + }) { + return TestDebugSettings._( + enableDebugging: enableDebugging ?? this.enableDebugging, + enableDebugExtension: enableDebugExtension ?? this.enableDebugExtension, + useSseForDebugProxy: useSse ?? useSseForDebugProxy, + useSseForDebugBackend: useSse ?? useSseForDebugBackend, + useSseForInjectedClient: useSse ?? useSseForInjectedClient, + spawnDds: spawnDds ?? this.spawnDds, + enableDevToolsLaunch: enableDevToolsLaunch ?? this.enableDevToolsLaunch, + launchDevToolsInNewWindow: + launchDevToolsInNewWindow ?? this.launchDevToolsInNewWindow, + emitDebugEvents: emitDebugEvents ?? this.emitDebugEvents, + devToolsLauncher: devToolsLauncher ?? this.devToolsLauncher, + expressionCompiler: expressionCompiler ?? this.expressionCompiler, + urlEncoder: urlEncoder ?? this.urlEncoder, ); + } +} + +class TestAppMetadata extends AppMetadata { + TestAppMetadata.internalFlutterApp() + : super( + isFlutterApp: () => Future.value(true), + isInternalBuild: true, + ); + TestAppMetadata.internalDartApp() + : super( + isFlutterApp: () => Future.value(false), + isInternalBuild: true, + ); + TestAppMetadata.externalFlutterApp() + : super( + isFlutterApp: () => Future.value(true), + isInternalBuild: false, + ); + TestAppMetadata.externalDartApp() + : super( + isFlutterApp: () => Future.value(false), + isInternalBuild: false, + ); +} -final defaultToolConfiguration = createToolConfiguration(); +class TestToolConfiguration extends ToolConfiguration { + TestToolConfiguration.forTests({ + LoadStrategy? loadStrategy, + DebugSettings? debugSettings, + AppMetadata? appMetadata, + }) : super( + loadStrategy: loadStrategy ?? FakeStrategy(FakeAssetReader()), + debugSettings: debugSettings ?? TestDebugSettings.noDevTools(), + appMetadata: appMetadata ?? TestAppMetadata.externalDartApp(), + ); +} void setGlobalsForTesting({ ToolConfiguration? toolConfiguration, }) { - globalToolConfiguration = toolConfiguration ?? defaultToolConfiguration; + globalToolConfiguration = + toolConfiguration ?? TestToolConfiguration.forTests(); } diff --git a/dwds/test/handlers/injector_test.dart b/dwds/test/handlers/injector_test.dart index 01e92db28..bb70ad5a3 100644 --- a/dwds/test/handlers/injector_test.dart +++ b/dwds/test/handlers/injector_test.dart @@ -302,7 +302,7 @@ void main() { group('InjectedHandlerWithoutExtension using WebSockets', () { late DwdsInjector injector; setUp(() async { - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( debugSettings: DebugSettings( useSseForInjectedClient: false, ), diff --git a/dwds/test/location_test.dart b/dwds/test/location_test.dart index 3eb0d2ea6..efe2a2899 100644 --- a/dwds/test/location_test.dart +++ b/dwds/test/location_test.dart @@ -24,7 +24,7 @@ void main() { const lines = 100; const lineLength = 150; final assetReader = FakeAssetReader(sourceMap: sourceMapContents); - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: MockLoadStrategy(assetReader), ); setGlobalsForTesting( diff --git a/dwds/test/metadata_test.dart b/dwds/test/metadata_test.dart index 3299c040e..2e04e082e 100644 --- a/dwds/test/metadata_test.dart +++ b/dwds/test/metadata_test.dart @@ -41,7 +41,7 @@ const _fileUriMetadata = '// intentionally empty: package blah has no dart sources'; void main() { - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: FakeStrategy(FakeAssetReader()), ); setGlobalsForTesting( diff --git a/dwds/test/puppeteer/test_utils.dart b/dwds/test/puppeteer/test_utils.dart index 6e3be1602..add15c21c 100644 --- a/dwds/test/puppeteer/test_utils.dart +++ b/dwds/test/puppeteer/test_utils.dart @@ -4,12 +4,14 @@ import 'dart:io'; +import 'package:dwds/dwds.dart'; import 'package:path/path.dart' as p; import 'package:puppeteer/puppeteer.dart'; import 'package:test/test.dart'; import 'package:test_common/utilities.dart'; import '../fixtures/context.dart'; +import '../fixtures/utilities.dart'; enum ConsoleSource { background, @@ -48,12 +50,20 @@ Future setUpExtensionTest( // launchChrome parameter: https://github.com/dart-lang/webdev/issues/1779 await context.setUp( launchChrome: false, - serveDevTools: serveDevTools, - useSse: useSse, - enableDebugExtension: true, - isInternalBuild: isInternalBuild, - isFlutterApp: isFlutterApp, - workspaceName: workspaceName, + debugSettings: serveDevTools + ? TestDebugSettings.withDevTools(context).copyWith( + enableDebugExtension: true, + useSse: useSse, + ) + : TestDebugSettings.noDevTools().copyWith( + enableDebugExtension: true, + useSse: useSse, + ), + appMetadata: AppMetadata( + isInternalBuild: isInternalBuild, + isFlutterApp: () => Future.value(isFlutterApp), + workspaceName: workspaceName, + ), ); return await puppeteer.launch( devTools: openChromeDevTools, diff --git a/dwds/test/reload_test.dart b/dwds/test/reload_test.dart index c2954e6b6..bd5bfba18 100644 --- a/dwds/test/reload_test.dart +++ b/dwds/test/reload_test.dart @@ -4,7 +4,7 @@ @TestOn('vm') @Timeout(Duration(minutes: 5)) -import 'package:dwds/src/loaders/strategy.dart'; +import 'package:dwds/dwds.dart'; import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; @@ -12,6 +12,7 @@ import 'package:vm_service/vm_service.dart'; import 'fixtures/context.dart'; import 'fixtures/project.dart'; +import 'fixtures/utilities.dart'; const originalString = 'Hello World!'; const newString = 'Bonjour le monde!'; @@ -70,7 +71,9 @@ void main() { setCurrentLogWriter(debug: debug); await context.setUp( reloadConfiguration: ReloadConfiguration.liveReload, - enableDebugging: false, + debugSettings: TestDebugSettings.noDevTools().copyWith( + enableDebugging: false, + ), ); }); @@ -95,8 +98,10 @@ void main() { setCurrentLogWriter(debug: debug); await context.setUp( reloadConfiguration: ReloadConfiguration.liveReload, - enableDebugging: false, - useSse: false, + debugSettings: TestDebugSettings.noDevTools().copyWith( + enableDebugging: false, + useSse: false, + ), ); }); @@ -480,7 +485,8 @@ void main() { setCurrentLogWriter(debug: debug); await context.setUp( reloadConfiguration: ReloadConfiguration.hotRestart, - enableDebugging: false, + debugSettings: + TestDebugSettings.noDevTools().copyWith(enableDebugging: false), ); }); diff --git a/dwds/test/skip_list_test.dart b/dwds/test/skip_list_test.dart index 3b1adc683..4049a7959 100644 --- a/dwds/test/skip_list_test.dart +++ b/dwds/test/skip_list_test.dart @@ -26,7 +26,7 @@ class TestStrategy extends FakeStrategy { } void main() { - final toolConfiguration = createToolConfiguration( + final toolConfiguration = TestToolConfiguration.forTests( loadStrategy: TestStrategy(FakeAssetReader()), ); setGlobalsForTesting(