From 7375e2ceddd68884dc74fc50b5bf3db6f4b47d19 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 22 Apr 2016 14:33:15 +0200
Subject: [PATCH] Only test expected origin when it is present

https://github.com/w3c/web-platform-tests/pull/2584
---
 .../wpt/metadata/url/url-constructor.html.ini | 72 -------------------
 tests/wpt/web-platform-tests/url/a-element.js |  4 +-
 .../url/url-constructor.html                  |  4 +-
 3 files changed, 6 insertions(+), 74 deletions(-)

diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini
index f70364a8d03..06ca6a3b33f 100644
--- a/tests/wpt/metadata/url/url-constructor.html.ini
+++ b/tests/wpt/metadata/url/url-constructor.html.ini
@@ -1,76 +1,4 @@
 [url-constructor.html]
   type: testharness
-  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <file:c:\\foo\\bar.html> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <  File:c|////foo\\bar.html> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <C|/foo/bar> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: </C|\\foo\\bar> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <//C|/foo/bar> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <//> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <///> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <///test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <//server/file> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <\\\\server\\file> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: </\\server/file> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://localhost> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://localhost/> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://localhost/test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:...> against <http://www.example.com/test>]
-    expected: FAIL
-
-  [Parsing: <file:..> against <http://www.example.com/test>]
-    expected: FAIL
-
-  [Parsing: <file:a> against <http://www.example.com/test>]
-    expected: FAIL
-
   [Parsing: <h\tt\nt\rp://h\to\ns\rt:9\t0\n0\r0/p\ta\nt\rh?q\tu\ne\rry#f\tr\na\rg> against <about:blank>]
     expected: FAIL
diff --git a/tests/wpt/web-platform-tests/url/a-element.js b/tests/wpt/web-platform-tests/url/a-element.js
index 1d92c9d88ab..c77df5bf2ee 100644
--- a/tests/wpt/web-platform-tests/url/a-element.js
+++ b/tests/wpt/web-platform-tests/url/a-element.js
@@ -38,7 +38,9 @@ function runURLTests(urltests) {
       }
 
       assert_equals(url.href, expected.href, "href")
-      assert_equals(url.origin, expected.origin, "origin")
+      if ("origin" in expected) {
+        assert_equals(url.origin, expected.origin, "origin")
+      }
       assert_equals(url.protocol, expected.protocol, "protocol")
       assert_equals(url.username, expected.username, "username")
       assert_equals(url.password, expected.password, "password")
diff --git a/tests/wpt/web-platform-tests/url/url-constructor.html b/tests/wpt/web-platform-tests/url/url-constructor.html
index 80eb943aa16..f47fa358a06 100644
--- a/tests/wpt/web-platform-tests/url/url-constructor.html
+++ b/tests/wpt/web-platform-tests/url/url-constructor.html
@@ -38,7 +38,9 @@ function runURLTests(urltests) {
 
       var url = bURL(expected.input, expected.base)
       assert_equals(url.href, expected.href, "href")
-      assert_equals(url.origin, expected.origin, "origin")
+      if ("origin" in expected) {
+        assert_equals(url.origin, expected.origin, "origin")
+      }
       assert_equals(url.protocol, expected.protocol, "protocol")
       assert_equals(url.username, expected.username, "username")
       assert_equals(url.password, expected.password, "password")