Bug 971742 - Re-balance test_URIs and test_URIs2. r=jesup, a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Thu, 28 May 2015 12:06:44 -0600
changeset 266135 a6202870af6a
parent 266134 4b3a7292ddad
child 266136 9da96ad2ba0f
push id4764
push userryanvm@gmail.com
push date2015-05-29 14:57 +0000
treeherdermozilla-beta@ceac3b53900f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, test-only
bugs971742
milestone39.0
Bug 971742 - Re-balance test_URIs and test_URIs2. r=jesup, a=test-only
netwerk/test/unit/test_URIs.js
netwerk/test/unit/test_URIs2.js
--- a/netwerk/test/unit/test_URIs.js
+++ b/netwerk/test/unit/test_URIs.js
@@ -242,47 +242,16 @@ var gTests = [
     ref:     "",
     nsIURL:  true, nsINestedURI: false },
   { spec:    "resource://gre/components/",
     scheme:  "resource",
     prePath: "resource://gre",
     path:    "/components/",
     ref:     "",
     nsIURL:  true, nsINestedURI: false },
-  { spec:    "view-source:about:blank",
-    scheme:  "view-source",
-    prePath: "view-source:",
-    path:    "about:blank",
-    ref:     "",
-    nsIURL:  false, nsINestedURI: true, immutable: true },
-  { spec:    "view-source:http://www.mozilla.org/",
-    scheme:  "view-source",
-    prePath: "view-source:",
-    path:    "http://www.mozilla.org/",
-    ref:     "",
-    nsIURL:  false, nsINestedURI: true, immutable: true },
-  { spec:    "x-external:",
-    scheme:  "x-external",
-    prePath: "x-external:",
-    path:    "",
-    ref:     "",
-    nsIURL:  false, nsINestedURI: false },
-  { spec:    "x-external:abc",
-    scheme:  "x-external",
-    prePath: "x-external:",
-    path:    "abc",
-    ref:     "",
-    nsIURL:  false, nsINestedURI: false },
-  { spec:    "http://www2.example.com/",
-    relativeURI: "a/b/c/d",
-    scheme:  "http",
-    prePath: "http://www2.example.com",
-    path:    "/a/b/c/d",
-    ref:     "",
-    nsIURL:  true, nsINestedURI: false },
 
     // Adding more? Consider adding to test_URIs2.js instead, so that neither
     // test runs for *too* long, risking timeouts on slow platforms.
 ];
 
 var gHashSuffixes = [
   "#",
   "#myRef",
--- a/netwerk/test/unit/test_URIs2.js
+++ b/netwerk/test/unit/test_URIs2.js
@@ -15,16 +15,47 @@ var gIoService = Components.classes["@mo
 
 // Relevant RFCs: 1738, 1808, 2396, 3986 (newer than the code)
 // http://greenbytes.de/tech/webdav/rfc3986.html#rfc.section.5.4
 // http://greenbytes.de/tech/tc/uris/
 
 // TEST DATA
 // ---------
 var gTests = [
+  { spec:    "view-source:about:blank",
+    scheme:  "view-source",
+    prePath: "view-source:",
+    path:    "about:blank",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: true, immutable: true },
+  { spec:    "view-source:http://www.mozilla.org/",
+    scheme:  "view-source",
+    prePath: "view-source:",
+    path:    "http://www.mozilla.org/",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: true, immutable: true },
+  { spec:    "x-external:",
+    scheme:  "x-external",
+    prePath: "x-external:",
+    path:    "",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: false },
+  { spec:    "x-external:abc",
+    scheme:  "x-external",
+    prePath: "x-external:",
+    path:    "abc",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: false },
+  { spec:    "http://www2.example.com/",
+    relativeURI: "a/b/c/d",
+    scheme:  "http",
+    prePath: "http://www2.example.com",
+    path:    "/a/b/c/d",
+    ref:     "",
+    nsIURL:  true, nsINestedURI: false },
   // relative URL testcases from http://greenbytes.de/tech/webdav/rfc3986.html#rfc.section.5.4
   { spec:    "http://a/b/c/d;p?q",
     relativeURI: "g:h",
     scheme:  "g",
     prePath: "g:",
     path:    "h",
     ref:     "",
     nsIURL:  false, nsINestedURI: false },