Reapply fast-URI patch.

tests/corelib/uri_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library uriTest;
 
 import "package:expect/expect.dart";
 import 'dart:convert';
 
 testUri(String uriText, bool isAbsolute) {
   var uri = Uri.parse(uriText);
 
+  // Test that parsing a substring works the same as parsing the string.
+  String wrapper = "://@[]:/%?#";
+  var embeddedUri = Uri.parse(
+       "$wrapper$uri$wrapper", wrapper.length, uriText.length + wrapper.length);
+
+  Expect.equals(uri, embeddedUri);
   Expect.equals(isAbsolute, uri.isAbsolute);
   Expect.stringEquals(uriText, uri.toString());
 
   // Test equals and hashCode members.
   var uri2 = Uri.parse(uriText);
   Expect.equals(uri, uri2);
   Expect.equals(uri.hashCode, uri2.hashCode);
 
   // Test that removeFragment doesn't change anything else.
   if (uri.hasFragment) {
@@ skipping 52 matching lines @@
   } else {
     Expect.throws(() => Uri.encodeQueryComponent(orig, encoding: ASCII),
                   (e) => e is ArgumentError);
   }
 }
 
 testUriPerRFCs() {
   final urisSample = "http://a/b/c/d;p?q";
   Uri base = Uri.parse(urisSample);
   testResolve(expect, relative) {
-    Expect.stringEquals(expect, base.resolve(relative).toString());
+    String name = "$base << $relative";
+    Expect.stringEquals(expect, base.resolve(relative).toString(), name);
   }
 
   // From RFC 3986.
   testResolve("g:h",                   "g:h");
   testResolve("http://a/b/c/g",        "g");
   testResolve("http://a/b/c/g",        "./g");
   testResolve("http://a/b/c/g/",       "g/");
   testResolve("http://a/g",            "/g");
   testResolve("http://g",              "//g");
   testResolve("http://a/b/c/d;p?y",    "?y");
@@ skipping 29 matching lines @@
   testResolve("http://a/b/c/y",        "g;x=1/../y");
   testResolve("http://a/b/c/g?y/./x",  "g?y/./x");
   testResolve("http://a/b/c/g?y/../x", "g?y/../x");
   testResolve("http://a/b/c/g#s/./x",  "g#s/./x");
   testResolve("http://a/b/c/g#s/../x", "g#s/../x");
   testResolve("http:g",                "http:g");
 
   // Additional tests (not from RFC 3986).
   testResolve("http://a/b/g;p/h;s",    "../g;p/h;s");
 
+  base = Uri.parse("s:a/b");
+  testResolve("s:a/c", "c");
+  testResolve("s:/c", "../c");
+
+  base = Uri.parse("S:a/b");
+  testResolve("s:a/c", "c");
+  testResolve("s:/c", "../c");
+
+  base = Uri.parse("s:foo");
+  testResolve("s:bar", "bar");
+  testResolve("s:bar", "../bar");
+
+  base = Uri.parse("S:foo");
+  testResolve("s:bar", "bar");
+  testResolve("s:bar", "../bar");
+
+  // Special-case (deliberate non-RFC behavior).
+  base = Uri.parse("foo/bar");
+  testResolve("foo/baz", "baz");
+  testResolve("baz", "../baz");
+
+  base = Uri.parse("s:/foo");
+  testResolve("s:/bar", "bar");
+  testResolve("s:/bar", "../bar");
+
+  base = Uri.parse("S:/foo");
+  testResolve("s:/bar", "bar");
+  testResolve("s:/bar", "../bar");
+
   // Test non-URI base (no scheme, no authority, relative path).
   base = Uri.parse("a/b/c?_#_");
   testResolve("a/b/g?q#f", "g?q#f");
   testResolve("./", "../..");
   testResolve("../", "../../..");
   testResolve("a/b/", ".");
-  testResolve("c", "../../c");
+  testResolve("c", "../../c");  // Deliberate non-RFC behavior.
   base = Uri.parse("../../a/b/c?_#_");  // Initial ".." in base url.
   testResolve("../../a/d", "../d");
   testResolve("../../../d", "../../../d");
 
-  base = Uri.parse("s:a/b");
-  testResolve("s:/c", "../c");
+  base = Uri.parse("s://h/p?q#f");  // A simple base.
+  // Simple references:
+  testResolve("s2://h2/P?Q#F", "s2://h2/P?Q#F");
+  testResolve("s://h2/P?Q#F", "//h2/P?Q#F");
+  testResolve("s://h/P?Q#F", "/P?Q#F");
+  testResolve("s://h/p?Q#F", "?Q#F");
+  testResolve("s://h/p?q#F", "#F");
+  testResolve("s://h/p?q", "");
+  // Non-simple references:
+  testResolve("s2://I@h2/P?Q#F%20", "s2://I@h2/P?Q#F%20");
+  testResolve("s://I@h2/P?Q#F%20", "//I@h2/P?Q#F%20");
+  testResolve("s://h2/P?Q#F%20", "//h2/P?Q#F%20");
+  testResolve("s://h/P?Q#F%20", "/P?Q#F%20");
+  testResolve("s://h/p?Q#F%20", "?Q#F%20");
+  testResolve("s://h/p?q#F%20", "#F%20");
+
+  base = Uri.parse("s://h/p1/p2/p3");  // A simple base with a path.
+  testResolve("s://h/p1/p2/", ".");
+  testResolve("s://h/p1/p2/", "./");
+  testResolve("s://h/p1/", "..");
+  testResolve("s://h/p1/", "../");
+  testResolve("s://h/", "../..");
+  testResolve("s://h/", "../../");
+  testResolve("s://h/p1/%20", "../%20");
+  testResolve("s://h/", "../../../..");
+  testResolve("s://h/", "../../../../");
+
+  base = Uri.parse("s://h/p?q#f%20");  // A non-simpe base.
+  // Simple references:
+  testResolve("s2://h2/P?Q#F", "s2://h2/P?Q#F");
+  testResolve("s://h2/P?Q#F", "//h2/P?Q#F");
+  testResolve("s://h/P?Q#F", "/P?Q#F");
+  testResolve("s://h/p?Q#F", "?Q#F");
+  testResolve("s://h/p?q#F", "#F");
+  testResolve("s://h/p?q", "");
+  // Non-simple references:
+  testResolve("s2://I@h2/P?Q#F%20", "s2://I@h2/P?Q#F%20");
+  testResolve("s://I@h2/P?Q#F%20", "//I@h2/P?Q#F%20");
+  testResolve("s://h2/P?Q#F%20", "//h2/P?Q#F%20");
+  testResolve("s://h/P?Q#F%20", "/P?Q#F%20");
+  testResolve("s://h/p?Q#F%20", "?Q#F%20");
+  testResolve("s://h/p?q#F%20", "#F%20");
+
+  base = Uri.parse("S://h/p1/p2/p3");  // A non-simple base with a path.
+  testResolve("s://h/p1/p2/", ".");
+  testResolve("s://h/p1/p2/", "./");
+  testResolve("s://h/p1/", "..");
+  testResolve("s://h/p1/", "../");
+  testResolve("s://h/", "../..");
+  testResolve("s://h/", "../../");
+  testResolve("s://h/p1/%20", "../%20");
+  testResolve("s://h/", "../../../..");
+  testResolve("s://h/", "../../../../");
+
+  base = Uri.parse("../../../");  // A simple relative path.
+  testResolve("../../../a", "a");
+  testResolve("../../../../a", "../a");
+  testResolve("../../../a%20", "a%20");
+  testResolve("../../../../a%20", "../a%20");
+
+  // Tests covering the branches of the merge algorithm in RFC 3986
+  // with both simple and complex base URIs.
+  for (var b in ["s://a/pa/pb?q#f", "s://a/pa/pb?q#f%20"]) {
+    var origBase = Uri.parse(b);
+    base = origBase;
+
+    // if defined(R.scheme) then ...
+    testResolve("s2://a2/p2?q2#f2", "s2://a2/p2?q2#f2");
+    // else, if defined(R.authority) then ...
+    testResolve("s://a2/p2?q2#f2", "//a2/p2?q2#f2");
+    testResolve("s://a2/?q2#f2", "//a2/../?q2#f2");
+    testResolve("s://a2?q2#f2", "//a2?q2#f2");
+    testResolve("s://a2#f2", "//a2#f2");
+    testResolve("s://a2", "//a2");
+    // else, if (R.path == "") then ...
+    //   if defined(R.query) then
+    testResolve("s://a/pa/pb?q2#f2", "?q2#f2");
+    testResolve("s://a/pa/pb?q2", "?q2");
+    //   else
+    testResolve("s://a/pa/pb?q#f2", "#f2");
+    testResolve("s://a/pa/pb?q", "");
+    // else, if (R.path starts-with "/") then ...
+    testResolve("s://a/p2?q2#f2", "/p2?q2#f2");
+    testResolve("s://a/?q2#f2", "/?q2#f2");
+    testResolve("s://a/#f2", "/#f2");
+    testResolve("s://a/", "/");
+    testResolve("s://a/", "/../");
+    // else ... T.path = merge(Base.path, R.path)
+    // ... remove-dot-fragments(T.path) ...
+    // (Cover the merge function and the remove-dot-fragments functions too).
+
+    // If base has authority and empty path ...
+    var emptyPathBase = Uri.parse(b.replaceFirst("/pa/pb", ""));
+    base = emptyPathBase;
+    testResolve("s://a/p2?q2#f2", "p2?q2#f2");
+    testResolve("s://a/p2#f2", "p2#f2");
+    testResolve("s://a/p2", "p2");
+
+    base = origBase;
+    // otherwise
+    // (Cover both no authority and non-empty path and both).
+    var noAuthEmptyPathBase = Uri.parse(b.replaceFirst("//a/pa/pb", ""));
+    var noAuthAbsPathBase = Uri.parse(b.replaceFirst("//a", ""));
+    var noAuthRelPathBase = Uri.parse(b.replaceFirst("//a/", ""));
+    var noAuthRelSinglePathBase = Uri.parse(b.replaceFirst("//a/pa/", ""));
+
+    testResolve("s://a/pa/p2?q2#f2", "p2?q2#f2");
+    testResolve("s://a/pa/p2#f2", "p2#f2");
+    testResolve("s://a/pa/p2", "p2");
+
+    base = noAuthEmptyPathBase;
+    testResolve("s:p2?q2#f2", "p2?q2#f2");
+    testResolve("s:p2#f2", "p2#f2");
+    testResolve("s:p2", "p2");
+
+    base = noAuthAbsPathBase;
+    testResolve("s:/pa/p2?q2#f2", "p2?q2#f2");
+    testResolve("s:/pa/p2#f2", "p2#f2");
+    testResolve("s:/pa/p2", "p2");
+
+    base = noAuthRelPathBase;
+    testResolve("s:pa/p2?q2#f2", "p2?q2#f2");
+    testResolve("s:pa/p2#f2", "p2#f2");
+    testResolve("s:pa/p2", "p2");
+
+    base = noAuthRelSinglePathBase;
+    testResolve("s:p2?q2#f2", "p2?q2#f2");
+    testResolve("s:p2#f2", "p2#f2");
+    testResolve("s:p2", "p2");
+
+    // Then remove dot segments.
+
+    // A. if input buffer starts with "../" or "./".
+    // This only happens if base has only a single (may be empty) segment and
+    // no slash.
+    base = emptyPathBase;
+    testResolve("s://a/p2", "../p2");
+    testResolve("s://a/", "../");
+    testResolve("s://a/", "..");
+    testResolve("s://a/p2", "./p2");
+    testResolve("s://a/", "./");
+    testResolve("s://a/", ".");
+    testResolve("s://a/p2", "../../p2");
+    testResolve("s://a/p2", "../../././p2");
+
+    base = noAuthRelSinglePathBase;
+    testResolve("s:p2", "../p2");
+    testResolve("s:", "../");
+    testResolve("s:", "..");
+    testResolve("s:p2", "./p2");
+    testResolve("s:", "./");
+    testResolve("s:", ".");
+    testResolve("s:p2", "../../p2");
+    testResolve("s:p2", "../../././p2");
+
+    // B. if input buffer starts with "/./" or is "/.". replace with "/".
+    // (The URI implementation removes the "." path segments when parsing,
+    // so this case isn't handled by merge).
+    base = origBase;
+    testResolve("s://a/pa/p2", "./p2");
+
+    // C. if input buffer starts with "/../" or is "/..", replace with "/"
+    // and remove preceeding segment.
+    testResolve("s://a/p2", "../p2");
+    var longPathBase = Uri.parse(b.replaceFirst("/pb", "/pb/pc/pd"));
+    base = longPathBase;
+    testResolve("s://a/pa/pb/p2", "../p2");
+    testResolve("s://a/pa/p2", "../../p2");
+    testResolve("s://a/p2", "../../../p2");
+    testResolve("s://a/p2", "../../../../p2");
+    var noAuthRelLongPathBase =
+        Uri.parse(b.replaceFirst("//a/pa/pb", "pa/pb/pc/pd"));
+    base = noAuthRelLongPathBase;
+    testResolve("s:pa/pb/p2", "../p2");
+    testResolve("s:pa/p2", "../../p2");
+    testResolve("s:/p2", "../../../p2");
+    testResolve("s:/p2", "../../../../p2");
+
+    // D. if the input buffer contains only ".." or ".", remove it.
+    base = noAuthEmptyPathBase;
+    testResolve("s:", "..");
+    testResolve("s:", ".");
+    base = noAuthRelSinglePathBase;
+    testResolve("s:", "..");
+    testResolve("s:", ".");
+  }
 }
 
 void testResolvePath(String expected, String path) {
   Expect.equals(expected,
                 new Uri(path: '/').resolveUri(new Uri(path: path)).path);
   Expect.equals(
       "http://localhost$expected",
       Uri.parse("http://localhost").resolveUri(new Uri(path: path)).toString());
 }
 
@@ skipping 169 matching lines @@
     var char = UNRESERVED[i];
     var escape = "%" + char.codeUnitAt(0).toRadixString(16);  // all > 0xf.
 
     uri = Uri.parse("s://xX${escape}xX@yY${escape}yY/zZ${escape}zZ"
                     "?vV${escape}vV#wW${escape}wW");
     Expect.equals("xX${char}xX", uri.userInfo);
     Expect.equals("yY${char}yY".toLowerCase(), uri.host);
     Expect.equals("/zZ${char}zZ", uri.path);
     Expect.equals("vV${char}vV", uri.query);
     Expect.equals("wW${char}wW", uri.fragment);
+
+    uri = Uri.parse("s://yY${escape}yY/zZ${escape}zZ"
+                    "?vV${escape}vV#wW${escape}wW");
+    Expect.equals("yY${char}yY".toLowerCase(), uri.host);
+    Expect.equals("/zZ${char}zZ", uri.path);
+    Expect.equals("vV${char}vV", uri.query);
+    Expect.equals("wW${char}wW", uri.fragment);
   }
 
   // Escapes of reserved characters are kept, but upper-cased.
   for (var escape in ["%00", "%1f", "%7F", "%fF"]) {
     uri = Uri.parse("s://xX${escape}xX@yY${escape}yY/zZ${escape}zZ"
                     "?vV${escape}vV#wW${escape}wW");
     var normalizedEscape = escape.toUpperCase();
     Expect.equals("xX${normalizedEscape}xX", uri.userInfo);
     Expect.equals("yy${normalizedEscape}yy", uri.host);
     Expect.equals("/zZ${normalizedEscape}zZ", uri.path);
@@ skipping 46 matching lines @@
   Expect.equals("scheme:///?#", Uri.parse("scheme:///?#").toString());
   Expect.equals("scheme:///#",
                 new Uri(scheme: "scheme", host: "", path: "/",
                         query: "", fragment: "").toString());
 }
 
 void testReplace() {
   var uris = [
     Uri.parse(""),
     Uri.parse("a://@:/?#"),
+    Uri.parse("a://:/?#"),  // Parsed as simple URI.
     Uri.parse("a://b@c:4/e/f?g#h"),
+    Uri.parse("a://c:4/e/f?g#h"),  // Parsed as simple URI.
+    Uri.parse("$SCHEMECHAR://$REGNAMECHAR:$DIGIT/$PCHAR/$PCHAR"
+              "?$QUERYCHAR#$QUERYCHAR"),  // Parsed as simple URI.
     Uri.parse("$SCHEMECHAR://$USERINFOCHAR@$REGNAMECHAR:$DIGIT/$PCHAR/$PCHAR"
               "?$QUERYCHAR#$QUERYCHAR"),
   ];
   for (var uri1 in uris) {
     for (var uri2 in uris) {
       if (identical(uri1, uri2)) continue;
       var scheme = uri1.scheme;
       var userInfo = uri1.hasAuthority ? uri1.userInfo : "";
       var host = uri1.hasAuthority ? uri1.host : null;
       var port = uri1.hasAuthority ? uri1.port : 0;
@@ skipping 49 matching lines @@
   uri = uri.replace(fragment: "fragment");
   Expect.isFalse(uri.hasAuthority);
 
   uri = new Uri(scheme: "foo", path: "bar");
   uri = uri.replace(
       queryParameters: {"x": ["42", "37"], "y": ["43", "38"]});
   var params = uri.queryParametersAll;
   Expect.equals(2, params.length);
   Expect.listEquals(["42", "37"], params["x"]);
   Expect.listEquals(["43", "38"], params["y"]);
+
+  // Test replacing with empty strings.
+  uri = Uri.parse("s://a:1/b/c?d#e");
+  Expect.equals("s://a:1/b/c?d#", uri.replace(fragment: "").toString());
+  Expect.equals("s://a:1/b/c?#e", uri.replace(query: "").toString());
+  Expect.equals("s://a:1?d#e", uri.replace(path: "").toString());
+  Expect.equals("s://:1/b/c?d#e", uri.replace(host: "").toString());
 }
 
 main() {
   testUri("http:", true);
   testUri("file:///", true);
   testUri("file", false);
   testUri("http://user@example.com:8080/fisk?query=89&hest=silas", true);
   testUri("http://user@example.com:8080/fisk?query=89&hest=silas#fragment",
           false);
   Expect.stringEquals("http://user@example.com/a/b/c?query#fragment",
                       new Uri(
                           scheme: "http",
                           userInfo: "user",
                           host: "example.com",
                           port: 80,
                           path: "/a/b/c",
                           query: "query",
                           fragment: "fragment").toString());
   Expect.stringEquals("/a/b/c/",
                       new Uri(
                           scheme: null,
                           userInfo: null,
                           host: null,
                           port: 0,
                           path: "/a/b/c/",
                           query: null,
                           fragment: null).toString());
   Expect.stringEquals("file:///", Uri.parse("file:").toString());
+  Expect.stringEquals("file:///", Uri.parse("file:/").toString());
+  Expect.stringEquals("file:///", Uri.parse("file:").toString());
+  Expect.stringEquals("file:///foo", Uri.parse("file:foo").toString());
+  Expect.stringEquals("file:///foo", Uri.parse("file:/foo").toString());
+  Expect.stringEquals("file://foo/", Uri.parse("file://foo").toString());
 
   testResolvePath("/a/g", "/a/b/c/./../../g");
   testResolvePath("/a/g", "/a/b/c/./../../g");
   testResolvePath("/mid/6", "mid/content=5/../6");
   testResolvePath("/a/b/e", "a/b/c/d/../../e");
   testResolvePath("/a/b/e", "../a/b/c/d/../../e");
   testResolvePath("/a/b/e", "./a/b/c/d/../../e");
   testResolvePath("/a/b/e", "../a/b/./c/d/../../e");
   testResolvePath("/a/b/e", "./a/b/./c/d/../../e");
   testResolvePath("/a/b/e/", "./a/b/./c/d/../../e/.");
@@ skipping 127 matching lines @@
 String dump(Uri uri) {
   return "URI: $uri\n"
       "  Scheme:    ${uri.scheme} #${uri.scheme.length}\n"
       "  User-info: ${uri.userInfo} #${uri.userInfo.length}\n"
       "  Host:      ${uri.host} #${uri.host.length}\n"
       "  Port:      ${uri.port}\n"
       "  Path:      ${uri.path} #${uri.path.length}\n"
       "  Query:     ${uri.query} #${uri.query.length}\n"
       "  Fragment:  ${uri.fragment} #${uri.fragment.length}\n";
 }