Migrate to Mockito 3's anyNamed (#17632)
diff --git a/packages/flutter/test/foundation/consolidate_response_test.dart b/packages/flutter/test/foundation/consolidate_response_test.dart
index 17ce508..184d9a2 100644
--- a/packages/flutter/test/foundation/consolidate_response_test.dart
+++ b/packages/flutter/test/foundation/consolidate_response_test.dart
@@ -15,9 +15,9 @@
response = new MockHttpClientResponse();
when(response.listen(
typed(any),
- onDone: typed(any, named: 'onDone'),
- onError: typed(any, named: 'onError'),
- cancelOnError: typed(any, named: 'cancelOnError')
+ onDone: anyNamed('onDone'),
+ onError: anyNamed('onError'),
+ cancelOnError: anyNamed('cancelOnError')
)).thenAnswer((Invocation invocation) {
final void Function(List<int>) onData = invocation.positionalArguments[0];
final void Function(Object) onError = invocation.namedArguments[#onError];
@@ -46,9 +46,9 @@
test('forwards errors from HttpClientResponse', () async {
when(response.listen(
typed(any),
- onDone: typed(any, named: 'onDone'),
- onError: typed(any, named: 'onError'),
- cancelOnError: typed(any, named: 'cancelOnError')
+ onDone: anyNamed('onDone'),
+ onError: anyNamed('onError'),
+ cancelOnError: anyNamed('cancelOnError')
)).thenAnswer((Invocation invocation) {
final void Function(List<int>) onData = invocation.positionalArguments[0];
final void Function(Object) onError = invocation.namedArguments[#onError];
@@ -65,4 +65,4 @@
});
}
-class MockHttpClientResponse extends Mock implements HttpClientResponse {}
\ No newline at end of file
+class MockHttpClientResponse extends Mock implements HttpClientResponse {}
diff --git a/packages/flutter_tools/test/channel_test.dart b/packages/flutter_tools/test/channel_test.dart
index 4dadb3d..66893ac 100644
--- a/packages/flutter_tools/test/channel_test.dart
+++ b/packages/flutter_tools/test/channel_test.dart
@@ -51,8 +51,8 @@
when(process.exitCode).thenAnswer((_) => new Future<int>.value(0));
when(mockProcessManager.start(
<String>['git', 'branch', '-r'],
- workingDirectory: typed(any, named: 'workingDirectory'),
- environment: typed(any, named: 'environment')))
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment')))
.thenAnswer((_) => new Future<Process>.value(process));
final ChannelCommand command = new ChannelCommand();
@@ -60,8 +60,8 @@
await runner.run(<String>['channel']);
verify(mockProcessManager.start(<String>['git', 'branch', '-r'],
- workingDirectory: typed(any, named: 'workingDirectory'),
- environment: typed(any, named: 'environment'))).called(1);
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment'))).called(1);
expect(testLogger.errorText, hasLength(0));
@@ -81,4 +81,4 @@
class MockProcessManager extends Mock implements ProcessManager {}
-class MockProcess extends Mock implements Process {}
\ No newline at end of file
+class MockProcess extends Mock implements Process {}
diff --git a/packages/flutter_tools/test/ios/cocoapods_test.dart b/packages/flutter_tools/test/ios/cocoapods_test.dart
index 312623c..bdb77b1 100644
--- a/packages/flutter_tools/test/ios/cocoapods_test.dart
+++ b/packages/flutter_tools/test/ios/cocoapods_test.dart
@@ -206,7 +206,7 @@
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: any,
- environment: typed<Map<String, String>>(any, named: 'environment'),
+ environment: anyNamed('environment'),
));
expect(testLogger.errorText, contains('not installed'));
expect(testLogger.errorText, contains('Skipping pod install'));
@@ -228,7 +228,7 @@
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: any,
- environment: typed<Map<String, String>>(any, named: 'environment'),
+ environment: anyNamed('environment'),
));
}
}, overrides: <Type, Generator>{
@@ -439,7 +439,7 @@
verifyNever(mockProcessManager.run(
argThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: any,
- environment: typed<Map<String, String>>(any, named: 'environment'),
+ environment: anyNamed('environment'),
));
}, overrides: <Type, Generator>{
FileSystem: () => fs,
