diff --git a/packages/flutter_tools/test/android_device_test.dart b/packages/flutter_tools/test/android/android_device_test.dart similarity index 99% rename from packages/flutter_tools/test/android_device_test.dart rename to packages/flutter_tools/test/android/android_device_test.dart index c9b85f25fda..7e18b0fd709 100644 --- a/packages/flutter_tools/test/android_device_test.dart +++ b/packages/flutter_tools/test/android/android_device_test.dart @@ -5,7 +5,7 @@ import 'package:flutter_tools/src/android/android_device.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; void main() { group('android_device', () { diff --git a/packages/flutter_tools/test/android_sdk_test.dart b/packages/flutter_tools/test/android/android_sdk_test.dart similarity index 98% rename from packages/flutter_tools/test/android_sdk_test.dart rename to packages/flutter_tools/test/android/android_sdk_test.dart index cf897e17285..62c0198f127 100644 --- a/packages/flutter_tools/test/android_sdk_test.dart +++ b/packages/flutter_tools/test/android/android_sdk_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/version.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; void main() { group('android_sdk AndroidSdk', () { diff --git a/packages/flutter_tools/test/src/base/common_test.dart b/packages/flutter_tools/test/base/common_test.dart similarity index 96% rename from packages/flutter_tools/test/src/base/common_test.dart rename to packages/flutter_tools/test/base/common_test.dart index 35aa577ef59..b46c66edee8 100644 --- a/packages/flutter_tools/test/src/base/common_test.dart +++ b/packages/flutter_tools/test/base/common_test.dart @@ -5,7 +5,7 @@ import 'package:test/test.dart'; import 'package:flutter_tools/src/base/common.dart'; -import '../common.dart'; +import '../src/common.dart'; void main() { group('throwToolExit', () { diff --git a/packages/flutter_tools/test/context_test.dart b/packages/flutter_tools/test/base/context_test.dart similarity index 100% rename from packages/flutter_tools/test/context_test.dart rename to packages/flutter_tools/test/base/context_test.dart diff --git a/packages/flutter_tools/test/src/base/file_system_test.dart b/packages/flutter_tools/test/base/file_system_test.dart similarity index 98% rename from packages/flutter_tools/test/src/base/file_system_test.dart rename to packages/flutter_tools/test/base/file_system_test.dart index c9e8a61adf0..9ef00592c79 100644 --- a/packages/flutter_tools/test/src/base/file_system_test.dart +++ b/packages/flutter_tools/test/base/file_system_test.dart @@ -7,8 +7,8 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:platform/platform.dart'; import 'package:test/test.dart'; -import '../common.dart'; -import '../context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { group('ensureDirectoryExists', () { diff --git a/packages/flutter_tools/test/src/base/io_test.dart b/packages/flutter_tools/test/base/io_test.dart similarity index 97% rename from packages/flutter_tools/test/src/base/io_test.dart rename to packages/flutter_tools/test/base/io_test.dart index a817fa38cc6..096eb797fb4 100644 --- a/packages/flutter_tools/test/src/base/io_test.dart +++ b/packages/flutter_tools/test/base/io_test.dart @@ -9,7 +9,7 @@ import 'package:flutter_tools/src/base/io.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import '../context.dart'; +import '../src/context.dart'; void main() { group('ProcessSignal', () { diff --git a/packages/flutter_tools/test/src/base/logger_test.dart b/packages/flutter_tools/test/base/logger_test.dart similarity index 100% rename from packages/flutter_tools/test/src/base/logger_test.dart rename to packages/flutter_tools/test/base/logger_test.dart diff --git a/packages/flutter_tools/test/logs_test.dart b/packages/flutter_tools/test/base/logs_test.dart similarity index 89% rename from packages/flutter_tools/test/logs_test.dart rename to packages/flutter_tools/test/base/logs_test.dart index 66d191db495..345501d37bd 100644 --- a/packages/flutter_tools/test/logs_test.dart +++ b/packages/flutter_tools/test/base/logs_test.dart @@ -6,9 +6,9 @@ import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/commands/logs.dart'; import 'package:test/test.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', () { diff --git a/packages/flutter_tools/test/src/base/os_test.dart b/packages/flutter_tools/test/base/os_test.dart similarity index 99% rename from packages/flutter_tools/test/src/base/os_test.dart rename to packages/flutter_tools/test/base/os_test.dart index 4d7b8a41c58..e990fe3b50f 100644 --- a/packages/flutter_tools/test/src/base/os_test.dart +++ b/packages/flutter_tools/test/base/os_test.dart @@ -11,7 +11,7 @@ import 'package:platform/platform.dart'; import 'package:test/test.dart'; -import '../context.dart'; +import '../src/context.dart'; const String kExecutable = 'foo'; const String kPath1 = '/bar/bin/$kExecutable'; diff --git a/packages/flutter_tools/test/os_utils_test.dart b/packages/flutter_tools/test/base/os_utils_test.dart similarity index 97% rename from packages/flutter_tools/test/os_utils_test.dart rename to packages/flutter_tools/test/base/os_utils_test.dart index 695d2bb7a90..0190b4cedf4 100644 --- a/packages/flutter_tools/test/os_utils_test.dart +++ b/packages/flutter_tools/test/base/os_utils_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; void main() { group('OperatingSystemUtils', () { diff --git a/packages/flutter_tools/test/src/base/process_test.dart b/packages/flutter_tools/test/base/process_test.dart similarity index 100% rename from packages/flutter_tools/test/src/base/process_test.dart rename to packages/flutter_tools/test/base/process_test.dart diff --git a/packages/flutter_tools/test/src/cache_test.dart b/packages/flutter_tools/test/cache_test.dart similarity index 98% rename from packages/flutter_tools/test/src/cache_test.dart rename to packages/flutter_tools/test/cache_test.dart index 5c7a40196a4..f4b45092964 100644 --- a/packages/flutter_tools/test/src/cache_test.dart +++ b/packages/flutter_tools/test/cache_test.dart @@ -12,7 +12,7 @@ import 'package:platform/platform.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'context.dart'; +import 'src/context.dart'; void main() { group('$Cache.checkLockAcquired', () { diff --git a/packages/flutter_tools/test/analyze_continuously_test.dart b/packages/flutter_tools/test/commands/analyze_continuously_test.dart similarity index 98% rename from packages/flutter_tools/test/analyze_continuously_test.dart rename to packages/flutter_tools/test/commands/analyze_continuously_test.dart index b89c70f1c70..ad72fe178a3 100644 --- a/packages/flutter_tools/test/analyze_continuously_test.dart +++ b/packages/flutter_tools/test/commands/analyze_continuously_test.dart @@ -12,7 +12,7 @@ import 'package:flutter_tools/src/dart/sdk.dart'; import 'package:flutter_tools/src/runner/flutter_command_runner.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; void main() { AnalysisServer server; diff --git a/packages/flutter_tools/test/analyze_duplicate_names_test.dart b/packages/flutter_tools/test/commands/analyze_duplicate_names_test.dart similarity index 94% rename from packages/flutter_tools/test/analyze_duplicate_names_test.dart rename to packages/flutter_tools/test/commands/analyze_duplicate_names_test.dart index 49dd9175b4d..c56ff8be388 100644 --- a/packages/flutter_tools/test/analyze_duplicate_names_test.dart +++ b/packages/flutter_tools/test/commands/analyze_duplicate_names_test.dart @@ -7,9 +7,9 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/commands/analyze.dart'; import 'package:test/test.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() { Directory tempDir; diff --git a/packages/flutter_tools/test/analyze_once_test.dart b/packages/flutter_tools/test/commands/analyze_once_test.dart similarity index 99% rename from packages/flutter_tools/test/analyze_once_test.dart rename to packages/flutter_tools/test/commands/analyze_once_test.dart index 5cc5f970264..bec70e6645e 100644 --- a/packages/flutter_tools/test/analyze_once_test.dart +++ b/packages/flutter_tools/test/commands/analyze_once_test.dart @@ -13,8 +13,8 @@ import 'package:flutter_tools/src/commands/create.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:test/test.dart'; -import 'src/common.dart'; -import 'src/context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/analyze_test.dart b/packages/flutter_tools/test/commands/analyze_test.dart similarity index 98% rename from packages/flutter_tools/test/analyze_test.dart rename to packages/flutter_tools/test/commands/analyze_test.dart index 8d193bf6e13..434f5e27f0a 100644 --- a/packages/flutter_tools/test/analyze_test.dart +++ b/packages/flutter_tools/test/commands/analyze_test.dart @@ -8,7 +8,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/analyze_base.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; const String _kFlutterRoot = '/data/flutter'; diff --git a/packages/flutter_tools/test/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart similarity index 99% rename from packages/flutter_tools/test/create_test.dart rename to packages/flutter_tools/test/commands/create_test.dart index 3d2633403c7..0633dd10553 100644 --- a/packages/flutter_tools/test/create_test.dart +++ b/packages/flutter_tools/test/commands/create_test.dart @@ -13,8 +13,8 @@ import 'package:flutter_tools/src/commands/create.dart'; import 'package:flutter_tools/src/dart/sdk.dart'; import 'package:test/test.dart'; -import 'src/common.dart'; -import 'src/context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { group('create', () { diff --git a/packages/flutter_tools/test/daemon_test.dart b/packages/flutter_tools/test/commands/daemon_test.dart similarity index 99% rename from packages/flutter_tools/test/daemon_test.dart rename to packages/flutter_tools/test/commands/daemon_test.dart index 557dcb9b595..e55d7ddb283 100644 --- a/packages/flutter_tools/test/daemon_test.dart +++ b/packages/flutter_tools/test/commands/daemon_test.dart @@ -13,8 +13,8 @@ import 'package:flutter_tools/src/globals.dart'; import 'package:flutter_tools/src/ios/ios_workflow.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; -import 'src/mocks.dart'; +import '../src/context.dart'; +import '../src/mocks.dart'; void main() { Daemon daemon; diff --git a/packages/flutter_tools/test/devices_test.dart b/packages/flutter_tools/test/commands/devices_test.dart similarity index 96% rename from packages/flutter_tools/test/devices_test.dart rename to packages/flutter_tools/test/commands/devices_test.dart index c9a2ca68569..3fe7c571fe8 100644 --- a/packages/flutter_tools/test/devices_test.dart +++ b/packages/flutter_tools/test/commands/devices_test.dart @@ -13,8 +13,8 @@ import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import 'package:test/test.dart'; -import 'src/common.dart'; -import 'src/context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { group('devices', () { diff --git a/packages/flutter_tools/test/doctor_test.dart b/packages/flutter_tools/test/commands/doctor_test.dart similarity index 97% rename from packages/flutter_tools/test/doctor_test.dart rename to packages/flutter_tools/test/commands/doctor_test.dart index 9f48bec22a7..369aaeae19c 100644 --- a/packages/flutter_tools/test/doctor_test.dart +++ b/packages/flutter_tools/test/commands/doctor_test.dart @@ -6,7 +6,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/doctor.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; void main() { group('doctor', () { diff --git a/packages/flutter_tools/test/drive_test.dart b/packages/flutter_tools/test/commands/drive_test.dart similarity index 99% rename from packages/flutter_tools/test/drive_test.dart rename to packages/flutter_tools/test/commands/drive_test.dart index 88ee80b5da1..beef6861c54 100644 --- a/packages/flutter_tools/test/drive_test.dart +++ b/packages/flutter_tools/test/commands/drive_test.dart @@ -17,9 +17,9 @@ import 'package:flutter_tools/src/ios/simulators.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.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', () { diff --git a/packages/flutter_tools/test/format_test.dart b/packages/flutter_tools/test/commands/format_test.dart similarity index 95% rename from packages/flutter_tools/test/format_test.dart rename to packages/flutter_tools/test/commands/format_test.dart index 563d4b60d24..f3afccecb8c 100644 --- a/packages/flutter_tools/test/format_test.dart +++ b/packages/flutter_tools/test/commands/format_test.dart @@ -8,8 +8,8 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/format.dart'; import 'package:test/test.dart'; -import 'src/common.dart'; -import 'src/context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { group('format', () { diff --git a/packages/flutter_tools/test/install_test.dart b/packages/flutter_tools/test/commands/install_test.dart similarity index 93% rename from packages/flutter_tools/test/install_test.dart rename to packages/flutter_tools/test/commands/install_test.dart index 81f2f1a719d..0ab0cc673e2 100644 --- a/packages/flutter_tools/test/install_test.dart +++ b/packages/flutter_tools/test/commands/install_test.dart @@ -6,9 +6,9 @@ import 'package:flutter_tools/src/commands/install.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.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', () { diff --git a/packages/flutter_tools/test/packages_test.dart b/packages/flutter_tools/test/commands/packages_test.dart similarity index 97% rename from packages/flutter_tools/test/packages_test.dart rename to packages/flutter_tools/test/commands/packages_test.dart index 3e8ebb12cbe..dc57efdad28 100644 --- a/packages/flutter_tools/test/packages_test.dart +++ b/packages/flutter_tools/test/commands/packages_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/packages.dart'; import 'package:test/test.dart'; -import 'src/common.dart'; -import 'src/context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { group('packages', () { diff --git a/packages/flutter_tools/test/run_test.dart b/packages/flutter_tools/test/commands/run_test.dart similarity index 89% rename from packages/flutter_tools/test/run_test.dart rename to packages/flutter_tools/test/commands/run_test.dart index 0bad346dd1d..3ac52a6a4a3 100644 --- a/packages/flutter_tools/test/run_test.dart +++ b/packages/flutter_tools/test/commands/run_test.dart @@ -6,9 +6,9 @@ import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/commands/run.dart'; import 'package:test/test.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', () { diff --git a/packages/flutter_tools/test/test_test.dart b/packages/flutter_tools/test/commands/test_test.dart similarity index 99% rename from packages/flutter_tools/test/test_test.dart rename to packages/flutter_tools/test/commands/test_test.dart index e6e66223067..bd3c043f645 100644 --- a/packages/flutter_tools/test/test_test.dart +++ b/packages/flutter_tools/test/commands/test_test.dart @@ -11,7 +11,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/dart/sdk.dart'; import 'package:test/test.dart'; -import 'src/context.dart'; +import '../src/context.dart'; // This test depends on some files in ///dev/automated_tests/flutter_test/* diff --git a/packages/flutter_tools/test/upgrade_test.dart b/packages/flutter_tools/test/commands/upgrade_test.dart similarity index 97% rename from packages/flutter_tools/test/upgrade_test.dart rename to packages/flutter_tools/test/commands/upgrade_test.dart index c5e7d39cd6f..8764af8793b 100644 --- a/packages/flutter_tools/test/upgrade_test.dart +++ b/packages/flutter_tools/test/commands/upgrade_test.dart @@ -8,8 +8,8 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/upgrade.dart'; import 'package:test/test.dart'; -import 'src/common.dart'; -import 'src/context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; void main() { group('upgrade', () { diff --git a/packages/flutter_tools/test/src/ios/devices_test.dart b/packages/flutter_tools/test/ios/devices_test.dart similarity index 99% rename from packages/flutter_tools/test/src/ios/devices_test.dart rename to packages/flutter_tools/test/ios/devices_test.dart index 20f9723e13d..96ef415e42d 100644 --- a/packages/flutter_tools/test/src/ios/devices_test.dart +++ b/packages/flutter_tools/test/ios/devices_test.dart @@ -13,7 +13,7 @@ import 'package:platform/platform.dart'; import 'package:process/process.dart'; import 'package:test/test.dart'; -import '../context.dart'; +import '../src/context.dart'; class MockProcessManager extends Mock implements ProcessManager {} class MockFile extends Mock implements File {} diff --git a/packages/flutter_tools/test/src/ios/ios_workflow_test.dart b/packages/flutter_tools/test/ios/ios_workflow_test.dart similarity index 99% rename from packages/flutter_tools/test/src/ios/ios_workflow_test.dart rename to packages/flutter_tools/test/ios/ios_workflow_test.dart index 16c61d69121..b01bbf8b058 100644 --- a/packages/flutter_tools/test/src/ios/ios_workflow_test.dart +++ b/packages/flutter_tools/test/ios/ios_workflow_test.dart @@ -13,7 +13,7 @@ import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import 'package:test/test.dart'; -import '../context.dart'; +import '../src/context.dart'; void main() { group('iOS Workflow validation', () { diff --git a/packages/flutter_tools/test/src/ios/simulators_test.dart b/packages/flutter_tools/test/ios/simulators_test.dart similarity index 99% rename from packages/flutter_tools/test/src/ios/simulators_test.dart rename to packages/flutter_tools/test/ios/simulators_test.dart index a731197799d..a1a85a63c4e 100644 --- a/packages/flutter_tools/test/src/ios/simulators_test.dart +++ b/packages/flutter_tools/test/ios/simulators_test.dart @@ -10,7 +10,7 @@ import 'package:platform/platform.dart'; import 'package:process/process.dart'; import 'package:test/test.dart'; -import '../context.dart'; +import '../src/context.dart'; class MockXcode extends Mock implements Xcode {} class MockFile extends Mock implements File {} diff --git a/packages/flutter_tools/test/src/runner/flutter_command_runner_test.dart b/packages/flutter_tools/test/runner/flutter_command_runner_test.dart similarity index 93% rename from packages/flutter_tools/test/src/runner/flutter_command_runner_test.dart rename to packages/flutter_tools/test/runner/flutter_command_runner_test.dart index d5b17fd213d..309405dae31 100644 --- a/packages/flutter_tools/test/src/runner/flutter_command_runner_test.dart +++ b/packages/flutter_tools/test/runner/flutter_command_runner_test.dart @@ -6,8 +6,8 @@ import 'package:flutter_tools/src/version.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import '../common.dart'; -import '../context.dart'; +import '../src/common.dart'; +import '../src/context.dart'; import 'flutter_command_test.dart'; void main() { diff --git a/packages/flutter_tools/test/src/runner/flutter_command_test.dart b/packages/flutter_tools/test/runner/flutter_command_test.dart similarity index 99% rename from packages/flutter_tools/test/src/runner/flutter_command_test.dart rename to packages/flutter_tools/test/runner/flutter_command_test.dart index 64c5feeabef..5498d2a1d9e 100644 --- a/packages/flutter_tools/test/src/runner/flutter_command_test.dart +++ b/packages/flutter_tools/test/runner/flutter_command_test.dart @@ -12,7 +12,7 @@ import 'package:mockito/mockito.dart'; import 'package:quiver/time.dart'; import 'package:test/test.dart'; -import '../context.dart'; +import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/src/version_test.dart b/packages/flutter_tools/test/version_test.dart similarity index 99% rename from packages/flutter_tools/test/src/version_test.dart rename to packages/flutter_tools/test/version_test.dart index fe8e3513add..efb08433b61 100644 --- a/packages/flutter_tools/test/src/version_test.dart +++ b/packages/flutter_tools/test/version_test.dart @@ -16,7 +16,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/version.dart'; -import 'context.dart'; +import 'src/context.dart'; const JsonEncoder _kPrettyJsonEncoder = const JsonEncoder.withIndent(' '); final Clock _testClock = new Clock.fixed(new DateTime(2015, 1, 1));