Shim package:test to avoid matcher issues (#20602)
* Upgrade everything except matcher.
* Roll matcher (and test)
* Adjust tests that depend on flutter:test directly to depend on a shim
* Require use of package:test shim and remove other references to package:test
diff --git a/packages/flutter_tools/test/ios/cocoapods_test.dart b/packages/flutter_tools/test/ios/cocoapods_test.dart
index 7d6d2ba..e732615 100644
--- a/packages/flutter_tools/test/ios/cocoapods_test.dart
+++ b/packages/flutter_tools/test/ios/cocoapods_test.dart
@@ -14,8 +14,8 @@
import 'package:flutter_tools/src/ios/xcodeproj.dart';
import 'package:mockito/mockito.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
+import '../src/common.dart';
import '../src/context.dart';
typedef Future<ProcessResult> InvokeProcess();
@@ -224,7 +224,7 @@
);
fail('ToolExit expected');
} catch(e) {
- expect(e, const isInstanceOf<ToolExit>());
+ expect(e, isInstanceOf<ToolExit>());
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: anyNamed('workingDirectory'),
@@ -271,7 +271,7 @@
);
fail('ToolExit expected');
} catch (e) {
- expect(e, const isInstanceOf<ToolExit>());
+ expect(e, isInstanceOf<ToolExit>());
expect(
testLogger.errorText,
contains("CocoaPods's specs repository is too out-of-date to satisfy dependencies"),
diff --git a/packages/flutter_tools/test/ios/code_signing_test.dart b/packages/flutter_tools/test/ios/code_signing_test.dart
index 9d12db2..dcf4600 100644
--- a/packages/flutter_tools/test/ios/code_signing_test.dart
+++ b/packages/flutter_tools/test/ios/code_signing_test.dart
@@ -13,8 +13,8 @@
import 'package:flutter_tools/src/ios/code_signing.dart';
import 'package:flutter_tools/src/globals.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
+import '../src/common.dart';
import '../src/context.dart';
void main() {
diff --git a/packages/flutter_tools/test/ios/devices_test.dart b/packages/flutter_tools/test/ios/devices_test.dart
index 196fa60..0751177 100644
--- a/packages/flutter_tools/test/ios/devices_test.dart
+++ b/packages/flutter_tools/test/ios/devices_test.dart
@@ -14,8 +14,8 @@
import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
+import '../src/common.dart';
import '../src/context.dart';
class MockIMobileDevice extends Mock implements IMobileDevice {}
diff --git a/packages/flutter_tools/test/ios/ios_workflow_test.dart b/packages/flutter_tools/test/ios/ios_workflow_test.dart
index 6b2f43a..d6b1f8e 100644
--- a/packages/flutter_tools/test/ios/ios_workflow_test.dart
+++ b/packages/flutter_tools/test/ios/ios_workflow_test.dart
@@ -14,8 +14,8 @@
import 'package:flutter_tools/src/ios/mac.dart';
import 'package:mockito/mockito.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
+import '../src/common.dart';
import '../src/context.dart';
void main() {
diff --git a/packages/flutter_tools/test/ios/mac_test.dart b/packages/flutter_tools/test/ios/mac_test.dart
index 9179a97..c30631e 100644
--- a/packages/flutter_tools/test/ios/mac_test.dart
+++ b/packages/flutter_tools/test/ios/mac_test.dart
@@ -12,7 +12,6 @@
import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
import '../src/common.dart';
import '../src/context.dart';
diff --git a/packages/flutter_tools/test/ios/simulators_test.dart b/packages/flutter_tools/test/ios/simulators_test.dart
index 190f2c0..e4edf4e 100644
--- a/packages/flutter_tools/test/ios/simulators_test.dart
+++ b/packages/flutter_tools/test/ios/simulators_test.dart
@@ -10,8 +10,8 @@
import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
+import '../src/common.dart';
import '../src/context.dart';
class MockFile extends Mock implements File {}
diff --git a/packages/flutter_tools/test/ios/xcodeproj_test.dart b/packages/flutter_tools/test/ios/xcodeproj_test.dart
index aecbe58..493ac2b 100644
--- a/packages/flutter_tools/test/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/ios/xcodeproj_test.dart
@@ -15,8 +15,8 @@
import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart';
import 'package:process/process.dart';
-import 'package:test/test.dart';
+import '../src/common.dart';
import '../src/context.dart';
const String xcodebuild = '/usr/bin/xcodebuild';
