Support new WG test suites.

- Support for json-ld-api tests.
- Future support for json-ld-framing tests.
- Use old json-ld.org framing tests.
- Update document loader to handle w3c URLs.

Author: davidlehn

CHANGELOG.md

@@ -1,5 +1,8 @@
 # jsonld ChangeLog
 
+### Changed
+- Use JSON-LD WG tests.
+
 ## 1.2.1 - 2018-12-11
 
 ### Fixed

README.md

@@ -344,6 +344,8 @@ that changes to the processor maintain the correct output.
 The main test suites are included in external repositories. Check out each of
 the following:
 
+    https://github.com/w3c/json-ld-api
+    https://github.com/w3c/json-ld-framing
     https://github.com/json-ld/json-ld.org
     https://github.com/json-ld/normalization
 

package.json

@@ -93,7 +93,10 @@
     "build": "npm run build-webpack && npm run build-node6",
     "build-webpack": "webpack",
     "build-node6": "babel --no-babelrc --out-dir dist/node6 --presets=node6-es6 lib/*.js lib/*/*.js",
-    "fetch-test-suites": "npm run fetch-json-ld-org-test-suite && npm run fetch-normalization-test-suite",
+    "fetch-test-suites": "npm run fetch-json-ld-wg-test-suite && npm run fetch-json-ld-org-test-suite && npm run fetch-normalization-test-suite",
+    "fetch-json-ld-wg-test-suite": "npm run fetch-json-ld-api-test-suite && npm run fetch-json-ld-framing-test-suite",
+    "fetch-json-ld-api-test-suite": "if [ ! -e test-suites/json-wg-api ]; then git clone --depth 1 https://github.com/w3c/json-ld-api.git test-suites/json-ld-api; fi",
+    "fetch-json-ld-framing-test-suite": "if [ ! -e test-suites/json-wg-framing ]; then git clone --depth 1 https://github.com/w3c/json-ld-framing.git test-suites/json-ld-framing; fi",
     "fetch-json-ld-org-test-suite": "if [ ! -e test-suites/json-ld.org ]; then git clone --depth 1 https://github.com/json-ld/json-ld.org.git test-suites/json-ld.org; fi",
     "fetch-normalization-test-suite": "if [ ! -e test-suites/normalization ]; then git clone --depth 1 https://github.com/json-ld/normalization.git test-suites/normalization; fi",
     "test": "cross-env NODE_ENV=test mocha --delay -t 30000 -A -R ${REPORTER:-spec} tests/test.js",

tests/test-common.js

@@ -674,8 +674,12 @@ function basename(filename) {
  * @return the document loader.
  */
 function createDocumentLoader(test) {
-  const _httpTestSuiteBase = 'http://json-ld.org/test-suite';
-  const _httpsTestSuiteBase = 'https://json-ld.org/test-suite';
+  const localBases = [
+    'http://json-ld.org/test-suite',
+    'https://json-ld.org/test-suite',
+    'https://w3c.github.io/json-ld-api/tests',
+    'https://w3c.github.io/json-ld-framing/tests'
+  ];
   const localLoader = function(url, callback) {
     // always load remote-doc tests remotely in node
     if(options.nodejs && test.manifest.name === 'Remote document') {
@@ -685,9 +689,9 @@ function createDocumentLoader(test) {
     // FIXME: this check only works for main test suite and will not work if:
     // - running other tests and main test suite not installed
     // - use other absolute URIs but want to load local files
-    const isTestSuite =
-      url.startsWith(_httpTestSuiteBase) ||
-      url.startsWith(_httpsTestSuiteBase);
+    const isTestSuite = localBases.some(function(base) {
+      return url.startsWith(base);
+    });
     // TODO: improve this check
     const isRelative = url.indexOf(':') === -1;
     if(isTestSuite || isRelative) {

tests/test-karma.js

@@ -52,10 +52,25 @@ if(process.env.JSONLD_TESTS) {
   const _top = process.env.TEST_ROOT_DIR;
   // TODO: support just adding certain entries in EARL mode?
 
-  // json-ld.org main test suite
+  // json-ld-api main test suite
   // FIXME: add path detection
-  entries.push(join(_top, 'test-suites/json-ld.org/test-suite'));
-  entries.push(join(_top, '../json-ld.org/test-suite'));
+  entries.push(join(_top, 'test-suites/json-ld-api/tests'));
+  entries.push(join(_top, '../json-ld-api/tests'));
+
+  /*
+  // json-ld-framing main test suite
+  // FIXME: add path detection
+  entries.push(join(_top, 'test-suites/json-ld-framing/tests'));
+  entries.push(join(_top, '../json-ld-framing/tests'));
+  */
+
+  // TODO: use json-ld-framing once tests are moved
+  // json-ld.org framing test suite
+  // FIXME: add path detection
+  entries.push(join(
+    _top, 'test-suites/json-ld.org/test-suite/tests/frame-manifest.jsonld'));
+  entries.push(join(
+    _top, '../json-ld.org/test-suite/tests/frame-manifests.jsonld'));
 
   // json-ld.org normalization test suite
   // FIXME: add path detection

tests/test.js

@@ -33,13 +33,36 @@ if(process.env.JSONLD_TESTS) {
 } else {
   const _top = path.resolve(__dirname, '..');
 
-  // json-ld.org main test suite
-  const orgPath = path.resolve(_top, 'test-suites/json-ld.org/test-suite');
-  if(fs.existsSync(orgPath)) {
-    entries.push(orgPath);
+  // json-ld-api main test suite
+  const apiPath = path.resolve(_top, 'test-suites/json-ld-api/tests');
+  if(fs.existsSync(apiPath)) {
+    entries.push(apiPath);
   } else {
     // default to sibling dir
-    entries.push(path.resolve(_top, '../json-ld.org/test-suite'));
+    entries.push(path.resolve(_top, '../json-ld-api/tests'));
+  }
+
+  /*
+  // json-ld-framing main test suite
+  const framingPath = path.resolve(_top, 'test-suites/json-ld-framing/tests');
+  if(fs.existsSync(framingPath)) {
+    entries.push(framingPath);
+  } else {
+    // default to sibling dir
+    entries.push(path.resolve(_top, '../json-ld-framing/tests'));
+  }
+  */
+
+  // TODO: use json-ld-framing once tests are moved
+  // json-ld.org framing test suite
+  const framingPath = path.resolve(
+    _top, 'test-suites/json-ld.org/test-suite/tests/frame-manifest.jsonld');
+  if(fs.existsSync(framingPath)) {
+    entries.push(framingPath);
+  } else {
+    // default to sibling dir
+    entries.push(path.resolve(
+      _top, '../json-ld.org/test-suite/tests/frame-manifest.jsonld'));
   }
 
   // json-ld.org normalization test suite