commit f3680371269cde908fec80f5a4063be6a542355f
author Brian Wilkerson <brianwilkerson@google.com> Thu Jun 07 18:59:19 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Jun 07 18:59:19 2018 +0000
tree bb1a2aa4d4a77609873a01241740d1df7d367d11
parent 8e59876ccaa6c6f4f7cce142acaf9823f3698fe7

Remove uses of mockito because they are causing problems in dart2

Change-Id: Ife57033ede3abdd1e609e1361fb688d96de4dcbf
Reviewed-on: https://dart-review.googlesource.com/59141
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Mike Fairhurst <mfairhurst@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

pkg/analyzer/test/generated/package_build_test.dart

diff --git a/pkg/analyzer/test/generated/package_build_test.dart b/pkg/analyzer/test/generated/package_build_test.dart
index 96cecc3..47980a8 100644
--- a/pkg/analyzer/test/generated/package_build_test.dart
+++ b/pkg/analyzer/test/generated/package_build_test.dart
@@ -7,7 +7,6 @@
 import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/generated/package_build.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:mockito/mockito.dart';
 import 'package:package_config/packages.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -20,11 +19,31 @@
   });
 }
 
-class MockContextBuilder extends Mock implements ContextBuilder {}
+class MockContextBuilder implements ContextBuilder {
+  Map<String, Packages> packagesMapMap = <String, Packages>{};
+  Map<Packages, Map<String, List<Folder>>> packagesToMapMap =
+      <Packages, Map<String, List<Folder>>>{};
 
-class MockPackages extends Mock implements Packages {}
+  Map<String, List<Folder>> convertPackagesToMap(Packages packages) =>
+      packagesToMapMap[packages];
 
-class MockUriResolver extends Mock implements UriResolver {}
+  Packages createPackageMap(String rootDirectoryPath) =>
+      packagesMapMap[rootDirectoryPath];
+
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class MockPackages implements Packages {
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class MockUriResolver implements UriResolver {
+  Map<Uri, Source> resolveAbsoluteMap = {};
+
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) => resolveAbsoluteMap[uri];
+}
 
 @reflectiveTest
 class PackageBuildFileUriResolverTest extends _BaseTest {
@@ -35,12 +54,10 @@
     provider.newFolder(_p('/workspace/.dart_tool/build/generated/project/lib'));
     provider.newFileWithBytes(
         _p('/workspace/pubspec.yaml'), 'name: project'.codeUnits);
-    final ContextBuilder contextBuilder = new MockContextBuilder();
+    final MockContextBuilder contextBuilder = new MockContextBuilder();
     final Packages packages = new MockPackages();
-    when(contextBuilder.createPackageMap(_p('/workspace')))
-        .thenReturn(packages);
-    when(contextBuilder.convertPackagesToMap(packages))
-        .thenReturn({'project': []});
+    contextBuilder.packagesMapMap[_p('/workspace')] = packages;
+    contextBuilder.packagesToMapMap[packages] = {'project': []};
     workspace =
         PackageBuildWorkspace.find(provider, _p('/workspace'), contextBuilder);
     resolver = new PackageBuildFileUriResolver(workspace);
@@ -112,7 +129,7 @@
 class PackageBuildPackageUriResolverTest extends _BaseTest {
   PackageBuildWorkspace workspace;
   PackageBuildPackageUriResolver resolver;
-  UriResolver packageUriResolver;
+  MockUriResolver packageUriResolver;
 
   Uri addPackageSource(String path, String uriStr, {bool create: true}) {
     Uri uri = Uri.parse(uriStr);
@@ -120,7 +137,7 @@
         ? provider.newFile(_p(path), '')
         : provider.getResource(_p(path));
     final Source source = file.createSource(uri);
-    when(packageUriResolver.resolveAbsolute(uri)).thenReturn(source);
+    packageUriResolver.resolveAbsoluteMap[uri] = source;
     return uri;
   }
 
@@ -189,10 +206,8 @@
     }
     final contextBuilder = new MockContextBuilder();
     final packages = new MockPackages();
-    when(contextBuilder.createPackageMap(_p(workspacePath)))
-        .thenReturn(packages);
-    when(contextBuilder.convertPackagesToMap(packages))
-        .thenReturn({'project': []});
+    contextBuilder.packagesMapMap[_p(workspacePath)] = packages;
+    contextBuilder.packagesToMapMap[packages] = {'project': []};
     workspace =
         PackageBuildWorkspace.find(provider, _p(workspacePath), contextBuilder);
     packageUriResolver = new MockUriResolver();
@@ -463,8 +478,8 @@
     final contextBuilder = new MockContextBuilder();
     final packages = new MockPackages();
     final packageMap = new Map.fromIterable(packageNames, value: ((_) => []));
-    when(contextBuilder.createPackageMap(_p(root))).thenReturn(packages);
-    when(contextBuilder.convertPackagesToMap(packages)).thenReturn(packageMap);
+    contextBuilder.packagesMapMap[_p(root)] = packages;
+    contextBuilder.packagesToMapMap[packages] = packageMap;
     return PackageBuildWorkspace.find(provider, _p(root), contextBuilder);
   }
 }