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 fad989d732..e716a8f071 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart @@ -19,7 +19,6 @@ import 'package:flutter_tools/src/commands/attach.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/devices.dart'; -import 'package:flutter_tools/src/mdns_discovery.dart'; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/resident_runner.dart'; import 'package:flutter_tools/src/run_hot.dart'; @@ -718,7 +717,6 @@ void main() { class MockHotRunner extends Mock implements HotRunner {} class MockHotRunnerFactory extends Mock implements HotRunnerFactory {} class MockIOSDevice extends Mock implements IOSDevice {} -class MockMDnsObservatoryDiscovery extends Mock implements MDnsObservatoryDiscovery {} class MockPortForwarder extends Mock implements DevicePortForwarder {} class StreamLogger extends Logger { 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 7e06f7cf85..d96799faa0 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 @@ -1277,8 +1277,6 @@ class FuchsiaModulePackage extends ApplicationPackage { final String name; } -class MockFuchsiaArtifacts extends Mock implements FuchsiaArtifacts {} - class MockProcessManager extends Mock implements ProcessManager {} class MockProcessResult extends Mock implements ProcessResult {} diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_pm_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_pm_test.dart index c375013eee..7580b97a4f 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_pm_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_pm_test.dart @@ -7,7 +7,6 @@ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; -import 'package:flutter_tools/src/base/process.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_pm.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart'; import 'package:mockito/mockito.dart'; @@ -74,6 +73,4 @@ void main() { } class MockFuchsiaArtifacts extends Mock implements FuchsiaArtifacts {} -class MockProcessUtils extends Mock implements ProcessUtils {} -class MockProcess extends Mock implements Process {} class MockProcessManager extends Mock implements ProcessManager {} diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart index bccf367ccc..1d62613fbd 100644 --- a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart @@ -6,7 +6,6 @@ import 'dart:io' hide Directory, File; -import 'package:dwds/dwds.dart'; import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; @@ -1084,4 +1083,3 @@ void main() { class MockHttpServer extends Mock implements HttpServer {} class MockResidentCompiler extends Mock implements ResidentCompiler {} -class MockDwds extends Mock implements Dwds {} diff --git a/packages/flutter_tools/test/general.shard/web/devices_test.dart b/packages/flutter_tools/test/general.shard/web/devices_test.dart index 18bc6e6f52..d65d9cef95 100644 --- a/packages/flutter_tools/test/general.shard/web/devices_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devices_test.dart @@ -11,7 +11,6 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/web/chrome.dart'; import 'package:flutter_tools/src/web/web_device.dart'; -import 'package:mockito/mockito.dart'; import '../../src/common.dart'; import '../../src/context.dart'; @@ -126,8 +125,8 @@ void main() { }); testWithoutContext('Chrome device is not listed when Chrome cannot be run', () async { - final MockProcessManager processManager = MockProcessManager(); - when(processManager.canRun(any)).thenReturn(false); + final FakeProcessManager processManager = FakeProcessManager.list([]); + processManager.excludedExecutables = {kLinuxExecutable}; final WebDevices webDevices = WebDevices( featureFlags: TestFeatureFlags(isWebEnabled: true), fileSystem: MemoryFileSystem.test(), @@ -143,24 +142,6 @@ void main() { isNot(contains(isA()))); }); - testWithoutContext('Edge device is not listed when Edge cannot be run', () async { - final MockProcessManager processManager = MockProcessManager(); - when(processManager.canRun(any)).thenReturn(false); - final WebDevices webDevices = WebDevices( - featureFlags: TestFeatureFlags(isWebEnabled: true), - fileSystem: MemoryFileSystem.test(), - logger: BufferLogger.test(), - platform: FakePlatform( - operatingSystem: 'linux', - environment: {} - ), - processManager: processManager, - ); - - expect(await webDevices.pollingGetDevices(), - isNot(contains(isA()))); - }); - testWithoutContext('Web Server device is listed if enabled via showWebServerDevice', () async { WebServerDevice.showWebServerDevice = true; final WebDevices webDevices = WebDevices( @@ -329,6 +310,3 @@ void main() { expect((await macosWebDevices.pollingGetDevices()).whereType(), isEmpty); }); } - -// This is used to set `canRun` to false in a test. -class MockProcessManager extends Mock implements ProcessManager {}