Move tools tests into a general.shard directory in preparation to changing how...

Move tools tests into a general.shard directory in preparation to changing how we shard tools tests (#36108)

dev/bots/test.dart

@@ -592,7 +592,7 @@ Future<void> _pubRunTest(
       args.addAll(<String>['--exclude-tags', 'integration']);
       break;
     case 'create':
-      args.addAll(<String>[path.join('test', 'commands', 'create_test.dart')]);
+      args.addAll(<String>[path.join('test', 'general.shard', 'commands', 'create_test.dart')]);
       break;
   }
 

packages/flutter_tools/test/analytics_test.dart → packages/flutter_tools/test/general.shard/analytics_test.dart

@@ -16,8 +16,8 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/usage.dart';
 import 'package:flutter_tools/src/version.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('analytics', () {

packages/flutter_tools/test/android/android_device_test.dart → packages/flutter_tools/test/general.shard/android/android_device_test.dart

@@ -19,9 +19,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('android_device', () {

packages/flutter_tools/test/android/android_emulator_test.dart → packages/flutter_tools/test/general.shard/android/android_emulator_test.dart

@@ -5,8 +5,8 @@
 import 'package:flutter_tools/src/android/android_emulator.dart';
 import 'package:flutter_tools/src/device.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('android_emulator', () {

packages/flutter_tools/test/android/android_sdk_test.dart → packages/flutter_tools/test/general.shard/android/android_sdk_test.dart

@@ -11,9 +11,9 @@ import 'package:flutter_tools/src/base/config.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 class MockProcessManager extends Mock implements ProcessManager {}
 

packages/flutter_tools/test/android/android_studio_test.dart → packages/flutter_tools/test/general.shard/android/android_studio_test.dart

@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String homeLinux = '/home/me';
 const String homeMac = '/Users/me';

packages/flutter_tools/test/android/android_studio_validator_test.dart → packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart

@@ -6,8 +6,8 @@ import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/android/android_studio_validator.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String home = '/home/me';
 

packages/flutter_tools/test/android/android_workflow_test.dart → packages/flutter_tools/test/general.shard/android/android_workflow_test.dart

@@ -16,9 +16,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockAndroidSdk, MockProcess, MockProcessManager, MockStdio;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockAndroidSdk, MockProcess, MockProcessManager, MockStdio;
 
 class MockAndroidSdkVersion extends Mock implements AndroidSdkVersion {}
 

packages/flutter_tools/test/android/gradle_test.dart → packages/flutter_tools/test/general.shard/android/gradle_test.dart

@@ -16,9 +16,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/pubspec_schema.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/pubspec_schema.dart';
 
 void main() {
   Cache.flutterRoot = getFlutterRoot();

packages/flutter_tools/test/application_package_test.dart → packages/flutter_tools/test/general.shard/application_package_test.dart

@@ -23,8 +23,8 @@ import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{

packages/flutter_tools/test/artifacts_test.dart → packages/flutter_tools/test/general.shard/artifacts_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('CachedArtifacts', () {

packages/flutter_tools/test/asset_bundle_package_fonts_test.dart → packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart

@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   String fixPath(String path) {

packages/flutter_tools/test/asset_bundle_package_test.dart → packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart

@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   String fixPath(String path) {

packages/flutter_tools/test/asset_bundle_test.dart → packages/flutter_tools/test/general.shard/asset_bundle_test.dart

@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   setUpAll(() {

packages/flutter_tools/test/asset_bundle_variant_test.dart → packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart

@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   String fixPath(String path) {

packages/flutter_tools/test/asset_test.dart → packages/flutter_tools/test/general.shard/asset_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/asset.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/cache.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('Assets', () {

packages/flutter_tools/test/base/build_test.dart → packages/flutter_tools/test/general.shard/base/build_test.dart

@@ -18,8 +18,8 @@ import 'package:flutter_tools/src/macos/xcode.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockFlutterVersion extends Mock implements FlutterVersion {}
 class MockAndroidSdk extends Mock implements AndroidSdk {}

packages/flutter_tools/test/base/common_test.dart → packages/flutter_tools/test/general.shard/base/common_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/common.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 void main() {
   group('throwToolExit', () {

packages/flutter_tools/test/base/context_test.dart → packages/flutter_tools/test/general.shard/base/context_test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_tools/src/base/context.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 void main() {
   group('AppContext', () {

packages/flutter_tools/test/base/file_system_test.dart → packages/flutter_tools/test/general.shard/base/file_system_test.dart

@@ -6,8 +6,8 @@ import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:platform/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('ensureDirectoryExists', () {

packages/flutter_tools/test/base/fingerprint_test.dart → packages/flutter_tools/test/general.shard/base/fingerprint_test.dart

@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/base/fingerprint.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('Fingerprinter', () {

packages/flutter_tools/test/base/flags_test.dart → packages/flutter_tools/test/general.shard/base/flags_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/flags.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 typedef _TestMethod = FutureOr<void> Function();
 

packages/flutter_tools/test/base/io_test.dart → packages/flutter_tools/test/general.shard/base/io_test.dart

@@ -8,8 +8,8 @@ import 'dart:io' as io;
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('ProcessSignal', () {

packages/flutter_tools/test/base/logger_test.dart → packages/flutter_tools/test/general.shard/base/logger_test.dart

@@ -11,9 +11,9 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:quiver/testing/async.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 final Generator _kNoAnsiPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 

packages/flutter_tools/test/base/logs_test.dart → packages/flutter_tools/test/general.shard/base/logs_test.dart

@@ -5,9 +5,9 @@
 import 'package:flutter_tools/src/base/common.dart';
 import 'package:flutter_tools/src/commands/logs.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('logs', () {

packages/flutter_tools/test/base/net_test.dart → packages/flutter_tools/test/general.shard/base/net_test.dart

@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/io.dart' as io;
 import 'package:flutter_tools/src/base/net.dart';
 import 'package:quiver/testing/async.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   testUsingContext('retry from 500', () async {

packages/flutter_tools/test/base/os_test.dart → packages/flutter_tools/test/general.shard/base/os_test.dart

@@ -9,8 +9,8 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:platform/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String kExecutable = 'foo';
 const String kPath1 = '/bar/bin/$kExecutable';

packages/flutter_tools/test/base/os_utils_test.dart → packages/flutter_tools/test/general.shard/base/os_utils_test.dart

@@ -6,8 +6,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('OperatingSystemUtils', () {

packages/flutter_tools/test/base/process_test.dart → packages/flutter_tools/test/general.shard/base/process_test.dart

@@ -10,9 +10,9 @@ import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockProcess, MockProcessManager;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockProcess, MockProcessManager;
 
 void main() {
   group('process exceptions', () {

packages/flutter_tools/test/base/terminal_test.dart → packages/flutter_tools/test/general.shard/base/terminal_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
 import 'package:flutter_tools/src/globals.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('output preferences', () {

packages/flutter_tools/test/base/utils_test.dart → packages/flutter_tools/test/general.shard/base/utils_test.dart

@@ -7,9 +7,9 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/base/utils.dart';
 import 'package:platform/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('BotDetector', () {

packages/flutter_tools/test/base_utils_test.dart → packages/flutter_tools/test/general.shard/base_utils_test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter_tools/src/base/utils.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   group('ItemListNotifier', () {

packages/flutter_tools/test/bug_report_test.dart → packages/flutter_tools/test/general.shard/bug_report_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/os.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   Cache.disableLocking();

packages/flutter_tools/test/build_info_test.dart → packages/flutter_tools/test/general.shard/build_info_test.dart

@@ -5,8 +5,8 @@
 
 import 'package:flutter_tools/src/build_info.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   setUpAll(() { });

packages/flutter_tools/test/build_runner/multiroot_asset_reader_test.dart → packages/flutter_tools/test/general.shard/build_runner/multiroot_asset_reader_test.dart

@@ -9,8 +9,8 @@ import 'package:build_runner_core/build_runner_core.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/build_runner/web_compilation_delegate.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   group('MultirootFileBasedAssetReader', () {

packages/flutter_tools/test/build_system/build_system_test.dart → packages/flutter_tools/test/general.shard/build_system/build_system_test.dart

@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/convert.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/testbed.dart';
 
 void main() {
   setUpAll(() {

packages/flutter_tools/test/build_system/exceptions_test.dart → packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart

@@ -6,7 +6,7 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/build_system/exceptions.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 void main() {
   test('Exceptions', () {

packages/flutter_tools/test/build_system/targets/assets_test.dart → packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart

@@ -6,8 +6,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/build_system/targets/assets.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('copy_assets', () {

packages/flutter_tools/test/build_system/targets/dart_test.dart → packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart

@@ -15,9 +15,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../../src/common.dart';
-import '../../src/mocks.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/mocks.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('dart rules', () {

packages/flutter_tools/test/build_system/targets/linux_test.dart → packages/flutter_tools/test/general.shard/build_system/targets/linux_test.dart

@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/build_system/targets/linux.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('unpack_linux', () {

packages/flutter_tools/test/build_system/targets/macos_test.dart → packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart

@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/build_system/targets/macos.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('unpack_macos', () {

packages/flutter_tools/test/build_system/targets/windows_test.dart → packages/flutter_tools/test/general.shard/build_system/targets/windows_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/build_system/targets/windows.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../src/common.dart';
-import '../../src/testbed.dart';
+import '../../../src/common.dart';
+import '../../../src/testbed.dart';
 
 void main() {
   group('unpack_windows', () {

packages/flutter_tools/test/cache_test.dart → packages/flutter_tools/test/general.shard/cache_test.dart

@@ -12,8 +12,8 @@ import 'package:platform/platform.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/base/io.dart' show InternetAddress, SocketException;
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('$Cache.checkLockAcquired', () {

packages/flutter_tools/test/channel_test.dart → packages/flutter_tools/test/general.shard/channel_test.dart

@@ -15,8 +15,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 Process createMockProcess({ int exitCode = 0, String stdout = '', String stderr = '' }) {
   final Stream<List<int>> stdoutStream = Stream<List<int>>.fromIterable(<List<int>>[

packages/flutter_tools/test/commands/analyze_continuously_test.dart → packages/flutter_tools/test/general.shard/commands/analyze_continuously_test.dart

@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/dart/pub.dart';
 import 'package:flutter_tools/src/dart/sdk.dart';
 import 'package:flutter_tools/src/runner/flutter_command_runner.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   AnalysisServer server;

packages/flutter_tools/test/commands/analyze_once_test.dart → packages/flutter_tools/test/general.shard/commands/analyze_once_test.dart

@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/commands/analyze.dart';
 import 'package:flutter_tools/src/commands/create.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 /// Test case timeout for tests involving project analysis.
 const Timeout allowForSlowAnalyzeTests = Timeout.factor(5.0);

packages/flutter_tools/test/commands/analyze_test.dart → packages/flutter_tools/test/general.shard/commands/analyze_test.dart

@@ -7,8 +7,8 @@ import 'package:file/memory.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/analyze_base.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 const String _kFlutterRoot = '/data/flutter';
 

packages/flutter_tools/test/commands/assemble_test.dart → packages/flutter_tools/test/general.shard/commands/assemble_test.dart

@@ -12,8 +12,8 @@ import 'package:flutter_tools/src/commands/assemble.dart';
 import 'package:flutter_tools/src/globals.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   group('Assemble', () {

packages/flutter_tools/test/commands/attach_test.dart → packages/flutter_tools/test/general.shard/commands/attach_test.dart

@@ -19,9 +19,9 @@ import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 import 'package:multicast_dns/multicast_dns.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('attach', () {

packages/flutter_tools/test/commands/build_bundle_test.dart → packages/flutter_tools/test/general.shard/commands/build_bundle_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/bundle.dart';
 import 'package:flutter_tools/src/usage.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   Cache.disableLocking();

packages/flutter_tools/test/commands/build_fuchsia_test.dart → packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart

@@ -16,9 +16,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   Cache.disableLocking();

packages/flutter_tools/test/commands/build_linux_test.dart → packages/flutter_tools/test/general.shard/commands/build_linux_test.dart

@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;

packages/flutter_tools/test/commands/build_macos_test.dart → packages/flutter_tools/test/general.shard/commands/build_macos_test.dart

@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;

packages/flutter_tools/test/commands/build_web_test.dart → packages/flutter_tools/test/general.shard/commands/build_web_test.dart

@@ -15,8 +15,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:flutter_tools/src/web/compile.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 void main() {
   MockWebCompilationProxy mockWebCompilationProxy;

packages/flutter_tools/test/commands/build_windows_test.dart → packages/flutter_tools/test/general.shard/commands/build_windows_test.dart

@@ -14,9 +14,9 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:xml/xml.dart' as xml;
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;

packages/flutter_tools/test/commands/clean_test.dart → packages/flutter_tools/test/general.shard/commands/clean_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/commands/clean.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 
 void main() {

packages/flutter_tools/test/commands/config_test.dart → packages/flutter_tools/test/general.shard/commands/config_test.dart

@@ -11,8 +11,8 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/commands/config.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   MockAndroidStudio mockAndroidStudio;

packages/flutter_tools/test/commands/create_test.dart → packages/flutter_tools/test/general.shard/commands/create_test.dart

@@ -22,8 +22,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 
 const String frameworkRevision = '12345678';
@@ -1063,7 +1063,7 @@ Future<void> _createProject(
   List<String> expectedPaths, {
   List<String> unexpectedPaths = const <String>[],
 }) async {
-  Cache.flutterRoot = '../..';
+  Cache.flutterRoot = '../../..';
   final CreateCommand command = CreateCommand();
   final CommandRunner<void> runner = createTestCommandRunner(command);
   await runner.run(<String>[

packages/flutter_tools/test/commands/create_usage_test.dart → packages/flutter_tools/test/general.shard/commands/create_usage_test.dart

@@ -9,8 +9,8 @@ import 'package:flutter_tools/src/commands/create.dart';
 import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/usage.dart';
 
-import '../src/common.dart';
-import '../src/testbed.dart';
+import '../../src/common.dart';
+import '../../src/testbed.dart';
 
 
 void main() {

packages/flutter_tools/test/commands/daemon_test.dart → packages/flutter_tools/test/general.shard/commands/daemon_test.dart

@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/globals.dart';
 import 'package:flutter_tools/src/ios/ios_workflow.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   Daemon daemon;

packages/flutter_tools/test/commands/devices_test.dart → packages/flutter_tools/test/general.shard/commands/devices_test.dart

@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('devices', () {

packages/flutter_tools/test/commands/doctor_test.dart → packages/flutter_tools/test/general.shard/commands/doctor_test.dart

@@ -20,8 +20,8 @@ import 'package:flutter_tools/src/vscode/vscode.dart';
 import 'package:flutter_tools/src/vscode/vscode_validator.dart';
 import 'package:flutter_tools/src/usage.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 final Generator _kNoColorOutputPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{

packages/flutter_tools/test/commands/drive_test.dart → packages/flutter_tools/test/general.shard/commands/drive_test.dart

@@ -15,9 +15,9 @@ import 'package:flutter_tools/src/commands/drive.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('drive', () {

packages/flutter_tools/test/commands/format_test.dart → packages/flutter_tools/test/general.shard/commands/format_test.dart

@@ -7,8 +7,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/format.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('format', () {

packages/flutter_tools/test/commands/ide_config_test.dart → packages/flutter_tools/test/general.shard/commands/ide_config_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/template.dart';
 import 'package:flutter_tools/src/commands/ide_config.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('ide_config', () {

packages/flutter_tools/test/commands/install_test.dart → packages/flutter_tools/test/general.shard/commands/install_test.dart

@@ -6,9 +6,9 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/install.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('install', () {

packages/flutter_tools/test/commands/packages_test.dart → packages/flutter_tools/test/general.shard/commands/packages_test.dart

@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/commands/packages.dart';
 import 'package:flutter_tools/src/usage.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockProcessManager, MockStdio, PromptingProcess;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockProcessManager, MockStdio, PromptingProcess;
 
 class AlwaysTrueBotDetector implements BotDetector {
   const AlwaysTrueBotDetector();

packages/flutter_tools/test/commands/precache_test.dart → packages/flutter_tools/test/general.shard/commands/precache_test.dart

@@ -8,9 +8,9 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('precache', () {

packages/flutter_tools/test/commands/run_test.dart → packages/flutter_tools/test/general.shard/commands/run_test.dart

@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('run', () {

packages/flutter_tools/test/commands/shell_completion_test.dart → packages/flutter_tools/test/general.shard/commands/shell_completion_test.dart

@@ -10,9 +10,9 @@ import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/shell_completion.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('shell_completion', () {

packages/flutter_tools/test/commands/test_test.dart → packages/flutter_tools/test/general.shard/commands/test_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/dart/sdk.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 // This test depends on some files in ///dev/automated_tests/flutter_test/*
 

packages/flutter_tools/test/commands/update_packages_test.dart → packages/flutter_tools/test/general.shard/commands/update_packages_test.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter_tools/src/commands/update_packages.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('UpdatePackagesCommand', () {

packages/flutter_tools/test/commands/upgrade_test.dart → packages/flutter_tools/test/general.shard/commands/upgrade_test.dart

@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('UpgradeCommandRunner', () {

packages/flutter_tools/test/commands/version_test.dart → packages/flutter_tools/test/general.shard/commands/version_test.dart

@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/commands/version.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart' show MockProcess;
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart' show MockProcess;
 
 void main() {
   group('version', () {

packages/flutter_tools/test/compile_test.dart → packages/flutter_tools/test/general.shard/compile_test.dart

@@ -16,8 +16,8 @@ import 'package:flutter_tools/src/compile.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 

packages/flutter_tools/test/config_test.dart → packages/flutter_tools/test/general.shard/config_test.dart

@@ -5,7 +5,7 @@
 import 'package:flutter_tools/src/base/config.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   Config config;

packages/flutter_tools/test/coverage_collector_test.dart → packages/flutter_tools/test/general.shard/coverage_collector_test.dart

@@ -9,7 +9,7 @@ import 'package:flutter_tools/src/test/coverage_collector.dart';
 import 'package:flutter_tools/src/vmservice.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   MockVMService mockVMService;

packages/flutter_tools/test/crash_reporting_test.dart → packages/flutter_tools/test/general.shard/crash_reporting_test.dart

@@ -21,8 +21,8 @@ import 'package:flutter_tools/src/crash_reporting.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:pedantic/pedantic.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('crash reporting', () {

packages/flutter_tools/test/dart/pub_get_test.dart → packages/flutter_tools/test/general.shard/dart/pub_get_test.dart

@@ -16,8 +16,8 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:quiver/testing/async.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   setUpAll(() {

packages/flutter_tools/test/devfs_test.dart → packages/flutter_tools/test/general.shard/devfs_test.dart

@@ -14,9 +14,9 @@ import 'package:flutter_tools/src/devfs.dart';
 import 'package:flutter_tools/src/vmservice.dart';
 import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   FileSystem fs;

packages/flutter_tools/test/device_test.dart → packages/flutter_tools/test/general.shard/device_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/project.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('DeviceManager', () {

packages/flutter_tools/test/emulator_test.dart → packages/flutter_tools/test/general.shard/emulator_test.dart

@@ -16,9 +16,9 @@ import 'package:flutter_tools/src/macos/xcode.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   MockProcessManager mockProcessManager;

packages/flutter_tools/test/flutter_manifest_test.dart → packages/flutter_tools/test/general.shard/flutter_manifest_test.dart

@@ -12,9 +12,9 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/flutter_manifest.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/pubspec_schema.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/pubspec_schema.dart';
 
 void main() {
   setUpAll(() {

packages/flutter_tools/test/flutter_platform_test.dart → packages/flutter_tools/test/general.shard/flutter_platform_test.dart

@@ -12,8 +12,8 @@ import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:test_core/backend.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
+import '../src/common.dart';
+import '../src/context.dart';
 
 void main() {
   group('FlutterPlatform', () {

packages/flutter_tools/test/forbidden_imports_test.dart → packages/flutter_tools/test/general.shard/forbidden_imports_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/file_system.dart';
 
-import 'src/common.dart';
+import '../src/common.dart';
 
 void main() {
   final String flutterTools = fs.path.join(getFlutterRoot(), 'packages', 'flutter_tools');

packages/flutter_tools/test/fuchsia/fuchsia_device_test.dart → packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart

@@ -12,7 +12,6 @@ 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';
-import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/os.dart';
 import 'package:flutter_tools/src/base/time.dart';
 import 'package:flutter_tools/src/build_info.dart';
@@ -31,8 +30,8 @@ import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('fuchsia device', () {
@@ -379,8 +378,6 @@ void main() {
       ], expectedIsolateName);
       expect(
           uri.toString(), 'http://${InternetAddress.loopbackIPv4.address}:0/');
-    }, overrides: <Type, Generator>{
-      Logger: () => StdoutLogger(),
     });
 
     testUsingContext('can handle flutter view without matching isolate name',
@@ -391,8 +388,6 @@ void main() {
         MockFlutterView(MockIsolate('wrong name')), // wrong name.
       ], expectedIsolateName);
       expect(uri, throwsException);
-    }, overrides: <Type, Generator>{
-      Logger: () => StdoutLogger(),
     });
 
     testUsingContext('can handle non flutter view', () async {
@@ -401,8 +396,6 @@ void main() {
         MockFlutterView(null), // no ui isolate.
       ], expectedIsolateName);
       expect(uri, throwsException);
-    }, overrides: <Type, Generator>{
-      Logger: () => StdoutLogger(),
     });
   });
 

packages/flutter_tools/test/fuchsia/fuchsia_workflow_test.dart → packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart

@@ -8,8 +8,8 @@ import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart';
 import 'package:flutter_tools/src/fuchsia/fuchsia_workflow.dart';
 import 'package:mockito/mockito.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {}
 

packages/flutter_tools/test/hot_test.dart → packages/flutter_tools/test/general.shard/hot_test.dart

@@ -13,9 +13,9 @@ import 'package:flutter_tools/src/run_hot.dart';
 import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 
-import 'src/common.dart';
-import 'src/context.dart';
-import 'src/mocks.dart';
+import '../src/common.dart';
+import '../src/context.dart';
+import '../src/mocks.dart';
 
 void main() {
   group('validateReloadReport', () {

packages/flutter_tools/test/intellij/intellij_test.dart → packages/flutter_tools/test/general.shard/intellij/intellij_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/intellij/intellij.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   FileSystem fs;

packages/flutter_tools/test/ios/code_signing_test.dart → packages/flutter_tools/test/general.shard/ios/code_signing_test.dart

@@ -15,9 +15,9 @@ import 'package:flutter_tools/src/ios/code_signing.dart';
 import 'package:flutter_tools/src/globals.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group('Auto signing', () {

packages/flutter_tools/test/ios/devices_test.dart → packages/flutter_tools/test/general.shard/ios/devices_test.dart

@@ -18,9 +18,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 class MockIMobileDevice extends Mock implements IMobileDevice {}
 class MockProcessManager extends Mock implements ProcessManager {}

packages/flutter_tools/test/ios/ios_workflow_test.dart → packages/flutter_tools/test/general.shard/ios/ios_workflow_test.dart

@@ -13,8 +13,8 @@ import 'package:flutter_tools/src/ios/mac.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group('iOS Workflow validation', () {

packages/flutter_tools/test/ios/mac_test.dart → packages/flutter_tools/test/general.shard/ios/mac_test.dart

@@ -14,8 +14,8 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{

packages/flutter_tools/test/ios/simulators_test.dart → packages/flutter_tools/test/general.shard/ios/simulators_test.dart

@@ -20,9 +20,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 class MockFile extends Mock implements File {}
 class MockIMobileDevice extends Mock implements IMobileDevice {}

packages/flutter_tools/test/ios/xcode_backend_test.dart → packages/flutter_tools/test/general.shard/ios/xcode_backend_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter_tools/src/base/io.dart';
 
-import '../src/common.dart';
+import '../../src/common.dart';
 
 const String xcodeBackendPath = 'bin/xcode_backend.sh';
 const String xcodeBackendErrorHeader = '========================================================================';
@@ -28,8 +28,8 @@ const Map<String, String> installWithoutRelease = <String, String>{
 
 // Can't use a debug engine build with a release build.
 const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
-  'SOURCE_ROOT': '../../examples/hello_world',
-  'FLUTTER_ROOT': '../..',
+  'SOURCE_ROOT': '../../../examples/hello_world',
+  'FLUTTER_ROOT': '../../..',
   'LOCAL_ENGINE': '/engine/src/out/ios_debug_unopt',
   'CONFIGURATION': 'Release',
 };
@@ -37,8 +37,8 @@ const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
 // Can't use a debug build with a profile engine.
 const Map<String, String> localEngineProfileBuildeModeRelease =
     <String, String>{
-  'SOURCE_ROOT': '../../examples/hello_world',
-  'FLUTTER_ROOT': '../..',
+  'SOURCE_ROOT': '../../../examples/hello_world',
+  'FLUTTER_ROOT': '../../..',
   'LOCAL_ENGINE': '/engine/src/out/ios_profile',
   'CONFIGURATION': 'Debug',
   'FLUTTER_BUILD_MODE': 'Debug',

packages/flutter_tools/test/ios/xcodeproj_test.dart → packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart

@@ -15,9 +15,9 @@ import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/pubspec_schema.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/pubspec_schema.dart';
 
 const String xcodebuild = '/usr/bin/xcodebuild';
 

packages/flutter_tools/test/linux/linux_device_test.dart → packages/flutter_tools/test/general.shard/linux/linux_device_test.dart

@@ -14,8 +14,8 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(LinuxDevice, () {

packages/flutter_tools/test/linux/linux_doctor_test.dart → packages/flutter_tools/test/general.shard/linux/linux_doctor_test.dart

@@ -7,9 +7,9 @@ import 'package:flutter_tools/src/linux/linux_doctor.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
-import '../src/mocks.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
+import '../../src/mocks.dart';
 
 void main() {
   group(LinuxDoctorValidator, () {

packages/flutter_tools/test/linux/linux_workflow_test.dart → packages/flutter_tools/test/general.shard/linux/linux_workflow_test.dart

@@ -6,8 +6,8 @@ import 'package:mockito/mockito.dart';
 import 'package:flutter_tools/src/linux/linux_workflow.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 void main() {
   group(LinuxWorkflow, () {

packages/flutter_tools/test/macos/cocoapods_test.dart → packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart

@@ -17,8 +17,8 @@ import 'package:flutter_tools/src/project.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 
-import '../src/common.dart';
-import '../src/context.dart';
+import '../../src/common.dart';
+import '../../src/context.dart';
 
 typedef InvokeProcess = Future<ProcessResult> Function();