From 68492c5b69e2310ce50b87c63d68b489125e104d Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Tue, 6 Apr 2021 11:19:02 -0700 Subject: [PATCH] Remove "unnecessary" imports. (#78664) --- .../test/general.shard/android/adb_log_reader_test.dart | 1 - .../general.shard/android/android_device_discovery_test.dart | 1 - .../android/android_device_port_forwarder_test.dart | 1 - .../test/general.shard/android/android_device_start_test.dart | 1 - .../test/general.shard/android/android_install_test.dart | 1 - .../flutter_tools/test/general.shard/android/gradle_test.dart | 2 -- packages/flutter_tools/test/general.shard/base/build_test.dart | 1 - .../flutter_tools/test/general.shard/base/logger_test.dart | 1 - .../test/general.shard/build_system/targets/web_test.dart | 3 +-- .../flutter_tools/test/general.shard/dart/pub_get_test.dart | 2 -- packages/flutter_tools/test/general.shard/emulator_test.dart | 1 - .../test/general.shard/fuchsia/fuchsia_ffx_test.dart | 1 - .../flutter_tools/test/general.shard/ios/ios_deploy_test.dart | 1 - .../test/general.shard/ios/ios_device_install_test.dart | 1 - .../test/general.shard/ios/ios_device_start_prebuilt_test.dart | 1 - packages/flutter_tools/test/general.shard/plugins_test.dart | 1 - packages/flutter_tools/test/general.shard/project_test.dart | 1 - .../flutter_tools/test/general.shard/resident_runner_test.dart | 2 -- .../test/general.shard/resident_web_runner_cold_test.dart | 1 - .../test/general.shard/resident_web_runner_test.dart | 2 -- .../test/general.shard/runner/local_engine_test.dart | 1 - .../flutter_tools/test/general.shard/web/devices_test.dart | 1 - .../test/general.shard/web/web_expression_compiler_test.dart | 1 - 23 files changed, 1 insertion(+), 28 deletions(-) diff --git a/packages/flutter_tools/test/general.shard/android/adb_log_reader_test.dart b/packages/flutter_tools/test/general.shard/android/adb_log_reader_test.dart index d6f56de62f..6376e06e9f 100644 --- a/packages/flutter_tools/test/general.shard/android/adb_log_reader_test.dart +++ b/packages/flutter_tools/test/general.shard/android/adb_log_reader_test.dart @@ -10,7 +10,6 @@ import 'package:flutter_tools/src/android/android_device.dart'; import 'package:test/fake.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; const int kLollipopVersionCode = 21; diff --git a/packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart b/packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart index a5cce93a59..0b61f84c1d 100644 --- a/packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_device_discovery_test.dart @@ -16,7 +16,6 @@ import 'package:test/fake.dart'; import '../../src/common.dart'; import '../../src/context.dart'; -import '../../src/fake_process_manager.dart'; import '../../src/fakes.dart'; void main() { diff --git a/packages/flutter_tools/test/general.shard/android/android_device_port_forwarder_test.dart b/packages/flutter_tools/test/general.shard/android/android_device_port_forwarder_test.dart index f73bed3dd2..ae66ad736b 100644 --- a/packages/flutter_tools/test/general.shard/android/android_device_port_forwarder_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_device_port_forwarder_test.dart @@ -10,7 +10,6 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/device_port_forwarder.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; void main() { diff --git a/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart b/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart index 0dfb7cfa9e..7d0ad6b854 100644 --- a/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart @@ -16,7 +16,6 @@ import 'package:flutter_tools/src/device.dart'; import 'package:test/fake.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; const FakeCommand kAdbVersionCommand = FakeCommand( diff --git a/packages/flutter_tools/test/general.shard/android/android_install_test.dart b/packages/flutter_tools/test/general.shard/android/android_install_test.dart index 2beb28a0bc..f0a20da9e5 100644 --- a/packages/flutter_tools/test/general.shard/android/android_install_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_install_test.dart @@ -14,7 +14,6 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:test/fake.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; const FakeCommand kAdbVersionCommand = FakeCommand( diff --git a/packages/flutter_tools/test/general.shard/android/gradle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_test.dart index af2ce01e91..74f710bd09 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart @@ -11,7 +11,6 @@ import 'package:flutter_tools/src/android/gradle_errors.dart'; import 'package:flutter_tools/src/android/gradle_utils.dart'; import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/common.dart'; -import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; @@ -21,7 +20,6 @@ import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:mockito/mockito.dart'; -import 'package:process/process.dart'; import '../../src/common.dart'; import '../../src/context.dart'; diff --git a/packages/flutter_tools/test/general.shard/base/build_test.dart b/packages/flutter_tools/test/general.shard/base/build_test.dart index 029900a30c..72c2205c28 100644 --- a/packages/flutter_tools/test/general.shard/base/build_test.dart +++ b/packages/flutter_tools/test/general.shard/base/build_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/macos/xcode.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; const FakeCommand kWhichSysctlCommand = FakeCommand( diff --git a/packages/flutter_tools/test/general.shard/base/logger_test.dart b/packages/flutter_tools/test/general.shard/base/logger_test.dart index 529c121c21..a6d2c09bbe 100644 --- a/packages/flutter_tools/test/general.shard/base/logger_test.dart +++ b/packages/flutter_tools/test/general.shard/base/logger_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/commands/daemon.dart'; -import 'package:matcher/matcher.dart'; import 'package:fake_async/fake_async.dart'; import 'package:meta/meta.dart'; import 'package:test/fake.dart'; diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart index a0b98d3113..d970135d7b 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart @@ -13,8 +13,7 @@ import 'package:flutter_tools/src/build_system/build_system.dart'; import 'package:flutter_tools/src/build_system/depfile.dart'; import 'package:flutter_tools/src/build_system/targets/common.dart'; import 'package:flutter_tools/src/build_system/targets/web.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; -import 'package:process/process.dart'; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../../src/common.dart'; import '../../../src/context.dart'; diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart index 87a2630fea..3fe2d05ace 100644 --- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart @@ -15,11 +15,9 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; -import 'package:process/process.dart'; import 'package:fake_async/fake_async.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; import '../../src/mocks.dart' as mocks; diff --git a/packages/flutter_tools/test/general.shard/emulator_test.dart b/packages/flutter_tools/test/general.shard/emulator_test.dart index e9579cb6d8..335ddcb4ac 100644 --- a/packages/flutter_tools/test/general.shard/emulator_test.dart +++ b/packages/flutter_tools/test/general.shard/emulator_test.dart @@ -18,7 +18,6 @@ import '../src/common.dart'; import '../src/context.dart'; import '../src/fakes.dart'; import '../src/mocks.dart'; -import '../src/testbed.dart'; const FakeEmulator emulator1 = FakeEmulator('Nexus_5', 'Nexus 5', 'Google'); const FakeEmulator emulator2 = FakeEmulator('Nexus_5X_API_27_x86', 'Nexus 5X', 'Google'); diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart index 7502437e11..c107ccc4fd 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart @@ -10,7 +10,6 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_ffx.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart'; -import 'package:process/process.dart'; import 'package:test/fake.dart'; import '../../src/common.dart'; diff --git a/packages/flutter_tools/test/general.shard/ios/ios_deploy_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_deploy_test.dart index fe098ad010..ada025565d 100644 --- a/packages/flutter_tools/test/general.shard/ios/ios_deploy_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/ios_deploy_test.dart @@ -19,7 +19,6 @@ import 'package:flutter_tools/src/ios/devices.dart'; import 'package:flutter_tools/src/ios/ios_deploy.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; import '../../src/fakes.dart'; diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart index b0da4cda62..430e31bd2d 100644 --- a/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart @@ -20,7 +20,6 @@ import 'package:flutter_tools/src/ios/mac.dart'; import 'package:meta/meta.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; import '../../src/fakes.dart'; diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart index ac4872df43..c6493dfa6d 100644 --- a/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart @@ -23,7 +23,6 @@ import 'package:flutter_tools/src/ios/mac.dart'; import 'package:mockito/mockito.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; import '../../src/fakes.dart'; diff --git a/packages/flutter_tools/test/general.shard/plugins_test.dart b/packages/flutter_tools/test/general.shard/plugins_test.dart index b828e7a24f..e3b5cb83cd 100644 --- a/packages/flutter_tools/test/general.shard/plugins_test.dart +++ b/packages/flutter_tools/test/general.shard/plugins_test.dart @@ -27,7 +27,6 @@ import '../src/common.dart'; import '../src/context.dart' hide FakeOperatingSystemUtils; import '../src/fakes.dart'; import '../src/pubspec_schema.dart'; -import '../src/testbed.dart'; void main() { group('plugins', () { diff --git a/packages/flutter_tools/test/general.shard/project_test.dart b/packages/flutter_tools/test/general.shard/project_test.dart index 6736e7ccd8..3927e40d5f 100644 --- a/packages/flutter_tools/test/general.shard/project_test.dart +++ b/packages/flutter_tools/test/general.shard/project_test.dart @@ -24,7 +24,6 @@ import 'package:mockito/mockito.dart'; import '../src/common.dart'; import '../src/context.dart'; import '../src/fakes.dart'; -import '../src/testbed.dart'; void main() { // TODO(jonahwilliams): remove once FlutterProject is fully refactored. 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 8a090818e3..50be1f6885 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart @@ -23,7 +23,6 @@ import 'package:file_testing/file_testing.dart'; import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/command_help.dart'; import 'package:flutter_tools/src/base/common.dart'; -import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart' as io; import 'package:flutter_tools/src/build_info.dart'; @@ -41,7 +40,6 @@ import 'package:mockito/mockito.dart'; import '../src/common.dart'; import '../src/context.dart'; -import '../src/fake_process_manager.dart'; import '../src/fakes.dart'; import '../src/testbed.dart'; diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart index 9d7e5300f6..68922389dc 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart @@ -26,7 +26,6 @@ import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; import '../src/common.dart'; import '../src/context.dart'; import '../src/fakes.dart'; -import '../src/testbed.dart'; void main() { ResidentWebRunner residentWebRunner; diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart index 3814cfe214..1bb58178d6 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart @@ -34,9 +34,7 @@ import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; import '../src/common.dart'; import '../src/context.dart'; -import '../src/fake_process_manager.dart'; import '../src/fakes.dart'; -import '../src/testbed.dart'; const List kAttachLogExpectations = [ FakeVmServiceRequest( diff --git a/packages/flutter_tools/test/general.shard/runner/local_engine_test.dart b/packages/flutter_tools/test/general.shard/runner/local_engine_test.dart index 8281014091..d765f40b6b 100644 --- a/packages/flutter_tools/test/general.shard/runner/local_engine_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/local_engine_test.dart @@ -11,7 +11,6 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/user_messages.dart'; import 'package:flutter_tools/src/runner/local_engine.dart'; -import 'package:matcher/matcher.dart'; import '../../src/common.dart'; 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 f5a72d396e..b7660f2251 100644 --- a/packages/flutter_tools/test/general.shard/web/devices_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devices_test.dart @@ -13,7 +13,6 @@ import 'package:flutter_tools/src/web/chrome.dart'; import 'package:flutter_tools/src/web/web_device.dart'; import '../../src/common.dart'; -import '../../src/context.dart'; import '../../src/fake_process_manager.dart'; import '../../src/fakes.dart'; diff --git a/packages/flutter_tools/test/general.shard/web/web_expression_compiler_test.dart b/packages/flutter_tools/test/general.shard/web/web_expression_compiler_test.dart index eaa8e3d071..4f8bd47e51 100644 --- a/packages/flutter_tools/test/general.shard/web/web_expression_compiler_test.dart +++ b/packages/flutter_tools/test/general.shard/web/web_expression_compiler_test.dart @@ -7,7 +7,6 @@ import 'package:dwds/dwds.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/isolated/devfs_web.dart'; -import 'package:matcher/matcher.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_tools/src/globals_null_migrated.dart' as globals;