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

Bump mockito to 3.0.0-alpha+3 (#16306)

Browse Source 
* Bump mockito to 3.0.0-alpha+3

* Type annotation
This commit is contained in:
Sam Rawlins 2018-04-09 12:43:31 -07:00 committed by Alexander Aprelev
parent 660408edd6
commit 2329cb7ec8
17 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/bots/pubspec.yaml
View File

@ -21,7 +21,7 @@ dependencies:
dev_dependencies: dev_dependencies:
test: 0.12.33 test: 0.12.33
mockito: 3.0.0-alpha+2 mockito: 3.0.0-alpha+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"
@ -59,4 +59,4 @@ dev_dependencies:
web_socket_channel: 1.0.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.7 # 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" yaml: 2.1.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: 73c1 # PUBSPEC CHECKSUM: e7c2

4
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: 3.0.0-alpha+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"
@ -64,4 +64,4 @@ dev_dependencies:
flutter: flutter:
uses-material-design: true uses-material-design: true
# PUBSPEC CHECKSUM: 2bbb # PUBSPEC CHECKSUM: a9bc

4
dev/tools/pubspec.yaml
View File

@ -24,7 +24,7 @@ dependencies:
dev_dependencies: dev_dependencies:
test: 0.12.33 test: 0.12.33
mockito: 3.0.0-alpha+2 mockito: 3.0.0-alpha+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"
@ -60,4 +60,4 @@ dev_dependencies:
web_socket_channel: 1.0.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.7 # 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" yaml: 2.1.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: c7ca # PUBSPEC CHECKSUM: 3ccb

4
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: 3.0.0-alpha+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"
@ -67,4 +67,4 @@ dev_dependencies:
environment: environment:
sdk: '>=1.19.0 <2.0.0' sdk: '>=1.19.0 <2.0.0'
# PUBSPEC CHECKSUM: 2bbb # PUBSPEC CHECKSUM: a9bc

4
packages/flutter_driver/pubspec.yaml
View File

@ -66,7 +66,7 @@ dependencies:
dev_dependencies: dev_dependencies:
test: 0.12.33 test: 0.12.33
mockito: 3.0.0-alpha+2 mockito: 3.0.0-alpha+3
quiver: 0.29.0+1 quiver: 0.29.0+1
# PUBSPEC CHECKSUM: 8a7e # PUBSPEC CHECKSUM: 397f

4
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: 3.0.0-alpha+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"
@ -62,4 +62,4 @@ dev_dependencies:
web_socket_channel: 1.0.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.7 # 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" yaml: 2.1.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: 809b # PUBSPEC CHECKSUM: fe9c

2
packages/flutter_tools/lib/src/commands/update_packages.dart
View File

@ -27,7 +27,7 @@ import '../runner/flutter_command.dart';
/// ``` /// ```
const Map<String, String> _kManuallyPinnedDependencies = const <String, String>{ const Map<String, String> _kManuallyPinnedDependencies = const <String, String>{
// Add pinned packages here. // Add pinned packages here.
'mockito': '3.0.0-alpha+2', // TODO(aam): https://github.com/dart-lang/mockito/issues/110 'mockito': '3.0.0-alpha+3', // TODO(aam): https://github.com/dart-lang/mockito/issues/110
}; };
class UpdatePackagesCommand extends FlutterCommand { class UpdatePackagesCommand extends FlutterCommand {

4
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: 3.0.0-alpha+3
dartdoc: dartdoc:
# Exclude this package from the hosted API docs. # Exclude this package from the hosted API docs.
@ -95,4 +95,4 @@ dependency_overrides:
kernel: kernel:
path: ../../bin/cache/dart-sdk/lib/kernel path: ../../bin/cache/dart-sdk/lib/kernel
# PUBSPEC CHECKSUM: 7834 # PUBSPEC CHECKSUM: 9735

4
packages/flutter_tools/test/analytics_test.dart
View File

@ -96,7 +96,7 @@ void main() {
testUsingContext('flutter commands send timing events', () async { testUsingContext('flutter commands send timing events', () async {
mockTimes = <int>[1000, 2000]; mockTimes = <int>[1000, 2000];
when(mockDoctor.diagnose(androidLicenses: false, verbose: false)).thenReturn(true); when(mockDoctor.diagnose(androidLicenses: false, verbose: false)).thenAnswer((_) async => true);
final DoctorCommand command = new DoctorCommand(); final DoctorCommand command = new DoctorCommand();
final CommandRunner<Null> runner = createTestCommandRunner(command); final CommandRunner<Null> runner = createTestCommandRunner(command);
await runner.run(<String>['doctor']); await runner.run(<String>['doctor']);
@ -115,7 +115,7 @@ void main() {
testUsingContext('doctor fail sends warning', () async { testUsingContext('doctor fail sends warning', () async {
mockTimes = <int>[1000, 2000]; mockTimes = <int>[1000, 2000];
when(mockDoctor.diagnose(androidLicenses: false, verbose: false)).thenReturn(false); when(mockDoctor.diagnose(androidLicenses: false, verbose: false)).thenAnswer((_) async => false);
final DoctorCommand command = new DoctorCommand(); final DoctorCommand command = new DoctorCommand();
final CommandRunner<Null> runner = createTestCommandRunner(command); final CommandRunner<Null> runner = createTestCommandRunner(command);
await runner.run(<String>['doctor']); await runner.run(<String>['doctor']);

2
packages/flutter_tools/test/base/context_test.dart
View File

@ -174,7 +174,7 @@ void main() {
test('returns the value returned by body', () async { test('returns the value returned by body', () async {
expect(await context.run<int>(body: () => 123), 123); expect(await context.run<int>(body: () => 123), 123);
expect(await context.run<String>(body: () => 'value'), 'value'); expect(await context.run<String>(body: () => 'value'), 'value');
expect(await context.run<Future<int>>(body: () async => 456), 456); expect(await context.run<int>(body: () async => 456), 456);
}); });
test('passes name to child context', () async { test('passes name to child context', () async {

8
packages/flutter_tools/test/commands/install_test.dart
View File

@ -17,8 +17,8 @@ void main() {
applyMocksToCommand(command); applyMocksToCommand(command);
final MockAndroidDevice device = new MockAndroidDevice(); final MockAndroidDevice device = new MockAndroidDevice();
when(device.isAppInstalled(any)).thenReturn(false); when(device.isAppInstalled(any)).thenAnswer((_) async => false);
when(device.installApp(any)).thenReturn(true); when(device.installApp(any)).thenAnswer((_) async => true);
testDeviceManager.addDevice(device); testDeviceManager.addDevice(device);
await createTestCommandRunner(command).run(<String>['install']); await createTestCommandRunner(command).run(<String>['install']);
@ -29,8 +29,8 @@ void main() {
applyMocksToCommand(command); applyMocksToCommand(command);
final MockIOSDevice device = new MockIOSDevice(); final MockIOSDevice device = new MockIOSDevice();
when(device.isAppInstalled(any)).thenReturn(false); when(device.isAppInstalled(any)).thenAnswer((_) async => false);
when(device.installApp(any)).thenReturn(true); when(device.installApp(any)).thenAnswer((_) async => true);
testDeviceManager.addDevice(device); testDeviceManager.addDevice(device);
await createTestCommandRunner(command).run(<String>['install']); await createTestCommandRunner(command).run(<String>['install']);

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

@ -35,7 +35,7 @@ void main() {
when(mockProcessManager.canRun(any)).thenReturn(true); when(mockProcessManager.canRun(any)).thenReturn(true);
when(mockProcessManager.start(any)).thenAnswer( when(mockProcessManager.start(any)).thenAnswer(
(Invocation invocation) => new Future<Process>.value(mockFrontendServer)); (Invocation invocation) => new Future<Process>.value(mockFrontendServer));
when(mockFrontendServer.exitCode).thenReturn(0); when(mockFrontendServer.exitCode).thenAnswer((_) async => 0);
}); });
testUsingContext('single dart successful compilation', () async { testUsingContext('single dart successful compilation', () async {
@ -77,7 +77,7 @@ void main() {
}); });
testUsingContext('single dart abnormal compiler termination', () async { testUsingContext('single dart abnormal compiler termination', () async {
when(mockFrontendServer.exitCode).thenReturn(255); when(mockFrontendServer.exitCode).thenAnswer((_) async => 255);
final BufferLogger logger = context[Logger]; final BufferLogger logger = context[Logger];

4
packages/flutter_tools/test/ios/code_signing_test.dart
View File

@ -130,7 +130,7 @@ void main() {
)) ))
)); ));
when(mockProcess.stderr).thenAnswer((Invocation invocation) => mockStdErr); when(mockProcess.stderr).thenAnswer((Invocation invocation) => mockStdErr);
when(mockProcess.exitCode).thenReturn(0); when(mockProcess.exitCode).thenAnswer((_) async => 0);
final Map<String, String> signingConfigs = await getCodeSigningIdentityDevelopmentTeam(iosApp: app); final Map<String, String> signingConfigs = await getCodeSigningIdentityDevelopmentTeam(iosApp: app);
@ -185,7 +185,7 @@ void main() {
)) ))
)); ));
when(mockProcess.stderr).thenAnswer((Invocation invocation) => mockStdErr); when(mockProcess.stderr).thenAnswer((Invocation invocation) => mockStdErr);
when(mockProcess.exitCode).thenReturn(0); when(mockProcess.exitCode).thenAnswer((_) async => 0);
final Map<String, String> signingConfigs = await getCodeSigningIdentityDevelopmentTeam(iosApp: app); final Map<String, String> signingConfigs = await getCodeSigningIdentityDevelopmentTeam(iosApp: app);

6
packages/flutter_tools/test/ios/ios_workflow_test.dart
View File

@ -253,9 +253,9 @@ void main() {
.thenReturn('Xcode 8.2.1\nBuild version 8C1002\n'); .thenReturn('Xcode 8.2.1\nBuild version 8C1002\n');
when(xcode.isInstalledAndMeetsVersionCheck).thenReturn(true); when(xcode.isInstalledAndMeetsVersionCheck).thenReturn(true);
when(xcode.eulaSigned).thenReturn(true); when(xcode.eulaSigned).thenReturn(true);
when(cocoaPods.isCocoaPodsInstalledAndMeetsVersionCheck).thenReturn(false); when(cocoaPods.isCocoaPodsInstalledAndMeetsVersionCheck).thenAnswer((_) async => false);
when(cocoaPods.hasCocoaPods).thenReturn(true); when(cocoaPods.hasCocoaPods).thenAnswer((_) async => true);
when(cocoaPods.isCocoaPodsInitialized).thenReturn(false); when(cocoaPods.isCocoaPodsInitialized).thenAnswer((_) async => false);
when(xcode.isSimctlInstalled).thenReturn(true); when(xcode.isSimctlInstalled).thenReturn(true);
final ValidationResult result = await new IOSWorkflowTestTarget().validate(); final ValidationResult result = await new IOSWorkflowTestTarget().validate();

3
packages/flutter_tools/test/ios/simulators_test.dart
View File

@ -306,8 +306,7 @@ void main() {
when(mockProcess.exitCode) when(mockProcess.exitCode)
.thenAnswer((Invocation invocation) => new Future<int>.delayed(Duration.zero, () => 0)); .thenAnswer((Invocation invocation) => new Future<int>.delayed(Duration.zero, () => 0));
return new Future<Process>.value(mockProcess); return new Future<Process>.value(mockProcess);
}) });
.thenThrow(new TestFailure('Should start one process only'));
final IOSSimulator device = new IOSSimulator('123456', category: 'iOS 11.0'); final IOSSimulator device = new IOSSimulator('123456', category: 'iOS 11.0');
final DeviceLogReader logReader = device.getLogReader( final DeviceLogReader logReader = device.getLogReader(

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

@ -396,7 +396,7 @@ void fakeData(
throw new StateError('Unexpected call to Cache.setStampFor(${invocation.positionalArguments}, ${invocation.namedArguments})'); throw new StateError('Unexpected call to Cache.setStampFor(${invocation.positionalArguments}, ${invocation.namedArguments})');
}); });
final Answering syncAnswer = (Invocation invocation) { final Answering<ProcessResult> syncAnswer = (Invocation invocation) {
bool argsAre(String a1, [String a2, String a3, String a4, String a5, String a6, String a7, String a8]) { bool argsAre(String a1, [String a2, String a3, String a4, String a5, String a6, String a7, String a8]) {
const ListEquality<String> equality = const ListEquality<String>(); const ListEquality<String> equality = const ListEquality<String>();
final List<String> args = invocation.positionalArguments.single; final List<String> args = invocation.positionalArguments.single;

4
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: 3.0.0-alpha+3
test: 0.12.33 test: 0.12.33
# PUBSPEC CHECKSUM: 763 # PUBSPEC CHECKSUM: b764