Index: pkg/analysis_server/test/mocks.dart |
diff --git a/pkg/analysis_server/test/mocks.dart b/pkg/analysis_server/test/mocks.dart |
index 1aa8f471e5569566879b3f2802ea82d4afcb1a0e..3358b475840219bb57e90828d28a36053c28b8e3 100644 |
--- a/pkg/analysis_server/test/mocks.dart |
+++ b/pkg/analysis_server/test/mocks.dart |
@@ -4,20 +4,20 @@ |
library mocks; |
-@MirrorsUsed(targets: 'mocks', override: '*') |
-import 'dart:mirrors'; |
import 'dart:async'; |
import 'dart:io'; |
+@MirrorsUsed(targets: 'mocks', override: '*') |
+import 'dart:mirrors'; |
import 'package:analysis_server/src/analysis_server.dart'; |
import 'package:analysis_server/src/channel/channel.dart'; |
import 'package:analysis_server/src/operation/operation.dart'; |
import 'package:analysis_server/src/operation/operation_analysis.dart'; |
import 'package:analysis_server/src/protocol.dart' hide Element, ElementKind; |
-import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.dart'; |
import 'package:analyzer/file_system/file_system.dart' as resource; |
import 'package:analyzer/file_system/memory_file_system.dart' as resource; |
import 'package:analyzer/source/package_map_provider.dart'; |
+import 'package:analyzer/source/pub_package_map_provider.dart'; |
import 'package:analyzer/src/generated/element.dart'; |
import 'package:analyzer/src/generated/engine.dart'; |
import 'package:analyzer/src/generated/source.dart'; |
@@ -152,7 +152,7 @@ class MockMethodElement extends StringTypedMock implements MethodElement { |
/** |
* A mock [PackageMapProvider]. |
*/ |
-class MockPackageMapProvider implements OptimizingPubPackageMapProvider { |
+class MockPackageMapProvider implements PubPackageMapProvider { |
/** |
* Package map that will be returned by the next call to [computePackageMap]. |
*/ |
@@ -170,36 +170,17 @@ class MockPackageMapProvider implements OptimizingPubPackageMapProvider { |
Set<String> dependencies = new Set<String>(); |
/** |
- * Modification times that will be returned by the next call to |
- * [computePackageMap]. This will be filtered to include only those paths |
- * mentioned in the `dependencies` field of [computePackageMap]'s |
- * `previousInfo` argument. |
- */ |
- Map<String, int> modificationTimes = <String, int>{}; |
- |
- /** |
* Number of times [computePackageMap] has been called. |
*/ |
int computeCount = 0; |
@override |
- OptimizingPubPackageMapInfo computePackageMap(resource.Folder folder, |
- [OptimizingPubPackageMapInfo previousInfo]) { |
+ PackageMapInfo computePackageMap(resource.Folder folder) { |
++computeCount; |
- Map<String, int> filteredModificationTimes = <String, int>{}; |
- if (previousInfo != null) { |
- for (String dependency in previousInfo.dependencies) { |
- if (modificationTimes.containsKey(dependency)) { |
- filteredModificationTimes[dependency] = modificationTimes[dependency]; |
- } |
- } |
- } |
if (packageMaps != null) { |
- return new OptimizingPubPackageMapInfo( |
- packageMaps[folder.path], dependencies, filteredModificationTimes); |
+ return new PackageMapInfo(packageMaps[folder.path], dependencies); |
} |
- return new OptimizingPubPackageMapInfo( |
- packageMap, dependencies, filteredModificationTimes); |
+ return new PackageMapInfo(packageMap, dependencies); |
} |
noSuchMethod(Invocation invocation) { |