Simplify PackageMapUriResolver - one folder, return any file, or null.

pkg/analyzer/test/source/package_map_resolver_test.dart

Index: pkg/analyzer/test/source/package_map_resolver_test.dart
diff --git a/pkg/analyzer/test/source/package_map_resolver_test.dart b/pkg/analyzer/test/source/package_map_resolver_test.dart
index f6b9a3d4d00817cdea04f83e3ce2f9fa31fe206f..8347270b9e7f17de394314eaff8e2cb1f28cf53b 100644
--- a/pkg/analyzer/test/source/package_map_resolver_test.dart
+++ b/pkg/analyzer/test/source/package_map_resolver_test.dart
@@ -55,33 +55,13 @@ class _PackageMapUriResolverTest {
   }
 
   void test_resolve_multiple_folders() {
-    String pkgFileA = provider.convertPath('/part1/lib/libA.dart');
-    String pkgFileB = provider.convertPath('/part2/lib/libB.dart');
-    provider.newFile(pkgFileA, 'library lib_a');
-    provider.newFile(pkgFileB, 'library lib_b');
-    PackageMapUriResolver resolver =
-        new PackageMapUriResolver(provider, <String, List<Folder>>{
-      'pkg': <Folder>[
-        provider.getResource(provider.convertPath('/part1/lib/')),
-        provider.getResource(provider.convertPath('/part2/lib/'))
-      ]
-    });
-    {
-      Uri uri = Uri.parse('package:pkg/libA.dart');
-      Source result = resolver.resolveAbsolute(uri);
-      expect(result, isNotNull);
-      expect(result.exists(), isTrue);
-      expect(result.uriKind, UriKind.PACKAGE_URI);
-      expect(result.fullName, pkgFileA);
-    }
-    {
-      Uri uri = Uri.parse('package:pkg/libB.dart');
-      Source result = resolver.resolveAbsolute(uri);
-      expect(result, isNotNull);
-      expect(result.exists(), isTrue);
-      expect(result.uriKind, UriKind.PACKAGE_URI);
-      expect(result.fullName, pkgFileB);
-    }
+    var a = provider.newFile(provider.convertPath('/aaa/a.dart'), '');
+    var b = provider.newFile(provider.convertPath('/bbb/b.dart'), '');
+    expect(() {
+      new PackageMapUriResolver(provider, <String, List<Folder>>{
+        'pkg': <Folder>[a.parent, b.parent]
+      });
+    }, throwsArgumentError);
   }
 
   void test_resolve_nonPackage() {
@@ -146,10 +126,7 @@ class _PackageMapUriResolverTest {
     UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP);
     Uri uri = Uri.parse('package:analyzer/analyzer.dart');
     Source result = resolver.resolveAbsolute(uri);
-    expect(result, isNotNull);
-    expect(result.exists(), isFalse);
-    expect(result.fullName, 'analyzer.dart');
-    expect(result.uri.toString(), 'package:analyzer/analyzer.dart');
+    expect(result, isNull);
   }
 
   void test_restoreAbsolute() {
@@ -185,58 +162,6 @@ class _PackageMapUriResolverTest {
     }
   }
 
-  void test_restoreAbsolute_ambiguous() {
-    String file1 = provider.convertPath('/foo1/lib/bar.dart');
-    String file2 = provider.convertPath('/foo2/lib/bar.dart');
-    provider.newFile(file1, 'library bar');
-    provider.newFile(file2, 'library bar');
-    PackageMapUriResolver resolver =
-        new PackageMapUriResolver(provider, <String, List<Folder>>{
-      'foo': <Folder>[
-        provider.getResource(provider.convertPath('/foo1/lib')),
-        provider.getResource(provider.convertPath('/foo2/lib'))
-      ]
-    });
-    // Restoring file1 should yield a package URI, and that package URI should
-    // resolve back to file1.
-    Source source1 = _createFileSource(file1);
-    Uri uri1 = resolver.restoreAbsolute(source1);
-    expect(uri1.toString(), 'package:foo/bar.dart');
-    expect(resolver.resolveAbsolute(uri1).fullName, file1);
-    // Restoring file2 should not yield a package URI, because there is no URI
-    // that resolves to file2.
-    Source source2 = _createFileSource(file2);
-    expect(resolver.restoreAbsolute(source2), isNull);
-  }
-
-  void test_restoreAbsolute_longestMatch() {
-    String file1 = provider.convertPath('/foo1/bar1/lib.dart');
-    String file2 = provider.convertPath('/foo2/bar2/lib.dart');
-    provider.newFile(file1, 'library lib');
-    provider.newFile(file2, 'library lib');
-    PackageMapUriResolver resolver =
-        new PackageMapUriResolver(provider, <String, List<Folder>>{
-      'pkg1': <Folder>[
-        provider.getResource(provider.convertPath('/foo1')),
-        provider.getResource(provider.convertPath('/foo2/bar2'))
-      ],
-      'pkg2': <Folder>[
-        provider.getResource(provider.convertPath('/foo1/bar1')),
-        provider.getResource(provider.convertPath('/foo2'))
-      ]
-    });
-    // Restoring file1 should yield a package URI for pkg2, since pkg2's match
-    // for the file path (/foo1/bar1) is longer than pkg1's match (/foo1).
-    Source source1 = _createFileSource(file1);
-    Uri uri1 = resolver.restoreAbsolute(source1);
-    expect(uri1.toString(), 'package:pkg2/lib.dart');
-    // Restoring file2 should yield a package URI for pkg1, since pkg1's match
-    // for the file path (/foo2/bar2) is longer than pkg2's match (/foo2).
-    Source source2 = _createFileSource(file2);
-    Uri uri2 = resolver.restoreAbsolute(source2);
-    expect(uri2.toString(), 'package:pkg1/lib.dart');
-  }
-
   Source _createFileSource(String path) {
     return new NonExistingSource(path, toUri(path), UriKind.FILE_URI);
   }