firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Move mockito to 3.0.0-alpha. (#15949)" (#15979)

Browse Source 
This reverts commit a7e6225820719eec08ae3c79ce73ebeb8ec33523 as there are failing tests.
This commit is contained in:
Alexander Aprelev 2018-03-27 10:38:20 -07:00 committed by GitHub
parent a7e6225820
commit e59651f925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/bots/pubspec.yaml
View File

@ -21,7 +21,7 @@ dependencies:
dev_dependencies: dev_dependencies:
test: 0.12.32+2 test: 0.12.32+2
mockito: 3.0.0-alpha+2 mockito: 2.2.3
barback: 0.15.2+15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" barback: 0.15.2+15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

2
dev/manual_tests/pubspec.yaml
View File

@ -13,7 +13,7 @@ dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
mockito: 3.0.0-alpha+2 mockito: 2.2.3
args: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
async: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

4
dev/manual_tests/test/mock_image_http.dart
View File

@ -11,9 +11,9 @@ MockHttpClient createMockImageHttpClient(SecurityContext _) {
final MockHttpClientRequest request = new MockHttpClientRequest(); final MockHttpClientRequest request = new MockHttpClientRequest();
final MockHttpClientResponse response = new MockHttpClientResponse(); final MockHttpClientResponse response = new MockHttpClientResponse();
final MockHttpHeaders headers = new MockHttpHeaders(); final MockHttpHeaders headers = new MockHttpHeaders();
when(client.getUrl(typed(any))).thenAnswer((_) => new Future<HttpClientRequest>.value(request)); when(client.getUrl(typed(any))).thenReturn(new Future<HttpClientRequest>.value(request));
when(request.headers).thenReturn(headers); when(request.headers).thenReturn(headers);
when(request.close()).thenAnswer((_) => new Future<HttpClientResponse>.value(response)); when(request.close()).thenReturn(new Future<HttpClientResponse>.value(response));
when(response.contentLength).thenReturn(kTransparentImage.length); when(response.contentLength).thenReturn(kTransparentImage.length);
when(response.statusCode).thenReturn(HttpStatus.OK); when(response.statusCode).thenReturn(HttpStatus.OK);
when(response.listen(typed(any))).thenAnswer((Invocation invocation) { when(response.listen(typed(any))).thenAnswer((Invocation invocation) {

2
dev/tools/pubspec.yaml
View File

@ -24,7 +24,7 @@ dependencies:
dev_dependencies: dev_dependencies:
test: 0.12.32+2 test: 0.12.32+2
mockito: 3.0.0-alpha+2 mockito: 2.2.3
barback: 0.15.2+15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" barback: 0.15.2+15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

2
packages/flutter/pubspec.yaml
View File

@ -16,7 +16,7 @@ dependencies:
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
mockito: 3.0.0-alpha+2 mockito: 2.2.3
args: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
async: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

2
packages/flutter/test/cupertino/refresh_test.dart
View File

@ -59,7 +59,7 @@ void main() {
} }
return refreshIndicator; return refreshIndicator;
}); });
when(mockHelper.refreshTask()).thenAnswer((_) => refreshCompleter.future); when(mockHelper.refreshTask()).thenReturn(refreshCompleter.future);
}); });
SliverList buildAListOfStuff() { SliverList buildAListOfStuff() {

4
packages/flutter/test/widgets/image_headers_test.dart
View File

@ -27,9 +27,9 @@ void main() {
verify(headers.add('flutter', 'flutter')).called(1); verify(headers.add('flutter', 'flutter')).called(1);
}, createHttpClient: (SecurityContext _) { }, createHttpClient: (SecurityContext _) {
when(client.getUrl(typed(any))).thenAnswer((_) => new Future<HttpClientRequest>.value(request)); when(client.getUrl(typed(any))).thenReturn(new Future<HttpClientRequest>.value(request));
when(request.headers).thenReturn(headers); when(request.headers).thenReturn(headers);
when(request.close()).thenAnswer((_) => new Future<HttpClientResponse>.value(response)); when(request.close()).thenReturn(new Future<HttpClientResponse>.value(response));
when(response.contentLength).thenReturn(kTransparentImage.length); when(response.contentLength).thenReturn(kTransparentImage.length);
when(response.statusCode).thenReturn(HttpStatus.OK); when(response.statusCode).thenReturn(HttpStatus.OK);
when(response.listen(typed(any))).thenAnswer((Invocation invocation) { when(response.listen(typed(any))).thenAnswer((Invocation invocation) {

2
packages/flutter_driver/pubspec.yaml
View File

@ -66,7 +66,7 @@ dependencies:
dev_dependencies: dev_dependencies:
test: 0.12.32+2 test: 0.12.32+2
mockito: 3.0.0-alpha+2 mockito: 2.2.3
quiver: 0.28.0 quiver: 0.28.0
# PUBSPEC CHECKSUM: 74e9 # PUBSPEC CHECKSUM: 74e9

2
packages/flutter_localizations/pubspec.yaml
View File

@ -15,7 +15,7 @@ dependencies:
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
mockito: 3.0.0-alpha+2 mockito: 2.2.3
args: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
async: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"

2
packages/flutter_tools/pubspec.yaml
View File

@ -81,7 +81,7 @@ dependencies:
dev_dependencies: dev_dependencies:
collection: 1.14.6 collection: 1.14.6
mockito: 3.0.0-alpha+2 mockito: 2.2.3
dartdoc: dartdoc:
# Exclude this package from the hosted API docs. # Exclude this package from the hosted API docs.

8
packages/flutter_tools/test/channel_test.dart
View File

@ -46,14 +46,14 @@ void main() {
]); ]);
final Process process = new MockProcess(); final Process process = new MockProcess();
when(process.stdout).thenAnswer((_) => stdout); when(process.stdout).thenReturn(stdout);
when(process.stderr).thenAnswer((_) => const Stream<List<int>>.empty()); when(process.stderr).thenReturn(const Stream<List<int>>.empty());
when(process.exitCode).thenAnswer((_) => new Future<int>.value(0)); when(process.exitCode).thenReturn(new Future<int>.value(0));
when(mockProcessManager.start( when(mockProcessManager.start(
<String>['git', 'branch', '-r'], <String>['git', 'branch', '-r'],
workingDirectory: typed(any, named: 'workingDirectory'), workingDirectory: typed(any, named: 'workingDirectory'),
environment: typed(any, named: 'environment'))) environment: typed(any, named: 'environment')))
.thenAnswer((_) => new Future<Process>.value(process)); .thenReturn(new Future<Process>.value(process));
final ChannelCommand command = new ChannelCommand(); final ChannelCommand command = new ChannelCommand();
final CommandRunner<Null> runner = createTestCommandRunner(command); final CommandRunner<Null> runner = createTestCommandRunner(command);

2
packages/flutter_tools/test/compile_test.dart
View File

@ -30,7 +30,7 @@ void main() {
when(mockFrontendServer.stderr) when(mockFrontendServer.stderr)
.thenAnswer((Invocation invocation) => mockFrontendServerStdErr); .thenAnswer((Invocation invocation) => mockFrontendServerStdErr);
final StreamController<String> stdErrStreamController = new StreamController<String>(); final StreamController<String> stdErrStreamController = new StreamController<String>();
when(mockFrontendServerStdErr.transform<String>(any)).thenAnswer((_) => stdErrStreamController.stream); when(mockFrontendServerStdErr.transform<String>(any)).thenReturn(stdErrStreamController.stream);
when(mockFrontendServer.stdin).thenReturn(mockFrontendServerStdIn); when(mockFrontendServer.stdin).thenReturn(mockFrontendServerStdIn);
when(mockProcessManager.canRun(any)).thenReturn(true); when(mockProcessManager.canRun(any)).thenReturn(true);
when(mockProcessManager.start(any)).thenAnswer( when(mockProcessManager.start(any)).thenAnswer(

2
packages/fuchsia_remote_debug_protocol/pubspec.yaml
View File

@ -62,7 +62,7 @@ dependencies:
yaml: 2.1.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dev_dependencies: dev_dependencies:
mockito: 3.0.0-alpha+2 mockito: 2.2.3
test: 0.12.32+2 test: 0.12.32+2
# PUBSPEC CHECKSUM: 97d6 # PUBSPEC CHECKSUM: 97d6

2
packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart
View File

@ -100,7 +100,7 @@ void main() {
mockPeerConnections.add(mp); mockPeerConnections.add(mp);
uriConnections.add(uri); uriConnections.add(uri);
when(mp.sendRequest(typed<String>(any), typed<String>(any))) when(mp.sendRequest(typed<String>(any), typed<String>(any)))
.thenAnswer((_) => new Future<Map<String, dynamic>>( .thenReturn(new Future<Map<String, dynamic>>(
() => flutterViewCannedResponses[flutterViewIndex++])); () => flutterViewCannedResponses[flutterViewIndex++]));
return mp; return mp;
}); });

8
packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart
View File

@ -86,7 +86,7 @@ void main() {
Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) { Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) {
when(mockPeer.sendRequest( when(mockPeer.sendRequest(
typed<String>(any), typed<Map<String, dynamic>>(any))) typed<String>(any), typed<Map<String, dynamic>>(any)))
.thenAnswer((_) => new Future<Map<String, dynamic>>( .thenReturn(new Future<Map<String, dynamic>>(
() => flutterViewCannedResponses)); () => flutterViewCannedResponses));
return new Future<json_rpc.Peer>(() => mockPeer); return new Future<json_rpc.Peer>(() => mockPeer);
} }
@ -135,7 +135,7 @@ void main() {
Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) { Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) {
when(mockPeer.sendRequest( when(mockPeer.sendRequest(
typed<String>(any), typed<Map<String, dynamic>>(any))) typed<String>(any), typed<Map<String, dynamic>>(any)))
.thenAnswer((_) => new Future<Map<String, dynamic>>( .thenReturn(new Future<Map<String, dynamic>>(
() => flutterViewCannedResponseMissingId)); () => flutterViewCannedResponseMissingId));
return new Future<json_rpc.Peer>(() => mockPeer); return new Future<json_rpc.Peer>(() => mockPeer);
} }
@ -173,7 +173,7 @@ void main() {
Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) { Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) {
when(mockPeer.sendRequest( when(mockPeer.sendRequest(
typed<String>(any), typed<Map<String, dynamic>>(any))) typed<String>(any), typed<Map<String, dynamic>>(any)))
.thenAnswer((_) => new Future<Map<String, dynamic>>( .thenReturn(new Future<Map<String, dynamic>>(
() => flutterViewCannedResponseMissingIsolateName)); () => flutterViewCannedResponseMissingIsolateName));
return new Future<json_rpc.Peer>(() => mockPeer); return new Future<json_rpc.Peer>(() => mockPeer);
} }
@ -208,7 +208,7 @@ void main() {
// Return a command that will never complete. // Return a command that will never complete.
when(mockPeer.sendRequest( when(mockPeer.sendRequest(
typed<String>(any), typed<Map<String, dynamic>>(any))) typed<String>(any), typed<Map<String, dynamic>>(any)))
.thenAnswer((_) => new Completer<Map<String, dynamic>>().future); .thenReturn(new Completer<Map<String, dynamic>>().future);
return new Future<json_rpc.Peer>(() => mockPeer); return new Future<json_rpc.Peer>(() => mockPeer);
} }