Added origin property to Uri class Added unit test coverage for origin property

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) {
@@ skipping 88 matching lines @@
   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());
 
+  Expect.stringEquals(
+      "http://example.com", 
+      new Uri.fromString("http://example.com/a/b/c").origin);
+  Expect.stringEquals(
+      "https://example.com", 
+      new Uri.fromString("https://example.com/a/b/c").origin);
+  Expect.stringEquals(
+      "http://example.com:1234", 
+      new Uri.fromString("http://example.com:1234/a/b/c").origin);
+  Expect.stringEquals(
+      "https://example.com:1234", 
+      new Uri.fromString("https://example.com:1234/a/b/c").origin);
+  Expect.throws(
+      () => new Uri.fromString("http:").origin,
+      (e) { return e is IllegalArgumentException; },
+      "origin for uri with empty domain should fail");
+  Expect.throws(
+      () => const Uri("http", null, "", 80, "/a/b/c",

[ahe, 2012/08/21 20:36:28]

You probably need to update this to use fromComponents.

+                       "query", "fragment").origin,
+      (e) { return e is IllegalArgumentException; },
+      "origin for uri with empty domain should fail");
+  Expect.throws(
+      () => const Uri(null, null, "", 80, "/a/b/c",
+                       "query", "fragment").origin,
+      (e) { return e is IllegalArgumentException; },
+      "origin for uri with empty scheme should fail");
+  Expect.throws(
+      () => const Uri("http", null, null, 80, "/a/b/c",
+                       "query", "fragment").origin,
+      (e) { return e is IllegalArgumentException; },
+      "origin for uri with empty domain should fail");
+  Expect.throws(
+      () => new Uri.fromString("http://:80").origin,
+      (e) { return e is IllegalArgumentException; },
+      "origin for uri with empty domain should fail");
+  Expect.throws(
+      () => new Uri.fromString("file://localhost/test.txt").origin,
+      (e) { return e is IllegalArgumentException; },
+      "origin for non-http/https uri should fail");
+
   // 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");
 }