Upgrade mockito to latest version.
And fix frontend_server_test.dart accordingly.
Change-Id: Ic6a57afc9582780e55015a36f3cec6969de13c54
Reviewed-on: https://dart-review.googlesource.com/56709
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/DEPS b/DEPS
index 90d517f..76e7739 100644
--- a/DEPS
+++ b/DEPS
@@ -99,7 +99,7 @@
"markdown_tag": "2.0.0",
"matcher_tag": "0.12.1+4",
"mime_tag": "0.9.6",
- "mockito_tag": "a92db054fba18bc2d605be7670aee74b7cadc00a",
+ "mockito_tag": "d39ac507483b9891165e422ec98d9fb480037c8b",
"mustache4dart_tag" : "v2.1.2",
"oauth2_tag": "1.1.0",
"observatory_pub_packages_rev": "d3a3aebefbd35aa30fe7bbc2889b772b398f7d7f",
diff --git a/pkg/vm/test/frontend_server_test.dart b/pkg/vm/test/frontend_server_test.dart
index 2a35304..bfd1219 100644
--- a/pkg/vm/test/frontend_server_test.dart
+++ b/pkg/vm/test/frontend_server_test.dart
@@ -33,7 +33,8 @@
group('batch compile with mocked compiler', () {
final CompilerInterface compiler = new _MockedCompiler();
- when(compiler.compile(any, any, generator: any)).thenReturn(true);
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
+ .thenAnswer((_) => new Future.value(true));
test('compile from command line', () async {
final List<String> args = <String>[
@@ -46,7 +47,7 @@
final List<ArgResults> capturedArgs = verify(compiler.compile(
argThat(equals('server.dart')),
captureAny,
- generator: any,
+ generator: anyNamed('generator'),
)).captured;
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['strong'], equals(false));
@@ -64,7 +65,7 @@
final List<ArgResults> capturedArgs = verify(compiler.compile(
argThat(equals('server.dart')),
captureAny,
- generator: any,
+ generator: anyNamed('generator'),
)).captured;
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['strong'], equals(true));
@@ -84,7 +85,7 @@
final List<ArgResults> capturedArgs = verify(compiler.compile(
argThat(equals('server.dart')),
captureAny,
- generator: any,
+ generator: anyNamed('generator'),
)).captured;
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['strong'], equals(true));
@@ -103,7 +104,7 @@
final List<ArgResults> capturedArgs = verify(compiler.compile(
argThat(equals('server.dart')),
captureAny,
- generator: any,
+ generator: anyNamed('generator'),
)).captured;
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['link-platform'], equals(true));
@@ -123,7 +124,7 @@
final StreamController<List<int>> inputStreamController =
new StreamController<List<int>>();
final ReceivePort compileCalled = new ReceivePort();
- when(compiler.compile(any, any, generator: any))
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
.thenAnswer((Invocation invocation) {
expect(invocation.positionalArguments[0], equals('server.dart'));
expect(
@@ -161,7 +162,7 @@
final StreamController<List<int>> inputStreamController =
new StreamController<List<int>>();
final ReceivePort compileCalled = new ReceivePort();
- when(compiler.compile(any, any, generator: any))
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
.thenAnswer((Invocation invocation) {
expect(invocation.positionalArguments[0], equals('server.dart'));
expect(
@@ -185,7 +186,7 @@
final StreamController<List<int>> inputStreamController =
new StreamController<List<int>>();
final ReceivePort compileCalled = new ReceivePort();
- when(compiler.compile(any, any, generator: any))
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
.thenAnswer((Invocation invocation) {
expect(invocation.positionalArguments[0], equals('server.dart'));
expect(
@@ -210,7 +211,7 @@
new StreamController<List<int>>();
final ReceivePort compileCalled = new ReceivePort();
int counter = 1;
- when(compiler.compile(any, any, generator: any))
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
.thenAnswer((Invocation invocation) {
expect(invocation.positionalArguments[0],
equals('server${counter++}.dart'));
@@ -235,7 +236,8 @@
group('interactive incremental compile with mocked compiler', () {
final CompilerInterface compiler = new _MockedCompiler();
- when(compiler.compile(any, any, generator: any)).thenReturn(true);
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
+ .thenAnswer((_) => new Future.value(true));
final List<String> args = <String>[
'--sdk-root',
@@ -356,7 +358,8 @@
await recompileCalled.first;
verifyInOrder(<void>[
- await compiler.compile('file1.dart', any, generator: any),
+ await compiler.compile('file1.dart', any,
+ generator: anyNamed('generator')),
compiler.acceptLastDelta(),
compiler.invalidate(Uri.base.resolve('file2.dart')),
compiler.invalidate(Uri.base.resolve('file3.dart')),
@@ -430,7 +433,8 @@
group('compile with output path', () {
final CompilerInterface compiler = new _MockedCompiler();
- when(compiler.compile(any, any, generator: any)).thenReturn(true);
+ when(compiler.compile(any, any, generator: anyNamed('generator')))
+ .thenAnswer((_) => new Future.value(true));
test('compile from command line', () async {
final List<String> args = <String>[
@@ -447,7 +451,7 @@
final List<ArgResults> capturedArgs = verify(compiler.compile(
argThat(equals('server.dart')),
captureAny,
- generator: any,
+ generator: anyNamed('generator'),
)).captured;
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['strong'], equals(false));
