Bug 652186 - Fix tests involving URL backslash replacement r=bz

MozReview-Commit-ID: JgWFkJN7Mtc

--HG--
extra : rebase_source : 177a7884009a4b27d83f41fc5f1dd0d14e8c0421

docshell/test/unit/test_nsDefaultURIFixup_info.js

@@ -471,6 +471,13 @@ var testcases = [ {
     fixedURI: "http://mozilla/foo",
     alternateURI: "http://www.mozilla.com/foo",
     protocolChange: true,
+  }, {
+    input: "mozilla\\",
+    fixedURI: "http://mozilla/",
+    alternateURI: "http://www.mozilla.com/",
+    keywordLookup: true,
+    protocolChange: true,
+    affectedByDNSForSingleHosts: true,
   }];
 
 if (Services.appinfo.OS.toLowerCase().startsWith("win")) {
@@ -485,12 +492,6 @@ if (Services.appinfo.OS.toLowerCase().startsWith("win")) {
     alternateURI: "http://www.mozilla.com/",
     protocolChange: true,
   });
-  testcases.push({
-    input: "mozilla\\",
-    fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
-    protocolChange: true,
-  });
 } else {
   testcases.push({
     input: "/some/file.txt",
@@ -502,15 +503,6 @@ if (Services.appinfo.OS.toLowerCase().startsWith("win")) {
     fixedURI: "file:////mozilla",
     protocolChange: true,
   });
-  // \ is an invalid character in the hostname until bug 652186 is implemented
-  testcases.push({
-    input: "mozilla\\",
-    // fixedURI: "http://mozilla\\/",
-    // alternateURI: "http://www.mozilla/",
-    keywordLookup: true,
-    protocolChange: true,
-    // affectedByDNSForSingleHosts: true,
-  });
 }
 
 function sanitize(input) {

dom/base/test/test_url.html

@@ -361,5 +361,31 @@
     URL.revokeObjectURL('blob:something');
     ok(true, "This should not throw.");
   </script>
+
+  <script>
+    var base = new URL("http:\\\\test.com\\path/to\\file?query\\backslash#hash\\");
+    is(base.href, "http://test.com/path/to/file?query\\backslash#hash\\");
+
+    var url = new URL("..\\", base);
+    is(url.href, "http://test.com/path/");
+
+    url = new URL("\\test", base);
+    is(url.href, "http://test.com/test");
+
+    url = new URL("\\test\\", base);
+    is(url.href, "http://test.com/test/");
+
+    url = new URL("http://example.org/test", base);
+    is(url.href, "http://example.org/test");
+
+    url = new URL("ftp://tmp/test", base);
+    is(url.href, "ftp://tmp/test");
+
+    url = new URL("ftp:\\\\tmp\\test", base);
+    is(url.href, "ftp://tmp/test");
+
+    url = new URL("scheme://tmp\\test", base);
+    is(url.href, "scheme://tmp\\test");
+  </script>
 </body>
 </html>