| Index: pkg/analysis_server/test/context_manager_test.dart
|
| diff --git a/pkg/analysis_server/test/context_manager_test.dart b/pkg/analysis_server/test/context_manager_test.dart
|
| index 80cf74decfa60c8c0d0b68842f9c4a2324d9df40..6cde0965dd2ebeae28719b85526d22de15ad3829 100644
|
| --- a/pkg/analysis_server/test/context_manager_test.dart
|
| +++ b/pkg/analysis_server/test/context_manager_test.dart
|
| @@ -193,7 +193,7 @@ class ContextManagerTest {
|
| subProjectA: {
|
| 'foo': [resourceProvider.newFolder('/package/foo')]
|
| },
|
| - subProjectA: {
|
| + subProjectB: {
|
| 'bar': [resourceProvider.newFolder('/package/bar')]
|
| },
|
| };
|
| @@ -205,7 +205,7 @@ class ContextManagerTest {
|
| manager.assertContextFiles(subProjectA, [subProjectA_file]);
|
| manager.assertContextFiles(subProjectB, [subProjectB_file]);
|
| // verify package maps
|
| - _checkPackageMap(root, equals(packageMapProvider.packageMaps[root]));
|
| + _checkPackageMap(root, isNull);
|
| _checkPackageMap(
|
| subProjectA,
|
| equals(packageMapProvider.packageMaps[subProjectA]));
|
| @@ -756,9 +756,9 @@ class ContextManagerTest {
|
| */
|
| void _checkPackageMap(String path, expectation) {
|
| UriResolver resolver = manager.currentContextPackageUriResolvers[path];
|
| - expect(resolver, new isInstanceOf<PackageMapUriResolver>());
|
| - PackageMapUriResolver packageMapUriResolver = resolver;
|
| - expect(packageMapUriResolver.packageMap, expectation);
|
| + Map<String, List<Folder>> packageMap =
|
| + resolver is PackageMapUriResolver ? resolver.packageMap : null;
|
| + expect(packageMap, expectation);
|
| }
|
|
|
| /**
|
|
|