Attempting to resolve unit tests

Signed-off-by: Steve Springett <steve@springett.us>

Author: stevespringett

tools/src/test/js/json-schema-functional-tests.js

@@ -44,9 +44,10 @@ console.debug('DEBUG | testdataDir = ', testdataDir);
 
 // region validator
 
-const [spdxSchema, jsfSchema, bomSchema] = await Promise.all([
+const [spdxSchema, jsfSchema, cryptoDefsSchema, bomSchema] = await Promise.all([
     readFile(join(schemaDir, 'spdx.schema.json'), 'utf-8').then(JSON.parse),
     readFile(join(schemaDir, 'jsf-0.82.schema.json'), 'utf-8').then(JSON.parse),
+    readFile(join(schemaDir, 'cryptography-defs.schema.json'), 'utf-8').then(JSON.parse),
     readFile(schemaFile, 'utf-8').then(JSON.parse)
 ])
 
@@ -57,7 +58,8 @@ const ajv = new Ajv({
     addUsedSchema: false,
     schemas: {
         'http://cyclonedx.org/schema/spdx.schema.json': spdxSchema,
-        'http://cyclonedx.org/schema/jsf-0.82.schema.json': jsfSchema
+        'http://cyclonedx.org/schema/jsf-0.82.schema.json': jsfSchema,
+        'http://cyclonedx.org/schema/cryptography-defs.schema.json': cryptoDefsSchema
     }
 });
 addFormats(ajv)

tools/src/test/js/json-schema-lint-tests.js

@@ -17,9 +17,10 @@ const schemaDir = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..'
 
 // endregion config
 
-const [spdxSchema, jsfSchema, bomSchemas] = await Promise.all([
+const [spdxSchema, jsfSchema, cryptoDefsSchema, bomSchemas] = await Promise.all([
     readFile(join(schemaDir, 'spdx.schema.json'), 'utf-8').then(JSON.parse),
     readFile(join(schemaDir, 'jsf-0.82.schema.json'), 'utf-8').then(JSON.parse),
+    readFile(join(schemaDir, 'cryptography-defs.schema.json'), 'utf-8').then(JSON.parse),
     glob(join(schemaDir, bomSchemasGlob)).then(l => l.sort())
 ])
 assert.notStrictEqual(bomSchemas.length, 0)
@@ -53,7 +54,8 @@ function getAjv(strict) {
         keywords: ["meta:enum"],
         schemas: {
             'http://cyclonedx.org/schema/spdx.schema.json': spdxSchema,
-            'http://cyclonedx.org/schema/jsf-0.82.schema.json': jsfSchema
+            'http://cyclonedx.org/schema/jsf-0.82.schema.json': jsfSchema,
+            'http://cyclonedx.org/schema/cryptography-defs.schema.json': cryptoDefsSchema
         }
     });
     addFormats(ajv)