test: use URL fixtures under test/fixtures/wpt/url/resources

joyeecheung · BridgeAR · commit c973551ecaff · 2018-11-13T23:41:50.000+01:00
Removes the following files: - test/fixtures/url-tests.js - test/fixtures/url-setter-tests.js - test/fixtures/url-toascii.js in favor of: - test/fixtures/wpt/url/resources/urltestdata.json - test/fixtures/wpt/url/resources/setters_tests.json - test/fixtures/wpt/url/resources/toascii.json Also removes dependency of `fixtures/url-tests.js` in http2 tests and use `fixtures/person-large.jpg` instead since they are just looking for a big enough file to transfer. PR-URL: #24035 Refs: #23192 Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
diff --git a/test/fixtures/url-setter-tests.js b/test/fixtures/url-setter-tests.js
diff --git a/test/fixtures/url-tests.js b/test/fixtures/url-tests.js
diff --git a/test/fixtures/url-toascii.js b/test/fixtures/url-toascii.js
diff --git a/test/known_issues/test-url-parse-conformance.js b/test/known_issues/test-url-parse-conformance.js
@@ -5,7 +5,9 @@ require('../common');
 const url = require('url');
 const assert = require('assert');
 const fixtures = require('../common/fixtures');
-const tests = require(fixtures.path('url-tests'));
+const tests = require(
+ fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
+);
 
 let failed = 0;
 let attempted = 0;
diff --git a/test/parallel/test-http2-compat-serverrequest-pipe.js b/test/parallel/test-http2-compat-serverrequest-pipe.js
@@ -13,7 +13,7 @@ const path = require('path');
 
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
-const loc = fixtures.path('url-tests.js');
+const loc = fixtures.path('person-large.jpg');
 const fn = path.join(tmpdir.path, 'http2-url-tests.js');
 
 const server = http2.createServer();
diff --git a/test/parallel/test-http2-pipe-named-pipe.js b/test/parallel/test-http2-pipe-named-pipe.js
@@ -14,7 +14,7 @@ const path = require('path');
 
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
-const loc = fixtures.path('url-tests.js');
+const loc = fixtures.path('person-large.jpg');
 const fn = path.join(tmpdir.path, 'http2-url-tests.js');
 
 const server = http2.createServer();
diff --git a/test/parallel/test-http2-pipe.js b/test/parallel/test-http2-pipe.js
@@ -13,7 +13,7 @@ const path = require('path');
 
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
-const loc = fixtures.path('url-tests.js');
+const loc = fixtures.path('person-large.jpg');
 const fn = path.join(tmpdir.path, 'http2-url-tests.js');
 
 const server = http2.createServer();
diff --git a/test/parallel/test-icu-punycode.js b/test/parallel/test-icu-punycode.js
@@ -10,7 +10,10 @@ const icu = internalBinding('icu');
 const assert = require('assert');
 
 const tests = require('../fixtures/url-idna.js');
-const wptToASCIITests = require('../fixtures/url-toascii.js');
+const fixtures = require('../common/fixtures');
+const wptToASCIITests = require(
+ fixtures.path('wpt', 'url', 'resources', 'toascii.json')
+);
 
 {
 for (const [i, { ascii, unicode }] of tests.entries()) {
diff --git a/test/parallel/test-whatwg-url-constructor.js b/test/parallel/test-whatwg-url-constructor.js
@@ -11,7 +11,9 @@ const { test, assert_equals, assert_true, assert_throws } =
 require('../common/wpt');
 
 const request = {
- response: require(fixtures.path('url-tests'))
+ response: require(
+ fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
+ )
 };
 
 /* The following tests are copied from WPT. Modifications to them should be
diff --git a/test/parallel/test-whatwg-url-custom-domainto.js b/test/parallel/test-whatwg-url-custom-domainto.js
@@ -11,7 +11,10 @@ const assert = require('assert');
 const { domainToASCII, domainToUnicode } = require('url');
 
 const tests = require('../fixtures/url-idna');
-const wptToASCIITests = require('../fixtures/url-toascii');
+const fixtures = require('../common/fixtures');
+const wptToASCIITests = require(
+ fixtures.path('wpt', 'url', 'resources', 'toascii.json')
+);
 
 {
 const expectedError = common.expectsError(
diff --git a/test/parallel/test-whatwg-url-custom-parsing.js b/test/parallel/test-whatwg-url-custom-parsing.js
@@ -12,7 +12,9 @@ const URL = require('url').URL;
 const assert = require('assert');
 const fixtures = require('../common/fixtures');
 
-const tests = require(fixtures.path('url-tests'));
+const tests = require(
+ fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
+);
 
 const originalFailures = tests.filter((test) => test.failure);
 
diff --git a/test/parallel/test-whatwg-url-origin.js b/test/parallel/test-whatwg-url-origin.js
@@ -10,7 +10,9 @@ const URL = require('url').URL;
 const { test, assert_equals } = require('../common/wpt');
 
 const request = {
- response: require(fixtures.path('url-tests'))
+ response: require(
+ fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
+ )
 };
 
 /* The following tests are copied from WPT. Modifications to them should be
diff --git a/test/parallel/test-whatwg-url-setters.js b/test/parallel/test-whatwg-url-setters.js
@@ -11,7 +11,9 @@ const { test, assert_equals } = require('../common/wpt');
 const fixtures = require('../common/fixtures');
 
 const request = {
- response: require(fixtures.path('url-setter-tests'))
+ response: require(fixtures.path(
+ 'wpt', 'url', 'resources', 'setters_tests.json'
+ ))
 };
 
 /* The following tests are copied from WPT. Modifications to them should be
diff --git a/test/parallel/test-whatwg-url-toascii.js b/test/parallel/test-whatwg-url-toascii.js
@@ -10,7 +10,9 @@ const { URL } = require('url');
 const { test, assert_equals, assert_throws } = require('../common/wpt');
 
 const request = {
- response: require(fixtures.path('url-toascii'))
+ response: require(
+ fixtures.path('wpt', 'url', 'resources', 'toascii.json')
+ )
 };
 
 /* The following tests are copied from WPT. Modifications to them should be

-Original file line number
+Diff line change
 consturl=require('url');
 constassert=require('assert');
 constfixtures=require('../common/fixtures');
 -consttests=require(fixtures.path('url-tests'));
 +consttests=require(
 +fixtures.path('wpt','url','resources','urltestdata.json')
 +);
 letfailed=0;
 letattempted=0;
-Original file line number
+Diff line change
 consttmpdir=require('../common/tmpdir');
 tmpdir.refresh();
 -constloc=fixtures.path('url-tests.js');
 +constloc=fixtures.path('person-large.jpg');
 constfn=path.join(tmpdir.path,'http2-url-tests.js');
 constserver=http2.createServer();
-Original file line number
+Diff line change
 constassert=require('assert');
 consttests=require('../fixtures/url-idna.js');
 -constwptToASCIITests=require('../fixtures/url-toascii.js');
 +constfixtures=require('../common/fixtures');
 +constwptToASCIITests=require(
 +fixtures.path('wpt','url','resources','toascii.json')
 +);
+{
 for(const[i,{ ascii, unicode }]oftests.entries()){