Changed default Uri constructor to Uri.fromComponents(), new default constructor is Uri.fromString(…

dart/tests/utils/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('../../lib/utf/utf.dart');
 #import('../../lib/uri/uri.dart');
 
 testUri(String uri, bool isAbsolute) {
   Expect.equals(isAbsolute, new Uri.fromString(uri).isAbsolute());
+  Expect.equals(isAbsolute, new Uri(uri).isAbsolute());
   Expect.stringEquals(uri, new Uri.fromString(uri).toString());
+  Expect.stringEquals(uri, new Uri(uri).toString());
 }
 
 testEncodeDecode(String orig, String encoded) {
   var e = encodeUri(orig);
   Expect.stringEquals(encoded, e);
   var d = decodeUri(encoded);
   Expect.stringEquals(orig, d);
 }
 
 testEncodeDecodeComponent(String orig, String encoded) {
   var e = encodeUriComponent(orig);
   Expect.stringEquals(encoded, e);
   var d = decodeUriComponent(encoded);
   Expect.stringEquals(orig, d);
 }
 
-main() {
-  testUri("http:", true);
-  testUri("file://", true);
-  testUri("file", false);
-  testUri("http://user@example.com:80/fisk?query=89&hest=silas", true);
-  testUri("http://user@example.com:80/fisk?query=89&hest=silas#fragment",
-          false);
-  Expect.stringEquals("http://user@example.com:80/a/b/c?query#fragment",
-                      const Uri("http", "user", "example.com", 80, "/a/b/c",
-                                "query", "fragment").toString());
-  Expect.stringEquals("null://null@null/a/b/c/?null#null",
-                      const Uri(null, null, null, 0, "/a/b/c/",
-                                null, null).toString());
-  Expect.stringEquals("file://", new Uri.fromString("file:").toString());
-  Expect.stringEquals("/a/g", removeDotSegments("/a/b/c/./../../g"));
-  Expect.stringEquals("mid/6", removeDotSegments("mid/content=5/../6"));
-  Expect.stringEquals("a/b/e", removeDotSegments("a/b/c/d/../../e"));
-  Expect.stringEquals("a/b/e", removeDotSegments("../a/b/c/d/../../e"));
-  Expect.stringEquals("a/b/e", removeDotSegments("./a/b/c/d/../../e"));
-  Expect.stringEquals("a/b/e", removeDotSegments("../a/b/./c/d/../../e"));
-  Expect.stringEquals("a/b/e", removeDotSegments("./a/b/./c/d/../../e"));
-  Expect.stringEquals("a/b/e/", removeDotSegments("./a/b/./c/d/../../e/."));
-  Expect.stringEquals("a/b/e/", removeDotSegments("./a/b/./c/d/../../e/./."));
-  Expect.stringEquals("a/b/e/", removeDotSegments("./a/b/./c/d/../../e/././."));
-
+testUriPerRFCs(URI base) {
   // From RFC 3986.
-  Uri base = new Uri.fromString("http://a/b/c/d;p?q");
   Expect.stringEquals("g:h", base.resolve("g:h").toString());
   Expect.stringEquals("http://a/b/c/g", base.resolve("g").toString());
   Expect.stringEquals("http://a/b/c/g", base.resolve("./g").toString());
   Expect.stringEquals("http://a/b/c/g/", base.resolve("g/").toString());
   Expect.stringEquals("http://a/g", base.resolve("/g").toString());
   Expect.stringEquals("http://g", base.resolve("//g").toString());
   Expect.stringEquals("http://a/b/c/d;p?y", base.resolve("?y").toString());
   Expect.stringEquals("http://a/b/c/g?y", base.resolve("g?y").toString());
   Expect.stringEquals("http://a/b/c/d;p?q#s", base.resolve("#s").toString());
   Expect.stringEquals("http://a/b/c/g#s", base.resolve("g#s").toString());
@@ skipping 32 matching lines @@
                       base.resolve("g?y/../x").toString());
   Expect.stringEquals("http://a/b/c/g#s/./x",
                       base.resolve("g#s/./x").toString());
   Expect.stringEquals("http://a/b/c/g#s/../x",
                       base.resolve("g#s/../x").toString());
   Expect.stringEquals("http:g", base.resolve("http:g").toString());
 
   // Additional tests (not from RFC 3986).
   Expect.stringEquals("http://a/b/g;p/h;s",
                       base.resolve("../g;p/h;s").toString());
+}
+
+main() {
+  testUri("http:", true);
+  testUri("file://", true);
+  testUri("file", false);
+  testUri("http://user@example.com:80/fisk?query=89&hest=silas", true);
+  testUri("http://user@example.com:80/fisk?query=89&hest=silas#fragment",
+          false);
+  Expect.stringEquals("http://user@example.com:80/a/b/c?query#fragment",
+                      const Uri.fromComponents(
+                          "http", "user", "example.com", 80, "/a/b/c",
+                          "query", "fragment").toString());
+  Expect.stringEquals("null://null@null/a/b/c/?null#null",
+                      const Uri.fromComponents(
+                          null, null, null, 0, "/a/b/c/",
+                          null, null).toString());
+  Expect.stringEquals("file://", new Uri.fromString("file:").toString());
+  Expect.stringEquals("file://", new Uri("file:").toString());
+  Expect.stringEquals("/a/g", removeDotSegments("/a/b/c/./../../g"));
+  Expect.stringEquals("mid/6", removeDotSegments("mid/content=5/../6"));
+  Expect.stringEquals("a/b/e", removeDotSegments("a/b/c/d/../../e"));
+  Expect.stringEquals("a/b/e", removeDotSegments("../a/b/c/d/../../e"));
+  Expect.stringEquals("a/b/e", removeDotSegments("./a/b/c/d/../../e"));
+  Expect.stringEquals("a/b/e", removeDotSegments("../a/b/./c/d/../../e"));
+  Expect.stringEquals("a/b/e", removeDotSegments("./a/b/./c/d/../../e"));
+  Expect.stringEquals("a/b/e/", removeDotSegments("./a/b/./c/d/../../e/."));
+  Expect.stringEquals("a/b/e/", removeDotSegments("./a/b/./c/d/../../e/./."));
+  Expect.stringEquals("a/b/e/", removeDotSegments("./a/b/./c/d/../../e/././."));
+
+  final urisSample = "http://a/b/c/d;p?q";
+  Uri baseFromString = new Uri.fromString(urisSample);
+  testUriPerRFCs(baseFromString);
+  Uri base = new Uri(urisSample);
+  testUriPerRFCs(base);
 
   // URI encode tests
   // Note: dart2js won't handle '\ud800\udc00' and frog
   // won't handle '\u{10000}'. So we cons this up synthetically...
   var s = decodeUtf8([0xf0, 0x90, 0x80, 0x80]);
   
   testEncodeDecode("\uFFFE", "%EF%BF%BE");
   testEncodeDecode("\uFFFF", "%EF%BF%BF");
   testEncodeDecode("\uFFFE", "%EF%BF%BE");
   testEncodeDecode("\uFFFF", "%EF%BF%BF");
   testEncodeDecode("\x7f", "%7F");
   testEncodeDecode("\x80", "%C2%80");
   testEncodeDecode("\u0800", "%E0%A0%80");
   testEncodeDecode(":/@',;?&=+\$", ":/@',;?&=+\$");
   testEncodeDecode(s, "%F0%90%80%80");
   testEncodeDecodeComponent("\uFFFE", "%EF%BF%BE");
   testEncodeDecodeComponent("\uFFFF", "%EF%BF%BF");
   testEncodeDecodeComponent("\uFFFE", "%EF%BF%BE");
   testEncodeDecodeComponent("\uFFFF", "%EF%BF%BF");
   testEncodeDecodeComponent("\x7f", "%7F");
   testEncodeDecodeComponent("\x80", "%C2%80");
   testEncodeDecodeComponent("\u0800", "%E0%A0%80");
   testEncodeDecodeComponent(":/@',;?&=+\$", "%3A%2F%40'%2C%3B%3F%26%3D%2B%24");
   testEncodeDecodeComponent(s, "%F0%90%80%80");
 }