Rearrange tests to more closely match code structure (#10043)

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', () {

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', () {

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', () {

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', () {

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', () {

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', () {

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';

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', () {

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', () {

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;

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;

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() {
 

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';
 

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', () {

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;

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', () {

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', () {

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', () {

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', () {

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', () {

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', () {

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', () {

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/*
 

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', () {

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 {}

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', () {

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 {}

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() {

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() {
 

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));