Chromium Code Reviews| Index: pkg/analysis_server/test/mocks.dart |
| diff --git a/pkg/analysis_server/test/mocks.dart b/pkg/analysis_server/test/mocks.dart |
| index bfdaa44c73c1fb37bd23354edb4b1851df4267d1..82d3199c462ed1ec81056d4f1b8c16e4fe76134a 100644 |
| --- a/pkg/analysis_server/test/mocks.dart |
| +++ b/pkg/analysis_server/test/mocks.dart |
| @@ -16,13 +16,14 @@ import 'package:analysis_server/src/operation/operation_analysis.dart'; |
| import 'package:analysis_server/src/operation/operation.dart'; |
| import 'package:analysis_server/src/package_map_provider.dart'; |
| import 'package:analysis_server/src/protocol.dart'; |
| -import 'package:analysis_server/src/resource.dart' as resource; |
| +import 'package:analysis_server/src/resource.dart' as pres; |
|
Brian Wilkerson
2014/06/25 20:57:18
I don't know what "pres" means. I think prefixes s
scheglov
2014/06/25 21:13:38
Renamed back.
Problem is that later I declared a l
|
| import 'package:analyzer/src/generated/engine.dart'; |
| import 'package:analyzer/src/generated/sdk.dart'; |
| import 'package:analyzer/src/generated/source.dart'; |
| import 'package:matcher/matcher.dart'; |
| import 'package:mock/mock.dart'; |
| import 'package:unittest/unittest.dart'; |
| +import 'package:analyzer/src/generated/index.dart'; |
| /** |
| * Answer the absolute path the the SDK relative to the currently running |
| @@ -214,6 +215,10 @@ class MockServerOperation implements PerformAnalysisOperation { |
| @override |
| void sendNotices(AnalysisServer server, List<ChangeNotice> notices) { |
| } |
| + |
| + @override |
| + void updateIndex(Index index, List<ChangeNotice> notices) { |
| + } |
| } |
| @@ -300,11 +305,11 @@ class _IsResponseFailure extends Matcher { |
| class MockSdk implements DartSdk { |
| - final resource.MemoryResourceProvider provider = new resource.MemoryResourceProvider(); |
| + final pres.MemoryResourceProvider provider = new pres.MemoryResourceProvider(); |
| MockSdk() { |
| // TODO(paulberry): Add to this as needed. |
| - const Map<String, String> pathToSource = const { |
| + const Map<String, String> pathToContent = const { |
| "/lib/core/core.dart": ''' |
| library dart.core; |
| class Object {} |
| @@ -354,8 +359,8 @@ class MockSdk implements DartSdk { |
| ''' |
| }; |
| - pathToSource.forEach((String path, String source) { |
| - provider.newFile(path, source); |
| + pathToContent.forEach((String path, String content) { |
| + provider.newFile(path, content); |
| }); |
| } |
| @@ -365,8 +370,11 @@ class MockSdk implements DartSdk { |
| @override |
| Source fromEncoding(UriKind kind, Uri uri) { |
| - // Not used |
| - throw unimplemented; |
| + pres.Resource resource = provider.getResource(uri.path); |
| + if (resource is pres.File) { |
| + return resource.createSource(kind); |
| + } |
| + return null; |
| } |
| UnimplementedError get unimplemented => new UnimplementedError(); |
| @@ -389,7 +397,7 @@ class MockSdk implements DartSdk { |
| String path = uriToPath[dartUri]; |
| if (path != null) { |
| - resource.File file = provider.getResource(path); |
| + pres.File file = provider.getResource(path); |
| return file.createSource(UriKind.DART_URI); |
| } |
| @@ -415,10 +423,10 @@ class MockSdk implements DartSdk { |
| * A mock [PackageMapProvider]. |
| */ |
| class MockPackageMapProvider implements PackageMapProvider { |
| - Map<String, List<resource.Folder>> packageMap = <String, List<resource.Folder>>{}; |
| + Map<String, List<pres.Folder>> packageMap = <String, List<pres.Folder>>{}; |
| @override |
| - Map<String, List<resource.Folder>> computePackageMap(resource.Folder folder) { |
| + Map<String, List<pres.Folder>> computePackageMap(pres.Folder folder) { |
| return packageMap; |
| } |
| } |