Bump mockito to 3.0.0-beta (#18462)
* Bump mockito to 3.0.0-beta
* Few fixes
* fix test
* Bump image
* Fix
* New packages update
* With matcher pinned
* No more typed
diff --git a/packages/flutter_tools/test/analytics_test.dart b/packages/flutter_tools/test/analytics_test.dart
index f4eabaa..866b418 100644
--- a/packages/flutter_tools/test/analytics_test.dart
+++ b/packages/flutter_tools/test/analytics_test.dart
@@ -106,7 +106,7 @@
verify(mockClock.now()).called(2);
expect(
- verify(mockUsage.sendTiming(captureAny, captureAny, captureAny, label: captureAny)).captured,
+ verify(mockUsage.sendTiming(captureAny, captureAny, captureAny, label: captureAnyNamed('label'))).captured,
<dynamic>['flutter', 'doctor', const Duration(milliseconds: 1000), 'success']
);
}, overrides: <Type, Generator>{
@@ -125,7 +125,7 @@
verify(mockClock.now()).called(2);
expect(
- verify(mockUsage.sendTiming(captureAny, captureAny, captureAny, label: captureAny)).captured,
+ verify(mockUsage.sendTiming(captureAny, captureAny, captureAny, label: captureAnyNamed('label'))).captured,
<dynamic>['flutter', 'doctor', const Duration(milliseconds: 1000), 'warning']
);
}, overrides: <Type, Generator>{
diff --git a/packages/flutter_tools/test/android/android_device_test.dart b/packages/flutter_tools/test/android/android_device_test.dart
index 68ffa79..5fb766d 100644
--- a/packages/flutter_tools/test/android/android_device_test.dart
+++ b/packages/flutter_tools/test/android/android_device_test.dart
@@ -88,7 +88,7 @@
setUp(() {
hardware = 'unknown';
buildCharacteristics = 'unused';
- when(mockProcessManager.run(typedArgThat(contains('getprop')),
+ when(mockProcessManager.run(argThat(contains('getprop')),
stderrEncoding: anyNamed('stderrEncoding'),
stdoutEncoding: anyNamed('stdoutEncoding'))).thenAnswer((_) {
final StringBuffer buf = new StringBuffer()
diff --git a/packages/flutter_tools/test/android/android_sdk_test.dart b/packages/flutter_tools/test/android/android_sdk_test.dart
index 405f174..a478369 100644
--- a/packages/flutter_tools/test/android/android_sdk_test.dart
+++ b/packages/flutter_tools/test/android/android_sdk_test.dart
@@ -74,7 +74,7 @@
final AndroidSdk sdk = AndroidSdk.locateAndroidSdk();
when(processManager.canRun(sdk.sdkManagerPath)).thenReturn(true);
when(processManager.runSync(<String>[sdk.sdkManagerPath, '--version'],
- environment: typedArgThat(isNotNull, named: 'environment')))
+ environment: argThat(isNotNull, named: 'environment')))
.thenReturn(new ProcessResult(1, 0, '26.1.1\n', ''));
expect(sdk.sdkManagerVersion, '26.1.1');
}, overrides: <Type, Generator>{
@@ -89,7 +89,7 @@
final AndroidSdk sdk = AndroidSdk.locateAndroidSdk();
when(processManager.canRun(sdk.sdkManagerPath)).thenReturn(true);
when(processManager.runSync(<String>[sdk.sdkManagerPath, '--version'],
- environment: typedArgThat(isNotNull, named: 'environment')))
+ environment: argThat(isNotNull, named: 'environment')))
.thenReturn(new ProcessResult(1, 1, '26.1.1\n', 'Mystery error'));
expect(sdk.sdkManagerVersion, isNull);
}, overrides: <Type, Generator>{
diff --git a/packages/flutter_tools/test/ios/cocoapods_test.dart b/packages/flutter_tools/test/ios/cocoapods_test.dart
index 14f6907..3bb165b 100644
--- a/packages/flutter_tools/test/ios/cocoapods_test.dart
+++ b/packages/flutter_tools/test/ios/cocoapods_test.dart
@@ -142,7 +142,7 @@
testUsingContext('creates swift Podfile if swift', () {
when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true);
- when(mockXcodeProjectInterpreter.getBuildSettings(typed(any), typed(any))).thenReturn(<String, String>{
+ when(mockXcodeProjectInterpreter.getBuildSettings(any, any)).thenReturn(<String, String>{
'SWIFT_VERSION': '4.0',
});
@@ -204,7 +204,7 @@
iosEngineDir: 'engine/path',
);
verifyNever(mockProcessManager.run(
- typedArgThat(containsAllInOrder(<String>['pod', 'install'])),
+ argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
));
@@ -226,7 +226,7 @@
} catch(e) {
expect(e, const isInstanceOf<ToolExit>());
verifyNever(mockProcessManager.run(
- typedArgThat(containsAllInOrder(<String>['pod', 'install'])),
+ argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
));
@@ -437,7 +437,7 @@
);
expect(didInstall, isFalse);
verifyNever(mockProcessManager.run(
- typedArgThat(containsAllInOrder(<String>['pod', 'install'])),
+ argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'),
));
diff --git a/packages/flutter_tools/test/ios/code_signing_test.dart b/packages/flutter_tools/test/ios/code_signing_test.dart
index 538450a..9d12db2 100644
--- a/packages/flutter_tools/test/ios/code_signing_test.dart
+++ b/packages/flutter_tools/test/ios/code_signing_test.dart
@@ -72,7 +72,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(exitsHappy);
@@ -97,7 +97,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
@@ -124,7 +124,7 @@
final MockStream mockStdErr = new MockStream();
when(mockProcessManager.start(
- typedArgThat(contains('openssl')),
+ argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockProcess));
@@ -156,7 +156,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
@@ -183,7 +183,7 @@
final MockStream mockStdErr = new MockStream();
when(mockProcessManager.start(
- typedArgThat(contains('openssl')),
+ argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockProcess));
@@ -219,7 +219,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
@@ -250,7 +250,7 @@
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
- typedArgThat(contains('openssl')),
+ argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
@@ -293,7 +293,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
@@ -324,7 +324,7 @@
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
- typedArgThat(contains('openssl')),
+ argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
@@ -361,7 +361,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
@@ -390,7 +390,7 @@
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
- typedArgThat(contains('openssl')),
+ argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
@@ -431,7 +431,7 @@
when(mockProcessManager.runSync(<String>['which', 'openssl']))
.thenReturn(exitsHappy);
when(mockProcessManager.runSync(
- typedArgThat(contains('find-identity')),
+ argThat(contains('find-identity')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(
@@ -463,7 +463,7 @@
final MockStream mockOpenSslStdErr = new MockStream();
when(mockProcessManager.start(
- typedArgThat(contains('openssl')),
+ argThat(contains('openssl')),
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) => new Future<Process>.value(mockOpenSslProcess));
diff --git a/packages/flutter_tools/test/ios/mac_test.dart b/packages/flutter_tools/test/ios/mac_test.dart
index 4bc6028..3772ab2 100644
--- a/packages/flutter_tools/test/ios/mac_test.dart
+++ b/packages/flutter_tools/test/ios/mac_test.dart
@@ -82,7 +82,7 @@
testUsingContext('idevicescreenshot captures and returns screenshot', () async {
when(mockOutputFile.path).thenReturn(outputPath);
- when(mockProcessManager.run(typed(any), environment: null, workingDirectory: null)).thenAnswer(
+ when(mockProcessManager.run(any, environment: null, workingDirectory: null)).thenAnswer(
(Invocation invocation) => new Future<ProcessResult>.value(new ProcessResult(4, 0, '', '')));
await iMobileDevice.takeScreenshot(mockOutputFile);
diff --git a/packages/flutter_tools/test/ios/simulators_test.dart b/packages/flutter_tools/test/ios/simulators_test.dart
index 6d4bc97..03fc530 100644
--- a/packages/flutter_tools/test/ios/simulators_test.dart
+++ b/packages/flutter_tools/test/ios/simulators_test.dart
@@ -175,7 +175,7 @@
mockProcessManager = new MockProcessManager();
// Let everything else return exit code 0 so process.dart doesn't crash.
when(
- mockProcessManager.run(typed(any), environment: null, workingDirectory: null)
+ mockProcessManager.run(any, environment: null, workingDirectory: null)
).thenAnswer((Invocation invocation) =>
new Future<ProcessResult>.value(new ProcessResult(2, 0, '', ''))
);
@@ -229,7 +229,7 @@
setUp(() {
mockProcessManager = new MockProcessManager();
- when(mockProcessManager.start(typed(any), environment: null, workingDirectory: null))
+ when(mockProcessManager.start(any, environment: null, workingDirectory: null))
.thenAnswer((Invocation invocation) => new Future<Process>.value(new MockProcess()));
});
@@ -237,7 +237,7 @@
final IOSSimulator device = new IOSSimulator('x', name: 'iPhone SE', category: 'iOS 9.3');
await launchDeviceLogTool(device);
expect(
- verify(mockProcessManager.start(typed(captureAny), environment: null, workingDirectory: null)).captured.single,
+ verify(mockProcessManager.start(captureAny, environment: null, workingDirectory: null)).captured.single,
contains('tail'),
);
},
@@ -249,7 +249,7 @@
final IOSSimulator device = new IOSSimulator('x', name: 'iPhone SE', category: 'iOS 11.0');
await launchDeviceLogTool(device);
expect(
- verify(mockProcessManager.start(typed(captureAny), environment: null, workingDirectory: null)).captured.single,
+ verify(mockProcessManager.start(captureAny, environment: null, workingDirectory: null)).captured.single,
contains('/usr/bin/log'),
);
},
@@ -271,7 +271,7 @@
final IOSSimulator device = new IOSSimulator('x', name: 'iPhone SE', category: 'iOS 9.3');
await launchSystemLogTool(device);
expect(
- verify(mockProcessManager.start(typed(captureAny), environment: null, workingDirectory: null)).captured.single,
+ verify(mockProcessManager.start(captureAny, environment: null, workingDirectory: null)).captured.single,
contains('tail'),
);
},
diff --git a/packages/flutter_tools/test/ios/xcodeproj_test.dart b/packages/flutter_tools/test/ios/xcodeproj_test.dart
index 31b1bcc..621e992 100644
--- a/packages/flutter_tools/test/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/ios/xcodeproj_test.dart
@@ -282,7 +282,7 @@
}
testUsingOsxContext('sets ARCHS=armv7 when armv7 local engine is set', () async {
- when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, typed(any))).thenReturn('engine');
+ when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, any)).thenReturn('engine');
when(mockArtifacts.engineOutPath).thenReturn(fs.path.join('out', 'ios_profile_arm'));
const BuildInfo buildInfo = const BuildInfo(BuildMode.debug, null,
previewDart2: true,
@@ -302,7 +302,7 @@
});
testUsingOsxContext('sets TRACK_WIDGET_CREATION=true when trackWidgetCreation is true', () async {
- when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, typed(any))).thenReturn('engine');
+ when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, any)).thenReturn('engine');
when(mockArtifacts.engineOutPath).thenReturn(fs.path.join('out', 'ios_profile_arm'));
const BuildInfo buildInfo = const BuildInfo(BuildMode.debug, null,
previewDart2: true,
@@ -323,7 +323,7 @@
});
testUsingOsxContext('does not set TRACK_WIDGET_CREATION when trackWidgetCreation is false', () async {
- when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, typed(any))).thenReturn('engine');
+ when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, any)).thenReturn('engine');
when(mockArtifacts.engineOutPath).thenReturn(fs.path.join('out', 'ios_profile_arm'));
const BuildInfo buildInfo = const BuildInfo(BuildMode.debug, null,
previewDart2: true,
@@ -343,7 +343,7 @@
});
testUsingOsxContext('sets ARCHS=armv7 when armv7 local engine is set', () async {
- when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, typed(any))).thenReturn('engine');
+ when(mockArtifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, any)).thenReturn('engine');
when(mockArtifacts.engineOutPath).thenReturn(fs.path.join('out', 'ios_profile'));
const BuildInfo buildInfo = const BuildInfo(BuildMode.debug, null,
previewDart2: true,
diff --git a/packages/flutter_tools/test/runner/flutter_command_test.dart b/packages/flutter_tools/test/runner/flutter_command_test.dart
index 6aa663e..ed66ea1 100644
--- a/packages/flutter_tools/test/runner/flutter_command_test.dart
+++ b/packages/flutter_tools/test/runner/flutter_command_test.dart
@@ -61,7 +61,7 @@
expect(
verify(usage.sendTiming(
- typed(captureAny), typed(captureAny), typed(captureAny),
+ captureAny, captureAny, captureAny,
label: captureAnyNamed('label'))).captured,
<dynamic>['flutter', 'dummy', const Duration(milliseconds: 1000), null]
);
@@ -80,8 +80,8 @@
await flutterCommand.run();
verify(clock.now()).called(2);
verifyNever(usage.sendTiming(
- typed(captureAny), typed(captureAny), typed(captureAny),
- label: captureAnyNamed('label')));
+ any, any, any,
+ label: anyNamed('label')));
},
overrides: <Type, Generator>{
Clock: () => clock,
@@ -106,7 +106,7 @@
verify(clock.now()).called(2);
expect(
verify(usage.sendTiming(
- typed(captureAny), typed(captureAny), typed(captureAny),
+ captureAny, captureAny, captureAny,
label: captureAnyNamed('label'))).captured,
<dynamic>[
'flutter',
@@ -137,7 +137,7 @@
expect(
verify(usage.sendTiming(
- typed(captureAny), typed(captureAny), typed(captureAny),
+ captureAny, captureAny, captureAny,
label: captureAnyNamed('label'))).captured,
<dynamic>[
'flutter',
