diff --git a/dev/tracing_tests/test/image_painting_event_test.dart b/dev/tracing_tests/test/image_painting_event_test.dart index a786cce7419..ccc05fd181a 100644 --- a/dev/tracing_tests/test/image_painting_event_test.dart +++ b/dev/tracing_tests/test/image_painting_event_test.dart @@ -38,10 +38,6 @@ void main() { await binding.endOfFrame; }); - tearDownAll(() { - vmService.dispose(); - }); - test('Image painting events - deduplicates across frames', () async { final Completer completer = Completer(); vmService.onExtensionEvent.first.then(completer.complete); diff --git a/packages/flutter_tools/lib/src/base/dds.dart b/packages/flutter_tools/lib/src/base/dds.dart deleted file mode 100644 index 4eb1e667972..00000000000 --- a/packages/flutter_tools/lib/src/base/dds.dart +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; - -import 'package:dds/dds.dart' as dds; -import 'package:meta/meta.dart'; - -import 'io.dart' as io; -import 'logger.dart'; - -/// Helper class to launch a [dds.DartDevelopmentService]. Allows for us to -/// mock out this functionality for testing purposes. -class DartDevelopmentService { - DartDevelopmentService({@required this.logger}); - - final Logger logger; - dds.DartDevelopmentService _ddsInstance; - - Future startDartDevelopmentService( - Uri observatoryUri, - bool ipv6, - ) async { - final Uri ddsUri = Uri( - scheme: 'http', - host: (ipv6 ? - io.InternetAddress.loopbackIPv6 : - io.InternetAddress.loopbackIPv4 - ).host, - port: 0, - ); - logger.printTrace( - 'Launching a Dart Developer Service (DDS) instance at $ddsUri, ' - 'connecting to VM service at $observatoryUri.', - ); - try { - _ddsInstance = await dds.DartDevelopmentService.startDartDevelopmentService( - observatoryUri, - serviceUri: ddsUri, - ); - logger.printTrace('DDS is listening at ${_ddsInstance.uri}.'); - } on dds.DartDevelopmentServiceException catch (e) { - logger.printError('Warning: Failed to start DDS: ${e.message}'); - } - } - - Future shutdown() async => await _ddsInstance?.shutdown(); -} diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart index 1dcc3ac4e34..d327867275e 100644 --- a/packages/flutter_tools/lib/src/commands/attach.dart +++ b/packages/flutter_tools/lib/src/commands/attach.dart @@ -100,7 +100,6 @@ class AttachCommand extends FlutterCommand { 'and progress in machine friendly format.', ); usesTrackWidgetCreation(verboseHelp: verboseHelp); - addDdsOptions(verboseHelp: verboseHelp); hotRunnerFactory ??= HotRunnerFactory(); } @@ -373,7 +372,7 @@ class AttachCommand extends FlutterCommand { ); flutterDevice.observatoryUris = observatoryUris; final List flutterDevices = [flutterDevice]; - final DebuggingOptions debuggingOptions = DebuggingOptions.enabled(getBuildInfo(), disableDds: boolArg('disable-dds')); + final DebuggingOptions debuggingOptions = DebuggingOptions.enabled(getBuildInfo()); return getBuildInfo().isDebug ? hotRunnerFactory.build( diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index b644fa81133..abdf34d8eec 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart @@ -244,10 +244,6 @@ class DriveCommand extends RunCommandBase { throwToolExit('Application failed to start. Will not run test. Quitting.', exitCode: 1); } observatoryUri = result.observatoryUri.toString(); - // TODO(bkonyi): add web support (https://github.com/flutter/flutter/issues/61259) - if (!isWebPlatform) { - await device.dds.startDartDevelopmentService(Uri.parse(observatoryUri), ipv6); - } } else { globals.printStatus('Will connect to already running application instance.'); observatoryUri = stringArg('use-existing-app'); diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index 53412afcd0d..862bd18fda4 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart @@ -218,7 +218,6 @@ class RunCommand extends RunCommandBase { 'Currently this is only supported on Android devices. This option ' 'cannot be paired with --use-application-binary.' ); - addDdsOptions(verboseHelp: verboseHelp); } @override @@ -385,7 +384,6 @@ class RunCommand extends RunCommandBase { buildInfo, startPaused: boolArg('start-paused'), disableServiceAuthCodes: boolArg('disable-service-auth-codes'), - disableDds: boolArg('disable-dds'), dartFlags: stringArg('dart-flags') ?? '', useTestFonts: boolArg('use-test-fonts'), enableSoftwareRendering: boolArg('enable-software-rendering'), diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 5f6a4d00a79..0e9454b3336 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -16,7 +16,6 @@ import 'application_package.dart'; import 'artifacts.dart'; import 'base/config.dart'; import 'base/context.dart'; -import 'base/dds.dart'; import 'base/file_system.dart'; import 'base/io.dart'; import 'base/logger.dart'; @@ -548,12 +547,6 @@ abstract class Device { /// Get the port forwarder for this device. DevicePortForwarder get portForwarder; - /// Get the DDS instance for this device. - DartDevelopmentService get dds => _dds ??= DartDevelopmentService( - logger: globals.logger, - ); - DartDevelopmentService _dds; - /// Clear the device's logs. void clearLogs(); @@ -727,7 +720,6 @@ class DebuggingOptions { this.buildInfo, { this.startPaused = false, this.disableServiceAuthCodes = false, - this.disableDds = false, this.dartFlags = '', this.enableSoftwareRendering = false, this.skiaDeterministicRendering = false, @@ -770,7 +762,6 @@ class DebuggingOptions { startPaused = false, dartFlags = '', disableServiceAuthCodes = false, - disableDds = false, enableSoftwareRendering = false, skiaDeterministicRendering = false, traceSkia = false, @@ -790,7 +781,6 @@ class DebuggingOptions { final bool startPaused; final String dartFlags; final bool disableServiceAuthCodes; - final bool disableDds; final bool enableSoftwareRendering; final bool skiaDeterministicRendering; final bool traceSkia; diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart index 59789e6093b..5fefc73f573 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart @@ -52,13 +52,6 @@ Future _kDefaultFuchsiaIsolateDiscoveryConnector(Uri uri) return connectToVmService(uri); } -Future _kDefaultDartDevelopmentServiceStarter( - Device device, - Uri observatoryUri, -) async { - await device.dds.startDartDevelopmentService(observatoryUri, true); -} - /// Read the log for a particular device. class _FuchsiaLogReader extends DeviceLogReader { _FuchsiaLogReader(this._device, this._systemClock, [this._app]); @@ -702,7 +695,6 @@ class FuchsiaIsolateDiscoveryProtocol { this._device, this._isolateName, [ this._vmServiceConnector = _kDefaultFuchsiaIsolateDiscoveryConnector, - this._ddsStarter = _kDefaultDartDevelopmentServiceStarter, this._pollOnce = false, ]); @@ -712,7 +704,6 @@ class FuchsiaIsolateDiscoveryProtocol { final String _isolateName; final Completer _foundUri = Completer(); final Future Function(Uri) _vmServiceConnector; - final Future Function(Device, Uri) _ddsStarter; // whether to only poll once. final bool _pollOnce; Timer _pollingTimer; @@ -755,7 +746,6 @@ class FuchsiaIsolateDiscoveryProtocol { final int localPort = await _device.portForwarder.forward(port); try { final Uri uri = Uri.parse('http://[$_ipv6Loopback]:$localPort'); - await _ddsStarter(_device, uri); service = await _vmServiceConnector(uri); _ports[port] = service; } on SocketException catch (err) { diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 6747178781e..51d650fdd81 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -437,7 +437,7 @@ class IOSDevice extends Device { ); final Uri localUri = await fallbackDiscovery.discover( assumedDevicePort: assumedObservatoryPort, - device: this, + deivce: this, usesIpv6: ipv6, hostVmservicePort: debuggingOptions.hostVmServicePort, packageId: packageId, diff --git a/packages/flutter_tools/lib/src/ios/fallback_discovery.dart b/packages/flutter_tools/lib/src/ios/fallback_discovery.dart index 9a9e7e70617..32634f5d133 100644 --- a/packages/flutter_tools/lib/src/ios/fallback_discovery.dart +++ b/packages/flutter_tools/lib/src/ios/fallback_discovery.dart @@ -67,7 +67,7 @@ class FallbackDiscovery { Future discover({ @required int assumedDevicePort, @required String packageId, - @required Device device, + @required Device deivce, @required bool usesIpv6, @required int hostVmservicePort, @required String packageName, @@ -84,7 +84,7 @@ class FallbackDiscovery { try { final Uri result = await _mDnsObservatoryDiscovery.getObservatoryUri( packageId, - device, + deivce, usesIpv6: usesIpv6, hostVmservicePort: hostVmservicePort, ); diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index f6183929672..49c4addaea3 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -211,8 +211,6 @@ class FlutterDevice { ReloadMethod reloadMethod, GetSkSLMethod getSkSLMethod, PrintStructuredErrorLogMethod printStructuredErrorLogMethod, - bool disableDds = false, - bool ipv6 = false, }) { final Completer completer = Completer(); StreamSubscription subscription; @@ -223,12 +221,7 @@ class FlutterDevice { globals.printTrace('Connecting to service protocol: $observatoryUri'); isWaitingForVm = true; vm_service.VmService service; - if (!disableDds) { - await device.dds.startDartDevelopmentService( - observatoryUri, - ipv6, - ); - } + try { service = await connectToVmService( observatoryUri, @@ -959,7 +952,6 @@ abstract class ResidentRunner { Future exit() async { _exited = true; await shutdownDevtools(); - await shutdownDartDevelopmentService(); await stopEchoingDeviceLog(); await preExit(); await exitApp(); @@ -967,7 +959,6 @@ abstract class ResidentRunner { Future detach() async { await shutdownDevtools(); - await shutdownDartDevelopmentService(); await stopEchoingDeviceLog(); await preExit(); appFinished(); @@ -1136,14 +1127,6 @@ abstract class ResidentRunner { ); } - Future shutdownDartDevelopmentService() async { - await Future.wait( - flutterDevices.map>( - (FlutterDevice device) => device.device?.dds?.shutdown() - ).where((Future element) => element != null) - ); - } - @protected void cacheInitialDillCompilation() { if (_dillOutputPath != null) { @@ -1197,11 +1180,9 @@ abstract class ResidentRunner { reloadSources: reloadSources, restart: restart, compileExpression: compileExpression, - disableDds: debuggingOptions.disableDds, reloadMethod: reloadMethod, getSkSLMethod: getSkSLMethod, printStructuredErrorLogMethod: printStructuredErrorLog, - ipv6: ipv6, ); // This will wait for at least one flutter view before returning. final Status status = globals.logger.startProgress( diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 0b53966f327..c525f22a557 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -298,19 +298,6 @@ abstract class FlutterCommand extends Command { _usesPortOption = true; } - void addDdsOptions({@required bool verboseHelp}) { - argParser.addFlag( - 'disable-dds', - hide: !verboseHelp, - help: 'Disable the Dart Developer Service (DDS). This flag should only be provided' - ' when attaching to an application with an existing DDS instance (e.g.,' - ' attaching to an application currently connected to by "flutter run") or' - ' when running certain tests.\n' - 'Note: passing this flag may degrade IDE functionality if a DDS instance is not' - ' already connected to the target application.' - ); - } - /// Gets the vmservice port provided to in the 'observatory-port' or /// 'host-vmservice-port option. /// diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index 7365bd8f41e..7b7c83c0b6a 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart @@ -4,7 +4,6 @@ import 'dart:async'; -import 'package:dds/dds.dart'; import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; import 'package:stream_channel/stream_channel.dart'; @@ -515,7 +514,7 @@ class FlutterPlatform extends PlatformPlugin { Uri processObservatoryUri; _pipeStandardStreamsToConsole( process, - reportObservatoryUri: (Uri detectedUri) async { + reportObservatoryUri: (Uri detectedUri) { assert(processObservatoryUri == null); assert(explicitObservatoryPort == null || explicitObservatoryPort == detectedUri.port); @@ -528,14 +527,13 @@ class FlutterPlatform extends PlatformPlugin { globals.printTrace('test $ourTestCount: using observatory uri $detectedUri from pid ${process.pid}'); } processObservatoryUri = detectedUri; - await DartDevelopmentService.startDartDevelopmentService(processObservatoryUri); { globals.printTrace('Connecting to service protocol: $processObservatoryUri'); final Future localVmService = connectToVmService(processObservatoryUri, compileExpression: _compileExpressionService); - unawaited(localVmService.then((vm_service.VmService vmservice) { + localVmService.then((vm_service.VmService vmservice) { globals.printTrace('Successfully connected to service protocol: $processObservatoryUri'); - })); + }); } gotProcessObservatoryUri.complete(); watcher?.handleStartedProcess( @@ -872,9 +870,8 @@ class FlutterPlatform extends PlatformPlugin { void _pipeStandardStreamsToConsole( Process process, { void startTimeoutTimer(), - Future reportObservatoryUri(Uri uri), + void reportObservatoryUri(Uri uri), }) { - const String observatoryString = 'Observatory listening on '; for (final Stream> stream in >>[ process.stderr, @@ -884,7 +881,7 @@ class FlutterPlatform extends PlatformPlugin { .transform(utf8.decoder) .transform(const LineSplitter()) .listen( - (String line) async { + (String line) { if (line == _kStartTimeoutTimerMessage) { if (startTimeoutTimer != null) { startTimeoutTimer(); @@ -897,7 +894,7 @@ class FlutterPlatform extends PlatformPlugin { try { final Uri uri = Uri.parse(line.substring(observatoryString.length)); if (reportObservatoryUri != null) { - await reportObservatoryUri(uri); + reportObservatoryUri(uri); } } on Exception catch (error) { globals.printError('Could not parse shell observatory port message: $error'); diff --git a/packages/flutter_tools/lib/src/tracing.dart b/packages/flutter_tools/lib/src/tracing.dart index 4e1c2c22428..7458eb0ea06 100644 --- a/packages/flutter_tools/lib/src/tracing.dart +++ b/packages/flutter_tools/lib/src/tracing.dart @@ -22,6 +22,12 @@ class Tracing { Tracing(this.vmService); static const String firstUsefulFrameEventName = kFirstFrameRasterizedEventName; + + static Future connect(Uri uri) async { + final vm_service.VmService observatory = await connectToVmService(uri); + return Tracing(observatory); + } + final vm_service.VmService vmService; Future startTracing() async { diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 1f057cc39c6..d09eb1b2188 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -11,11 +11,10 @@ dependencies: # To update these, use "flutter update-packages --force-upgrade". archive: 2.0.13 args: 1.6.0 + dwds: 5.1.0 completion: 0.2.2 coverage: 0.14.0 crypto: 2.1.5 - dds: 1.2.3 - dwds: 5.1.0 file: 5.2.1 flutter_template_images: 1.0.1 http: 0.12.1 @@ -64,7 +63,6 @@ dependencies: http_parser: 3.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - json_rpc_2: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -109,4 +107,4 @@ dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: 998e +# PUBSPEC CHECKSUM: 85c5 diff --git a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart index 21f988a767d..ee034fa51bd 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart @@ -7,7 +7,6 @@ import 'dart:io'; import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/common.dart'; -import 'package:flutter_tools/src/base/dds.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/logger.dart'; @@ -72,7 +71,6 @@ void main() { FakeDeviceLogReader mockLogReader; MockPortForwarder portForwarder; - MockDartDevelopmentService mockDds; MockAndroidDevice device; MockHttpClient httpClient; @@ -80,7 +78,6 @@ void main() { mockLogReader = FakeDeviceLogReader(); portForwarder = MockPortForwarder(); device = MockAndroidDevice(); - mockDds = MockDartDevelopmentService(); when(device.portForwarder) .thenReturn(portForwarder); when(portForwarder.forward(devicePort, hostPort: anyNamed('hostPort'))) @@ -89,8 +86,6 @@ void main() { .thenReturn([ForwardedPort(hostPort, devicePort)]); when(portForwarder.unforward(any)) .thenAnswer((_) async => null); - when(device.dds).thenReturn(mockDds); - when(mockDds.startDartDevelopmentService(any, false)).thenReturn(null); final HttpClientRequest httpClientRequest = MockHttpClientRequest(); httpClient = MockHttpClient(); @@ -291,14 +286,11 @@ void main() { const int hostPort = 42; final FakeDeviceLogReader mockLogReader = FakeDeviceLogReader(); final MockPortForwarder portForwarder = MockPortForwarder(); - final MockDartDevelopmentService mockDds = MockDartDevelopmentService(); final MockAndroidDevice device = MockAndroidDevice(); final MockHotRunner mockHotRunner = MockHotRunner(); final MockHotRunnerFactory mockHotRunnerFactory = MockHotRunnerFactory(); when(device.portForwarder) .thenReturn(portForwarder); - when(device.dds) - .thenReturn(mockDds); when(portForwarder.forward(devicePort, hostPort: anyNamed('hostPort'))) .thenAnswer((_) async => hostPort); when(portForwarder.forwardedPorts) @@ -317,7 +309,6 @@ void main() { )).thenReturn(mockHotRunner); when(mockHotRunner.exited).thenReturn(false); when(mockHotRunner.isWaitingForObservatory).thenReturn(false); - when(mockDds.startDartDevelopmentService(any, false)).thenReturn(null); testDeviceManager.addDevice(device); when(device.getLogReader(includePastLogs: anyNamed('includePastLogs'))) @@ -368,14 +359,10 @@ void main() { const int hostPort = 42; final FakeDeviceLogReader mockLogReader = FakeDeviceLogReader(); final MockPortForwarder portForwarder = MockPortForwarder(); - final MockDartDevelopmentService mockDds = MockDartDevelopmentService(); final MockIOSDevice device = MockIOSDevice(); final MockHotRunner mockHotRunner = MockHotRunner(); final MockHotRunnerFactory mockHotRunnerFactory = MockHotRunnerFactory(); - when(device.portForwarder) - .thenReturn(portForwarder); - when(device.dds) - .thenReturn(mockDds); + when(device.portForwarder).thenReturn(portForwarder); when(device.getLogReader(includePastLogs: anyNamed('includePastLogs'))) .thenAnswer((_) => mockLogReader); when(portForwarder.forward(devicePort, hostPort: anyNamed('hostPort'))) @@ -396,7 +383,6 @@ void main() { )).thenReturn(mockHotRunner); when(mockHotRunner.exited).thenReturn(false); when(mockHotRunner.isWaitingForObservatory).thenReturn(false); - when(mockDds.startDartDevelopmentService(any, false)).thenReturn(null); testDeviceManager.addDevice(device); @@ -429,7 +415,6 @@ void main() { setUp(() { portForwarder = MockPortForwarder(); - final MockDartDevelopmentService mockDds = MockDartDevelopmentService(); device = MockAndroidDevice(); when(device.portForwarder) @@ -440,10 +425,6 @@ void main() { .thenReturn([ForwardedPort(hostPort, devicePort)]); when(portForwarder.unforward(any)) .thenAnswer((_) async => null); - when(device.dds) - .thenReturn(mockDds); - when(mockDds.startDartDevelopmentService(any, any)) - .thenReturn(null); }); testUsingContext('succeeds in ipv4 mode', () async { @@ -814,7 +795,6 @@ class TestHotRunnerFactory extends HotRunnerFactory { } } -class MockDartDevelopmentService extends Mock implements DartDevelopmentService {} class MockProcessManager extends Mock implements ProcessManager {} class MockProcess extends Mock implements Process {} class MockHttpClientRequest extends Mock implements HttpClientRequest {} diff --git a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart index 231860567cf..0ce92dad6e3 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart @@ -8,7 +8,6 @@ import 'package:file/memory.dart'; import 'package:file_testing/file_testing.dart'; import 'package:flutter_tools/src/android/android_device.dart'; import 'package:flutter_tools/src/base/common.dart'; -import 'package:flutter_tools/src/base/dds.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/platform.dart'; @@ -68,12 +67,6 @@ void main() { tryToDelete(tempDir); }); - void applyDdsMocks(Device device) { - final MockDartDevelopmentService mockDds = MockDartDevelopmentService(); - when(device.dds).thenReturn(mockDds); - when(mockDds.startDartDevelopmentService(any, any)).thenReturn(null); - } - testUsingContext('returns 1 when test file is not found', () async { testDeviceManager.addDevice(MockDevice()); @@ -195,9 +188,7 @@ void main() { }); testUsingContext('returns 0 when test ends successfully', () async { - final MockAndroidDevice mockDevice = MockAndroidDevice(); - applyDdsMocks(mockDevice); - testDeviceManager.addDevice(mockDevice); + testDeviceManager.addDevice(MockAndroidDevice()); final String testApp = globals.fs.path.join(tempDir.path, 'test', 'e2e.dart'); final String testFile = globals.fs.path.join(tempDir.path, 'test_driver', 'e2e_test.dart'); @@ -236,9 +227,7 @@ void main() { }); testUsingContext('returns exitCode set by test runner', () async { - final MockDevice mockDevice = MockDevice(); - applyDdsMocks(mockDevice); - testDeviceManager.addDevice(mockDevice); + testDeviceManager.addDevice(MockDevice()); final String testApp = globals.fs.path.join(tempDir.path, 'test', 'e2e.dart'); final String testFile = globals.fs.path.join(tempDir.path, 'test_driver', 'e2e_test.dart'); @@ -385,7 +374,6 @@ void main() { Future appStarterSetup() async { final Device mockDevice = MockDevice(); - applyDdsMocks(mockDevice); testDeviceManager.addDevice(mockDevice); final FakeDeviceLogReader mockDeviceLogReader = FakeDeviceLogReader(); @@ -521,7 +509,6 @@ void main() { Future appStarterSetup() async { final Device mockDevice = MockDevice(); - applyDdsMocks(mockDevice); testDeviceManager.addDevice(mockDevice); final FakeDeviceLogReader mockDeviceLogReader = FakeDeviceLogReader(); @@ -805,5 +792,5 @@ class MockDevice extends Mock implements Device { } class MockAndroidDevice extends Mock implements AndroidDevice { } -class MockDartDevelopmentService extends Mock implements DartDevelopmentService { } + class MockLaunchResult extends Mock implements LaunchResult { } diff --git a/packages/flutter_tools/test/general.shard/cold_test.dart b/packages/flutter_tools/test/general.shard/cold_test.dart index 3141df07050..38009698626 100644 --- a/packages/flutter_tools/test/general.shard/cold_test.dart +++ b/packages/flutter_tools/test/general.shard/cold_test.dart @@ -139,8 +139,6 @@ class TestFlutterDevice extends FlutterDevice { ReloadMethod reloadMethod, GetSkSLMethod getSkSLMethod, PrintStructuredErrorLogMethod printStructuredErrorLogMethod, - bool disableDds = false, - bool ipv6 = false, }) async { throw exception; } diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart index e2f7826cd52..89772864dda 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart @@ -728,7 +728,6 @@ void main() { fuchsiaDevice, expectedIsolateName, (Uri uri) async => fakeVmServiceHost.vmService, - (Device device, Uri uri) => null, true, // only poll once. ); diff --git a/packages/flutter_tools/test/general.shard/hot_test.dart b/packages/flutter_tools/test/general.shard/hot_test.dart index 3d11937fb72..6d9c011b954 100644 --- a/packages/flutter_tools/test/general.shard/hot_test.dart +++ b/packages/flutter_tools/test/general.shard/hot_test.dart @@ -578,8 +578,6 @@ class TestFlutterDevice extends FlutterDevice { ReloadMethod reloadMethod, GetSkSLMethod getSkSLMethod, PrintStructuredErrorLogMethod printStructuredErrorLogMethod, - bool disableDds = false, - bool ipv6 = false, }) async { throw exception; } diff --git a/packages/flutter_tools/test/general.shard/ios/fallback_discovery_test.dart b/packages/flutter_tools/test/general.shard/ios/fallback_discovery_test.dart index 3b337194934..06f901eaa01 100644 --- a/packages/flutter_tools/test/general.shard/ios/fallback_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/fallback_discovery_test.dart @@ -61,7 +61,7 @@ void main() { expect(await fallbackDiscovery.discover( assumedDevicePort: 23, - device: null, + deivce: null, hostVmservicePort: 1, packageId: null, usesIpv6: false, @@ -86,7 +86,7 @@ void main() { }); expect(await fallbackDiscovery.discover( assumedDevicePort: 23, - device: null, + deivce: null, hostVmservicePort: 1, packageId: null, usesIpv6: false, @@ -117,7 +117,7 @@ void main() { expect(await fallbackDiscovery.discover( assumedDevicePort: 23, - device: null, + deivce: null, hostVmservicePort: 1, packageId: 'hello', usesIpv6: false, @@ -139,7 +139,7 @@ void main() { expect(await fallbackDiscovery.discover( assumedDevicePort: 23, - device: null, + deivce: null, hostVmservicePort: 1, packageId: 'hello', usesIpv6: false, @@ -161,7 +161,7 @@ void main() { expect(await fallbackDiscovery.discover( assumedDevicePort: 23, - device: null, + deivce: null, hostVmservicePort: 1, packageId: 'hello', usesIpv6: false, diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart index 2fd03624f81..027de7c7577 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart @@ -4,7 +4,6 @@ import 'dart:async'; -import 'package:flutter_tools/src/base/dds.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:vm_service/vm_service.dart' as vm_service; import 'package:file/memory.dart'; @@ -1677,11 +1676,8 @@ void main() { testUsingContext('connect sets up log reader', () => testbed.run(() async { fakeVmServiceHost = FakeVmServiceHost(requests: []); final MockDevice mockDevice = MockDevice(); - final MockDartDevelopmentService mockDds = MockDartDevelopmentService(); final MockDeviceLogReader mockLogReader = MockDeviceLogReader(); when(mockDevice.getLogReader(app: anyNamed('app'))).thenReturn(mockLogReader); - when(mockDevice.dds).thenReturn(mockDds); - when(mockDds.startDartDevelopmentService(any, any)).thenReturn(null); final TestFlutterDevice flutterDevice = TestFlutterDevice( mockDevice, @@ -1713,7 +1709,6 @@ void main() { } class MockFlutterDevice extends Mock implements FlutterDevice {} -class MockDartDevelopmentService extends Mock implements DartDevelopmentService {} class MockVMService extends Mock implements vm_service.VmService {} class MockDevFS extends Mock implements DevFS {} class MockDevice extends Mock implements Device {} diff --git a/packages/flutter_tools/test/integration.shard/flutter_attach_test.dart b/packages/flutter_tools/test/integration.shard/flutter_attach_test.dart index 9e2ebdece32..8878c3517e2 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_attach_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_attach_test.dart @@ -21,14 +21,7 @@ void main() { tempDir = createResolvedTempDirectorySync('attach_test.'); await _project.setUpIn(tempDir); _flutterRun = FlutterRunTestDriver(tempDir, logPrefix: ' RUN '); - _flutterAttach = FlutterRunTestDriver( - tempDir, - logPrefix: 'ATTACH ', - // Only one DDS instance can be connected to the VM service at a time. - // DDS can also only initialize if the VM service doesn't have any existing - // clients, so we'll just let _flutterRun be responsible for spawning DDS. - spawnDdsInstance: false, - ); + _flutterAttach = FlutterRunTestDriver(tempDir, logPrefix: 'ATTACH '); }); tearDown(() async { @@ -65,11 +58,7 @@ void main() { await _flutterRun.run(withDebugger: true); await _flutterAttach.attach(_flutterRun.vmServicePort); await _flutterAttach.quit(); - _flutterAttach = FlutterRunTestDriver( - tempDir, - logPrefix: 'ATTACH-2', - spawnDdsInstance: false, - ); + _flutterAttach = FlutterRunTestDriver(tempDir, logPrefix: 'ATTACH-2'); await _flutterAttach.attach(_flutterRun.vmServicePort); await _flutterAttach.hotReload(); }); diff --git a/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart b/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart index 075141eb4b2..5ffc17c0a42 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_run_with_error_test.dart @@ -25,6 +25,7 @@ void main() { }); tearDown(() async { + await _flutter.stop(); tryToDelete(tempDir); }); @@ -50,6 +51,7 @@ void main() { // Complete anyway in case we don't see the 'Another exception' line. completer.complete(); }); + await _flutter.stop(); expect(stdout.toString(), contains(_exceptionStart)); @@ -60,6 +62,7 @@ void main() { await _flutter.run(startPaused: true, withDebugger: true, structuredErrors: true, chrome: true); await _flutter.resume(); + final Completer completer = Completer(); bool lineFound = false; diff --git a/packages/flutter_tools/test/integration.shard/test_driver.dart b/packages/flutter_tools/test/integration.shard/test_driver.dart index 5334a971dc4..946e9dbb7c6 100644 --- a/packages/flutter_tools/test/integration.shard/test_driver.dart +++ b/packages/flutter_tools/test/integration.shard/test_driver.dart @@ -428,7 +428,6 @@ class FlutterRunTestDriver extends FlutterTestDriver { FlutterRunTestDriver( Directory projectFolder, { String logPrefix, - this.spawnDdsInstance = true, }) : super(projectFolder, logPrefix: logPrefix); String _currentRunningAppId; @@ -448,8 +447,6 @@ class FlutterRunTestDriver extends FlutterTestDriver { 'run', if (!chrome) '--disable-service-auth-codes', - if (!spawnDdsInstance) - '--disable-dds', '--machine', '-d', if (chrome) @@ -482,8 +479,6 @@ class FlutterRunTestDriver extends FlutterTestDriver { [ 'attach', '--machine', - if (!spawnDdsInstance) - '--disable-dds', '-d', 'flutter-tester', '--debug-port', @@ -685,8 +680,6 @@ class FlutterRunTestDriver extends FlutterTestDriver { void _throwErrorResponse(String message) { throw '$message\n\n$_lastResponse\n\n${_errorBuffer.toString()}'.trim(); } - - final bool spawnDdsInstance; } class FlutterTestTestDriver extends FlutterTestDriver { diff --git a/packages/flutter_tools/test/integration.shard/vmservice_integration_test.dart b/packages/flutter_tools/test/integration.shard/vmservice_integration_test.dart index 2466b7cdaa7..1eb5867c9fd 100644 --- a/packages/flutter_tools/test/integration.shard/vmservice_integration_test.dart +++ b/packages/flutter_tools/test/integration.shard/vmservice_integration_test.dart @@ -39,15 +39,6 @@ void main() { tryToDelete(tempDir); }); - test('getSupportedProtocols includes DDS', () async { - final ProtocolList protocolList = - await vmService.getSupportedProtocols(); - expect(protocolList.protocols, hasLength(2)); - for (final Protocol protocol in protocolList.protocols) { - expect(protocol.protocolName, anyOf('VM Service', 'DDS')); - } - }); - test('flutterVersion can be called', () async { final Response response = await vmService.callServiceExtension('s0.flutterVersion');