Actual URI support for package URI resolution.

pkg/analyzer/test/generated/source_factory_test.dart

Index: pkg/analyzer/test/generated/source_factory_test.dart
diff --git a/pkg/analyzer/test/generated/source_factory_test.dart b/pkg/analyzer/test/generated/source_factory_test.dart
index 7ff5572d1e053a7c09fbb3844389ef6b84dbc926..21c070802824881d14926786924797af2ae72cef 100644
--- a/pkg/analyzer/test/generated/source_factory_test.dart
+++ b/pkg/analyzer/test/generated/source_factory_test.dart
@@ -33,6 +33,10 @@ main() {
   runPackageMapTests();
 }
 
+Source createSource({String path, String uri}) => new MemoryResourceProvider()
+    .getFile(path)
+    .createSource(uri != null ? Uri.parse(uri) : null);
+
 void runPackageMapTests() {
   final Uri baseUri = new Uri.file('test/base');
   final List<UriResolver> testResolvers = [new FileUriResolver()];
@@ -170,16 +174,13 @@ foo:http://www.google.com
   });
 }
 
-Source createSource({String path, String uri}) => new MemoryResourceProvider()
-    .getFile(path)
-    .createSource(uri != null ? Uri.parse(uri) : null);
-
 class CustomUriResolver extends UriResolver {
   String uriPath;
   CustomUriResolver({this.uriPath});
 
   @override
-  Source resolveAbsolute(Uri uri) => createSource(path: uriPath);
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) =>
+      createSource(path: uriPath);

[Paul Berry, 2015/07/21 19:39:27]

Not sure if it matters because this is test code, but technically to satisfy the
interface contract for UriResolver, we should pass actualUri through to
createSource().

[pquitslund, 2015/07/21 20:55:10]

I thought about that.  At the moment there's  no API on File that allows you to
pass in an actualUri and I wasn't ready to take that on.  I added a TODO in the
meantime.

 }
 
 @reflectiveTest
@@ -282,7 +283,7 @@ class UriResolver_absolute extends UriResolver {
   UriResolver_absolute();
 
   @override
-  Source resolveAbsolute(Uri uri) {
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     invoked = true;
     return null;
   }
@@ -290,15 +291,15 @@ class UriResolver_absolute extends UriResolver {
 
 class UriResolver_nonAbsolute_absolute extends UriResolver {
   @override
-  Source resolveAbsolute(Uri uri) {
-    return new FileBasedSource(new JavaFile.fromUri(uri), uri);
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) {
+    return new FileBasedSource(new JavaFile.fromUri(uri), actualUri);
   }
 }
 
 class UriResolver_nonAbsolute_relative extends UriResolver {
   @override
-  Source resolveAbsolute(Uri uri) {
-    return new FileBasedSource(new JavaFile.fromUri(uri), uri);
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) {
+    return new FileBasedSource(new JavaFile.fromUri(uri), actualUri);
   }
 }
 
@@ -308,7 +309,7 @@ class UriResolver_restoreUri extends UriResolver {
   UriResolver_restoreUri(this.source1, this.expected1);
 
   @override
-  Source resolveAbsolute(Uri uri) => null;
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) => null;
 
   @override
   Uri restoreAbsolute(Source source) {
@@ -325,7 +326,7 @@ class UriResolver_SourceFactoryTest_test_fromEncoding_valid
   UriResolver_SourceFactoryTest_test_fromEncoding_valid(this.encoding);
 
   @override
-  Source resolveAbsolute(Uri uri) {
+  Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     if (uri.toString() == encoding) {
       return new TestSource();
     }