run docker properly

Author: gabe

implementations/index.js

@@ -30,7 +30,3 @@ export const implementationsWhichSupportVersionAndType = ({
   }
   return matchingImpls;
 };
-
-export const containerNameForImplementation = (implementation) => {
-  return implementations.findLast((i) => i.name === implementation).docker_image;
-};

implementations/sample.json

@@ -1,18 +1,9 @@
 {
-  "name": "sample",
-  "docker_image": "sample-image:latest",
+  "name": "tbd",
   "specs": {
     "2020-12": [
       "JsonSchema",
       "JsonSchemaCredential"
-    ],
-    "2019-09": [
-      "JsonSchema",
-      "JsonSchemaCredential"
-    ],
-    "Draft-7": [
-      "JsonSchema",
-      "JsonSchemaCredential"
     ]
   }
 }

package-lock.json

@@ -31,6 +31,11 @@
   "bugs": {
     "url": "https://github.com/w3c/vc-json-schema-test-suite/issues"
   },
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "node"
+  },
   "dependencies": {
     "@digitalbazaar/did-method-key": "^5.1.0",
     "@digitalbazaar/ecdsa-multikey": "^1.1.3",
@@ -41,6 +46,7 @@
     "base58-universal": "^2.0.0",
     "chai": "^4.3.7",
     "data-integrity-test-suite-assertion": "github:w3c-ccg/data-integrity-test-suite-assertion",
+    "jsh": "^0.43.0",
     "jsonld-document-loader": "^2.0.0",
     "klona": "^2.0.6",
     "mocha": "^10.2.0",

package.json

@@ -114,22 +114,22 @@
     <section class="informative" id="conformance-testing-results">
       <h2> Conformance Testing Results </h2>
       <p>
-      Tests passed 30/33 90%
+      Tests passed 10/11 90%
       </p>
       <p>
-      Tests failed 3/33 10%
+      Tests failed 1/11 10%
       </p>
       <p>
-      Failures 3
+      Failures 1
       </p>
       <p>
       Tests skipped 0
       </p>
       <p>
-      Total tests 33
+      Total tests 11
       </p>
       <p>
-        These tests were run on <time>24 August 2023 at 4:19 pm UTC</time>
+        These tests were run on <time>24 August 2023 at 4:56 pm UTC</time>
       </p>
       <section class="informative" id="Key">
         <h3>Key</h3>

reports/index.html

@@ -7,7 +7,7 @@ import {generateTestResult, checkTestResult, TestResult} from './testutil.js';
 const schemaVersions = Object.keys(JsonSchemaVersions);
 schemaVersions.forEach((schemaVersion) => {
   const schemaVersionName = JsonSchemaVersions[schemaVersion];
-  describe(`JSON Schema ${schemaVersionName.name} - JsonSchema`, function() {
+  describe(`JSON Schema ${schemaVersionName} - JsonSchema`, function() {
     const impls = implementationsWhichSupportVersionAndType(
         {version: schemaVersionName, type: VcJsonSchemaTypes.JsonSchema});
     const implNames = impls.map((i) => i.name);

tests/jsonschema.spec.js

@@ -1,6 +1,5 @@
-import shell from 'shelljs';
 import * as fs from 'fs';
-import {containerNameForImplementation} from '../implementations/index.js';
+import shell from 'shelljs';
 
 /**
  * Generate test results for a given implementation by calling its docker container with specific inputs
@@ -12,28 +11,23 @@ import {containerNameForImplementation} from '../implementations/index.js';
  */
 export async function generateTestResult(impl, jsonSchemaVersion, jsonSchemaType, testNumber) {
   const schemaType = jsonSchemaType.toLowerCase();
-  const containerName = containerNameForImplementation(impl);
   const schemaFile = `${testNumber}-schema.json`;
   const credentialFile = `${testNumber}-credential.json`;
   const outputFile = `${testNumber}-${impl}.json`;
 
   const command = `
-IMPLEMENTATION=${containerName}
-FORMAT=${schemaType}
-SCHEMA=/tests/input/${schemaType}/${jsonSchemaVersion}/${schemaFile}
-CREDENTIAL=/tests/input/${schemaType}/${jsonSchemaVersion}/${credentialFile}
-OUTPUT=/tests/input/${schemaType}/${jsonSchemaVersion}/${outputFile}
-
-docker-compose run -d $IMPLEMENTATION \
+docker-compose -f ./implementations/docker-compose.yml \
+run -d ${impl} \
 validate \
---format $FORMAT \
---schema $SCHEMA \
---credential $CREDENTIAL \
---output $OUTPUT
+--format ${jsonSchemaType} \
+--schema /tests/input/${schemaType}/${jsonSchemaVersion}/${schemaFile} \
+--credential /tests/input/${schemaType}/${jsonSchemaVersion}/${credentialFile} \
+--output /tests/output/${schemaType}/${jsonSchemaVersion}/${outputFile}
 `;
 
   console.log(`${command}`);
-  const {code, stdout} = shell.exec(command, {silent: true});
+  shell.set('-e');
+  const {code, stdout} = shell.exec(command, {silent: false});
   if (code !== 0) {
     console.warn(stdout);
   }