From fba061abd3421c151f2f983e7b8ccdec2fdf831c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sat, 16 Nov 2024 15:55:20 +0100 Subject: [PATCH] tests: prefix suites (#1174) Signed-off-by: Jan Kowalleck --- tests/functional/Enums.ComponentScope.spec.js | 2 +- tests/functional/Enums.ComponentType.spec.js | 2 +- tests/functional/Enums.ExternalReferenceType.spec.js | 2 +- tests/functional/Enums.HashAlogorithms.spec.js | 2 +- tests/functional/Enums.LicenseAcknowledgement.spec.js | 2 +- tests/functional/Enums.LifecyclePhase.spec.js | 2 +- tests/functional/Enums.Vulnerability.AffectStatus.spec.js | 2 +- .../Enums.Vulnerability.AnalysisJustification.spec.js | 2 +- tests/functional/Enums.Vulnerability.AnalysisResponse.spec.js | 2 +- tests/functional/Enums.Vulnerability.AnalysisState.spec.js | 2 +- tests/functional/Enums.Vulnerability.RatingMethod.spec.js | 2 +- tests/functional/Enums.Vulnerability.Severity.spec.js | 2 +- tests/functional/Resources.node.spec.js | 2 +- tests/functional/SPDX.spec.js | 4 ++-- tests/functional/Spec.SpecVersionDict.spec.js | 2 +- tests/functional/Validation.JsonValidator.node.spec.js | 4 ++-- tests/functional/Validation.XmlValidator.node.spec.js | 2 +- tests/functional/helpers.sortable.spec.js | 2 +- .../OpPlug.node.jsonValidator.implementation.spec.js | 2 +- tests/functional/internals/OpPlug.node.jsonValidator.spec.js | 2 +- .../internals/OpPlug.node.xmlStringify.implementation.spec.js | 2 +- tests/functional/internals/OpPlug.node.xmlStringify.spec.js | 2 +- .../internals/OpPlug.node.xmlValidator.implementation.spec.js | 2 +- tests/functional/internals/OpPlug.node.xmlValidator.spec.js | 2 +- tests/functional/packageManifestExports.node.spec.js | 2 +- .../Builders.FromNodePackageJson.ComponentBuilder.test.js | 2 +- .../Builders.FromNodePackageJson.ToolBuilders.test.js | 2 +- ...ories.FromNodePackageJson.ExternalReferenceFactory.test.js | 2 +- .../Factories.FromNodePackageJson.PackageUrlFactory.test.js | 2 +- tests/integration/Factories.LicenseFactory.test.js | 2 +- tests/integration/Factories.PackageUrlFactory.test.js | 2 +- tests/integration/Serialize.JsonNormalize.test.js | 2 +- tests/integration/Serialize.JsonSerialize.test.js | 2 +- tests/integration/Serialize.XmlNormalize.test.js | 2 +- tests/integration/Serialize.XmlSerialize.test.js | 2 +- tests/integration/Validation.JsonStrictValidator.test.js | 2 +- tests/integration/Validation.JsonValidator.test.js | 2 +- tests/integration/Validation.XmlValidator.test.js | 2 +- .../Builders.FromNodePackageJson.ComponentBuilder.spec.js | 2 +- tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js | 2 +- tests/unit/Factories.FromNodePackageJson.PackageUrlFactory.js | 2 +- tests/unit/Factories.PackageUrlFactory.spec.js | 2 +- tests/unit/Models.Bom.spec.js | 2 +- tests/unit/Models.Component.spec.js | 2 +- tests/unit/Models.Vulnerability.Vulnerability.spec.js | 2 +- tests/unit/Models.bomLink.spec.js | 2 +- tests/unit/SPDX.spec.js | 4 ++-- tests/unit/Serialize.BomRefDiscriminator.spec.js | 2 +- tests/unit/Serialize.JsonSerializer.spec.js | 2 +- tests/unit/Serialize.XML._xsd.spec.js | 2 +- tests/unit/Serialize.XmlBaseSerializer.spec.js | 2 +- tests/unit/Serialize.XmlSerializer.spec.js | 2 +- tests/unit/Types.cpe.spec.js | 2 +- tests/unit/Utils.BomUtility.spec.js | 2 +- 54 files changed, 57 insertions(+), 57 deletions(-) diff --git a/tests/functional/Enums.ComponentScope.spec.js b/tests/functional/Enums.ComponentScope.spec.js index 3a65f2bec..24a6a901d 100644 --- a/tests/functional/Enums.ComponentScope.spec.js +++ b/tests/functional/Enums.ComponentScope.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('ComponentScope enum', () => { +suite('functional: ComponentScope enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.ComponentType.spec.js b/tests/functional/Enums.ComponentType.spec.js index 070047b85..ebeb2eb72 100644 --- a/tests/functional/Enums.ComponentType.spec.js +++ b/tests/functional/Enums.ComponentType.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('ComponentType enum', () => { +suite('functional: ComponentType enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.ExternalReferenceType.spec.js b/tests/functional/Enums.ExternalReferenceType.spec.js index a783dad47..6470b6987 100644 --- a/tests/functional/Enums.ExternalReferenceType.spec.js +++ b/tests/functional/Enums.ExternalReferenceType.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('ExternalReferenceType enum', () => { +suite('functional: ExternalReferenceType enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.HashAlogorithms.spec.js b/tests/functional/Enums.HashAlogorithms.spec.js index 3072fcc07..4c478c171 100644 --- a/tests/functional/Enums.HashAlogorithms.spec.js +++ b/tests/functional/Enums.HashAlogorithms.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('HashAlgorithm enum', () => { +suite('functional: HashAlgorithm enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot4, diff --git a/tests/functional/Enums.LicenseAcknowledgement.spec.js b/tests/functional/Enums.LicenseAcknowledgement.spec.js index db4ba8e8b..631a358b3 100644 --- a/tests/functional/Enums.LicenseAcknowledgement.spec.js +++ b/tests/functional/Enums.LicenseAcknowledgement.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('LicenseAcknowledgement enum', () => { +suite('functional: LicenseAcknowledgement enum', () => { const specVersions = new Set([ Version.v1dot6 ]) diff --git a/tests/functional/Enums.LifecyclePhase.spec.js b/tests/functional/Enums.LifecyclePhase.spec.js index 3853f8f18..d0a55548b 100644 --- a/tests/functional/Enums.LifecyclePhase.spec.js +++ b/tests/functional/Enums.LifecyclePhase.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('LifecyclePhase enum', () => { +suite('functional: LifecyclePhase enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5 diff --git a/tests/functional/Enums.Vulnerability.AffectStatus.spec.js b/tests/functional/Enums.Vulnerability.AffectStatus.spec.js index 3b79dc0c7..388ec6cc9 100644 --- a/tests/functional/Enums.Vulnerability.AffectStatus.spec.js +++ b/tests/functional/Enums.Vulnerability.AffectStatus.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('Vulnerability.AffectStatus enum', () => { +suite('functional: Vulnerability.AffectStatus enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.Vulnerability.AnalysisJustification.spec.js b/tests/functional/Enums.Vulnerability.AnalysisJustification.spec.js index 262fcb715..c7bf3a38e 100644 --- a/tests/functional/Enums.Vulnerability.AnalysisJustification.spec.js +++ b/tests/functional/Enums.Vulnerability.AnalysisJustification.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('Vulnerability.AnalysisJustification enum', () => { +suite('functional: Vulnerability.AnalysisJustification enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.Vulnerability.AnalysisResponse.spec.js b/tests/functional/Enums.Vulnerability.AnalysisResponse.spec.js index f690244fa..9bc3aeeff 100644 --- a/tests/functional/Enums.Vulnerability.AnalysisResponse.spec.js +++ b/tests/functional/Enums.Vulnerability.AnalysisResponse.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('Vulnerability.AnalysisResponse enum', () => { +suite('functional: Vulnerability.AnalysisResponse enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.Vulnerability.AnalysisState.spec.js b/tests/functional/Enums.Vulnerability.AnalysisState.spec.js index 8b413c201..0c31b8346 100644 --- a/tests/functional/Enums.Vulnerability.AnalysisState.spec.js +++ b/tests/functional/Enums.Vulnerability.AnalysisState.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('Vulnerability.AnalysisState enum', () => { +suite('functional: Vulnerability.AnalysisState enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.Vulnerability.RatingMethod.spec.js b/tests/functional/Enums.Vulnerability.RatingMethod.spec.js index 6feb23395..40a93579a 100644 --- a/tests/functional/Enums.Vulnerability.RatingMethod.spec.js +++ b/tests/functional/Enums.Vulnerability.RatingMethod.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('Vulnerability.RatingMethod enum', () => { +suite('functional: Vulnerability.RatingMethod enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Enums.Vulnerability.Severity.spec.js b/tests/functional/Enums.Vulnerability.Severity.spec.js index a9d35d879..200ec4160 100644 --- a/tests/functional/Enums.Vulnerability.Severity.spec.js +++ b/tests/functional/Enums.Vulnerability.Severity.spec.js @@ -29,7 +29,7 @@ const { _Resources: { FILES: { CDX: { JSON_SCHEMA: CDX_JSON_SCHEMA } } } } = require('../../') -suite('Vulnerability.Severity enum', () => { +suite('functional: Vulnerability.Severity enum', () => { const specVersions = new Set([ Version.v1dot6, Version.v1dot5, diff --git a/tests/functional/Resources.node.spec.js b/tests/functional/Resources.node.spec.js index f6447bceb..7c3b33c8c 100644 --- a/tests/functional/Resources.node.spec.js +++ b/tests/functional/Resources.node.spec.js @@ -26,7 +26,7 @@ const { Spec: { Version } } = require('../../') -suite('Resources', () => { +suite('functional: Resources', () => { suite('expected dirs', () => { [ Resources.ROOT diff --git a/tests/functional/SPDX.spec.js b/tests/functional/SPDX.spec.js index a00240170..8ca0746b1 100644 --- a/tests/functional/SPDX.spec.js +++ b/tests/functional/SPDX.spec.js @@ -24,7 +24,7 @@ const { spdxSpecEnum } = require('../_data/spdx') const { SPDX } = require('../../') -suite('isSupportedSpdxId()', () => { +suite('functional: SPDX.isSupportedSpdxId()', () => { /** @type {string[]} knownSpdxIds */ const knownSpdxIds = Object.freeze([ ...spdxSpecEnum @@ -39,7 +39,7 @@ suite('isSupportedSpdxId()', () => { }) }) -suite('fixupSpdxId()', () => { +suite('functional: SPDX.fixupSpdxId()', () => { const expectedFixed = new Map([ ...spdxSpecEnum.map(v => [v, v]), ...spdxSpecEnum.map(v => [v.toLowerCase(), v]), diff --git a/tests/functional/Spec.SpecVersionDict.spec.js b/tests/functional/Spec.SpecVersionDict.spec.js index d3498245d..6c5a98ebf 100644 --- a/tests/functional/Spec.SpecVersionDict.spec.js +++ b/tests/functional/Spec.SpecVersionDict.spec.js @@ -24,7 +24,7 @@ const { Spec: { SpecVersionDict, Version } } = require('../../') -suite('SpecVersionDict', () => { +suite('functional: Spec.SpecVersionDict', () => { Object.entries(SpecVersionDict).forEach(([key, spec]) => suite(`key: ${key}`, () => { test('key is well-known version', () => diff --git a/tests/functional/Validation.JsonValidator.node.spec.js b/tests/functional/Validation.JsonValidator.node.spec.js index fb8e18036..a98c4284a 100644 --- a/tests/functional/Validation.JsonValidator.node.spec.js +++ b/tests/functional/Validation.JsonValidator.node.spec.js @@ -35,7 +35,7 @@ before(function () { } }) -suite('Validation.JsonValidator functional', function () { +suite('functional: Validation.JsonValidator functional', function () { this.timeout(60000); [ @@ -65,7 +65,7 @@ suite('Validation.JsonValidator functional', function () { }) }) -suite('Validation.JsonStrictValidator functional', function () { +suite('functional: Validation.JsonStrictValidator functional', function () { this.timeout(60000); [ diff --git a/tests/functional/Validation.XmlValidator.node.spec.js b/tests/functional/Validation.XmlValidator.node.spec.js index 7e6f05888..7f80e12a1 100644 --- a/tests/functional/Validation.XmlValidator.node.spec.js +++ b/tests/functional/Validation.XmlValidator.node.spec.js @@ -35,7 +35,7 @@ before(function () { } }) -suite('Validation.XmlValidator functional', function () { +suite('functional: Validation.XmlValidator functional', function () { this.timeout(60000); [ diff --git a/tests/functional/helpers.sortable.spec.js b/tests/functional/helpers.sortable.spec.js index dfc70a100..61ca0f600 100644 --- a/tests/functional/helpers.sortable.spec.js +++ b/tests/functional/helpers.sortable.spec.js @@ -22,7 +22,7 @@ const { suite, test } = require('mocha') const { SortableStringables, SortableNumbers, SortableComparables } = require('../../dist.node/_helpers/sortable') -suite('helpers.sortable', () => { +suite('functional: helpers.sortable', () => { suite('SortableStringables', () => { test('sorted()', () => { const obj = { toString: () => 'bar' } diff --git a/tests/functional/internals/OpPlug.node.jsonValidator.implementation.spec.js b/tests/functional/internals/OpPlug.node.jsonValidator.implementation.spec.js index abcb8a904..548f541d4 100644 --- a/tests/functional/internals/OpPlug.node.jsonValidator.implementation.spec.js +++ b/tests/functional/internals/OpPlug.node.jsonValidator.implementation.spec.js @@ -25,7 +25,7 @@ const { Spec: { Version } } = require('../../../') -suite('internals: OpPlug.node.jsonValidator implementation', () => { +suite('functional: internals: OpPlug.node.jsonValidator implementation', () => { for (const impl of ['ajv']) { suite(impl, () => { let makeValidator diff --git a/tests/functional/internals/OpPlug.node.jsonValidator.spec.js b/tests/functional/internals/OpPlug.node.jsonValidator.spec.js index 9175e9351..8ac597de4 100644 --- a/tests/functional/internals/OpPlug.node.jsonValidator.spec.js +++ b/tests/functional/internals/OpPlug.node.jsonValidator.spec.js @@ -27,7 +27,7 @@ const { const { default: makeValidator } = require('../../../dist.node/_optPlug.node/jsonValidator') const { OptPlugError } = require('../../../dist.node/_optPlug.node/errors') -suite('internals: OpPlug.node.jsonValidator auto', () => { +suite('functional: internals: OpPlug.node.jsonValidator auto', () => { if (makeValidator.fails) { test('call should fail/throw', () => { assert.throws( diff --git a/tests/functional/internals/OpPlug.node.xmlStringify.implementation.spec.js b/tests/functional/internals/OpPlug.node.xmlStringify.implementation.spec.js index 281762c07..2218c1a1d 100644 --- a/tests/functional/internals/OpPlug.node.xmlStringify.implementation.spec.js +++ b/tests/functional/internals/OpPlug.node.xmlStringify.implementation.spec.js @@ -20,7 +20,7 @@ Copyright (c) OWASP Foundation. All Rights Reserved. const assert = require('assert') const { suite, test, before } = require('mocha') -suite('internals: OpPlug.node.xmlStringify implementation', () => { +suite('functional: internals: OpPlug.node.xmlStringify implementation', () => { for (const impl of ['xmlbuilder2']) { suite(impl, () => { let xmlStringify diff --git a/tests/functional/internals/OpPlug.node.xmlStringify.spec.js b/tests/functional/internals/OpPlug.node.xmlStringify.spec.js index 817defc39..c8aa7c40b 100644 --- a/tests/functional/internals/OpPlug.node.xmlStringify.spec.js +++ b/tests/functional/internals/OpPlug.node.xmlStringify.spec.js @@ -23,7 +23,7 @@ const { suite, test } = require('mocha') const { default: xmlStringify } = require('../../../dist.node/_optPlug.node/xmlStringify') const { OptPlugError } = require('../../../dist.node/_optPlug.node/errors') -suite('internals: OpPlug.node.xmlStringify auto', () => { +suite('functional: internals: OpPlug.node.xmlStringify auto', () => { if (xmlStringify.fails) { test('call should fail/throw', () => { assert.throws( diff --git a/tests/functional/internals/OpPlug.node.xmlValidator.implementation.spec.js b/tests/functional/internals/OpPlug.node.xmlValidator.implementation.spec.js index 5cc26e644..ba6a08206 100644 --- a/tests/functional/internals/OpPlug.node.xmlValidator.implementation.spec.js +++ b/tests/functional/internals/OpPlug.node.xmlValidator.implementation.spec.js @@ -28,7 +28,7 @@ const { pathToFileURL } = require('url') const { realpathSync } = require('fs') const { join } = require('path') -suite('internals: OpPlug.node.xmlValidator implementation', () => { +suite('functional: internals: OpPlug.node.xmlValidator implementation', () => { for (const impl of ['libxmljs2']) { suite(impl, () => { let makeValidator diff --git a/tests/functional/internals/OpPlug.node.xmlValidator.spec.js b/tests/functional/internals/OpPlug.node.xmlValidator.spec.js index ec5fd8115..a23dcfc1e 100644 --- a/tests/functional/internals/OpPlug.node.xmlValidator.spec.js +++ b/tests/functional/internals/OpPlug.node.xmlValidator.spec.js @@ -27,7 +27,7 @@ const { const { default: makeValidator } = require('../../../dist.node/_optPlug.node/xmlValidator') const { OptPlugError } = require('../../../dist.node/_optPlug.node/errors') -suite('internals: OpPlug.node.xmlValidator auto', () => { +suite('functional: internals: OpPlug.node.xmlValidator auto', () => { if (makeValidator.fails) { test('call should fail/throw', () => { assert.throws( diff --git a/tests/functional/packageManifestExports.node.spec.js b/tests/functional/packageManifestExports.node.spec.js index 4c5c49756..95d5ea234 100644 --- a/tests/functional/packageManifestExports.node.spec.js +++ b/tests/functional/packageManifestExports.node.spec.js @@ -25,7 +25,7 @@ const { suite, test } = require('mocha') const CDX = require('../../') -suite('packageManifest:exports', () => { +suite('functional: packageManifest:exports', () => { const pjPath = join(__dirname, '..', '..', 'package.json') const { exports: pjExports } = JSON.parse(readFileSync(pjPath)) diff --git a/tests/integration/Builders.FromNodePackageJson.ComponentBuilder.test.js b/tests/integration/Builders.FromNodePackageJson.ComponentBuilder.test.js index 4e2e8cf95..5c25bf713 100644 --- a/tests/integration/Builders.FromNodePackageJson.ComponentBuilder.test.js +++ b/tests/integration/Builders.FromNodePackageJson.ComponentBuilder.test.js @@ -27,7 +27,7 @@ const { Builders: { FromNodePackageJson: { ComponentBuilder } } } = require('../../') -suite('Builders.FromNodePackageJson.ComponentBuilder', () => { +suite('integration: Builders.FromNodePackageJson.ComponentBuilder', () => { const salt = Math.random() const extRefFactory = new Factories.FromNodePackageJson.ExternalReferenceFactory() diff --git a/tests/integration/Builders.FromNodePackageJson.ToolBuilders.test.js b/tests/integration/Builders.FromNodePackageJson.ToolBuilders.test.js index dfcaec731..66ab6c154 100644 --- a/tests/integration/Builders.FromNodePackageJson.ToolBuilders.test.js +++ b/tests/integration/Builders.FromNodePackageJson.ToolBuilders.test.js @@ -26,7 +26,7 @@ const { Builders: { FromNodePackageJson: { ToolBuilder } } } = require('../../') -suite('Builders.FromNodePackageJson.ToolBuilder', () => { +suite('integration: Builders.FromNodePackageJson.ToolBuilder', () => { const salt = Math.random() const extRefFactory = new Factories.FromNodePackageJson.ExternalReferenceFactory() diff --git a/tests/integration/Factories.FromNodePackageJson.ExternalReferenceFactory.test.js b/tests/integration/Factories.FromNodePackageJson.ExternalReferenceFactory.test.js index 523dbea04..0f7271fc1 100644 --- a/tests/integration/Factories.FromNodePackageJson.ExternalReferenceFactory.test.js +++ b/tests/integration/Factories.FromNodePackageJson.ExternalReferenceFactory.test.js @@ -26,7 +26,7 @@ const { Factories: { FromNodePackageJson: { ExternalReferenceFactory } } } = require('../../') -suite('Factories.FromNodePackageJson.ExternalReferenceFactory', () => { +suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', () => { const sut = new ExternalReferenceFactory() suite('from "homepage"', () => { diff --git a/tests/integration/Factories.FromNodePackageJson.PackageUrlFactory.test.js b/tests/integration/Factories.FromNodePackageJson.PackageUrlFactory.test.js index 142edd0ea..ee26404f5 100644 --- a/tests/integration/Factories.FromNodePackageJson.PackageUrlFactory.test.js +++ b/tests/integration/Factories.FromNodePackageJson.PackageUrlFactory.test.js @@ -28,7 +28,7 @@ const { Factories: { FromNodePackageJson: { PackageUrlFactory } } } = require('../../') -suite('Factories.FromNodePackageJson.PackageUrlFactory', () => { +suite('integration: Factories.FromNodePackageJson.PackageUrlFactory', () => { const salt = Math.random() const sut = new PackageUrlFactory('testing') diff --git a/tests/integration/Factories.LicenseFactory.test.js b/tests/integration/Factories.LicenseFactory.test.js index 3ef2f62b6..1ab5856ad 100644 --- a/tests/integration/Factories.LicenseFactory.test.js +++ b/tests/integration/Factories.LicenseFactory.test.js @@ -25,7 +25,7 @@ const { Models: { LicenseExpression, NamedLicense, SpdxLicense } } = require('../../') -suite('Factories.LicenseFactory', () => { +suite('integration: Factories.LicenseFactory', () => { test('makeFromString() -> LicenseExpression', () => { const sut = new LicenseFactory() const expression = '(MIT OR Apache-2.0)' diff --git a/tests/integration/Factories.PackageUrlFactory.test.js b/tests/integration/Factories.PackageUrlFactory.test.js index 019426054..fd069d33d 100644 --- a/tests/integration/Factories.PackageUrlFactory.test.js +++ b/tests/integration/Factories.PackageUrlFactory.test.js @@ -28,7 +28,7 @@ const { Factories: { PackageUrlFactory } } = require('../../') -suite('Factories.PackageUrlFactory', () => { +suite('integration: Factories.PackageUrlFactory', () => { const salt = Math.random() const sut = new PackageUrlFactory('testing') diff --git a/tests/integration/Serialize.JsonNormalize.test.js b/tests/integration/Serialize.JsonNormalize.test.js index 226513cce..092e68a72 100644 --- a/tests/integration/Serialize.JsonNormalize.test.js +++ b/tests/integration/Serialize.JsonNormalize.test.js @@ -30,7 +30,7 @@ const { Spec } = require('../../') -describe('Serialize.JsonNormalize', function () { +describe('integration.Serialize.JsonNormalize', function () { this.timeout(60000); [ diff --git a/tests/integration/Serialize.JsonSerialize.test.js b/tests/integration/Serialize.JsonSerialize.test.js index e49f0a2af..3a4b4f4a6 100644 --- a/tests/integration/Serialize.JsonSerialize.test.js +++ b/tests/integration/Serialize.JsonSerialize.test.js @@ -36,7 +36,7 @@ const { } } = require('../../') -describe('Serialize.JsonSerialize', function () { +describe('integration.Serialize.JsonSerialize', function () { this.timeout(60000); Object.entries({ diff --git a/tests/integration/Serialize.XmlNormalize.test.js b/tests/integration/Serialize.XmlNormalize.test.js index 9a4c1d498..8a9ebe805 100644 --- a/tests/integration/Serialize.XmlNormalize.test.js +++ b/tests/integration/Serialize.XmlNormalize.test.js @@ -31,7 +31,7 @@ const { Spec } = require('../../') -describe('Serialize.XmlNormalize', function () { +describe('integration.Serialize.XmlNormalize', function () { this.timeout(60000); [ diff --git a/tests/integration/Serialize.XmlSerialize.test.js b/tests/integration/Serialize.XmlSerialize.test.js index 0b1384346..db6cf2a14 100644 --- a/tests/integration/Serialize.XmlSerialize.test.js +++ b/tests/integration/Serialize.XmlSerialize.test.js @@ -35,7 +35,7 @@ const { const { default: xmlStringify } = require('../../dist.node/_optPlug.node/xmlStringify') -describe('Serialize.XmlSerialize', function () { +describe('integration.Serialize.XmlSerialize', function () { const expectMissingDepError = xmlStringify.fails ?? false this.timeout(60000); diff --git a/tests/integration/Validation.JsonStrictValidator.test.js b/tests/integration/Validation.JsonStrictValidator.test.js index 83ab389d0..84cc4e2ee 100644 --- a/tests/integration/Validation.JsonStrictValidator.test.js +++ b/tests/integration/Validation.JsonStrictValidator.test.js @@ -31,7 +31,7 @@ const { const { default: jsonValidator } = require('../../dist.node/_optPlug.node/jsonValidator') -describe('Validation.JsonStrictValidator', () => { +describe('integration.Validation.JsonStrictValidator', () => { const expectMissingDepError = jsonValidator.fails ?? false; [ diff --git a/tests/integration/Validation.JsonValidator.test.js b/tests/integration/Validation.JsonValidator.test.js index 2874345a8..331e63f2e 100644 --- a/tests/integration/Validation.JsonValidator.test.js +++ b/tests/integration/Validation.JsonValidator.test.js @@ -31,7 +31,7 @@ const { const { default: jsonValidator } = require('../../dist.node/_optPlug.node/jsonValidator') -describe('Validation.JsonValidator', () => { +describe('integration.Validation.JsonValidator', () => { const expectMissingDepError = jsonValidator.fails ?? false; [ diff --git a/tests/integration/Validation.XmlValidator.test.js b/tests/integration/Validation.XmlValidator.test.js index 74a146fc4..b9bdc49bf 100644 --- a/tests/integration/Validation.XmlValidator.test.js +++ b/tests/integration/Validation.XmlValidator.test.js @@ -31,7 +31,7 @@ const { const { default: xmlValidator } = require('../../dist.node/_optPlug.node/xmlValidator') -describe('Validation.XmlValidator', () => { +describe('integration.Validation.XmlValidator', () => { const expectMissingDepError = xmlValidator.fails ?? false; [ diff --git a/tests/unit/Builders.FromNodePackageJson.ComponentBuilder.spec.js b/tests/unit/Builders.FromNodePackageJson.ComponentBuilder.spec.js index 0aa972b35..6e6d4ca6b 100644 --- a/tests/unit/Builders.FromNodePackageJson.ComponentBuilder.spec.js +++ b/tests/unit/Builders.FromNodePackageJson.ComponentBuilder.spec.js @@ -28,7 +28,7 @@ const { } } = require('../../') -suite('Builders.FromNodePackageJson.ComponentBuilder', () => { +suite('unit: Builders.FromNodePackageJson.ComponentBuilder', () => { test('construct', () => { const extRefFactory = new ExternalReferenceFactory() const licenseFactory = new LicenseFactory() diff --git a/tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js b/tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js index 3ec8f763a..1f4836d63 100644 --- a/tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js +++ b/tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js @@ -25,7 +25,7 @@ const { Factories: { FromNodePackageJson: { ExternalReferenceFactory } } } = require('../../') -suite('Builders.FromNodePackageJson.ToolBuilder', () => { +suite('unit: Builders.FromNodePackageJson.ToolBuilder', () => { test('construct', () => { const extRefFactory = new ExternalReferenceFactory() diff --git a/tests/unit/Factories.FromNodePackageJson.PackageUrlFactory.js b/tests/unit/Factories.FromNodePackageJson.PackageUrlFactory.js index e8a35dfcb..5327dab21 100644 --- a/tests/unit/Factories.FromNodePackageJson.PackageUrlFactory.js +++ b/tests/unit/Factories.FromNodePackageJson.PackageUrlFactory.js @@ -26,7 +26,7 @@ const { Models: { Component, ExternalReference, ExternalReferenceRepository } } = require('../../') -suite('Factories.FromNodePackageJson.PackageUrlFactory', () => { +suite('unit: Factories.FromNodePackageJson.PackageUrlFactory', () => { suite('makeFromComponent()', () => { test('plain', () => { const component = new Component(ComponentType.Library, 'testing') diff --git a/tests/unit/Factories.PackageUrlFactory.spec.js b/tests/unit/Factories.PackageUrlFactory.spec.js index 6001172de..3ad430ae5 100644 --- a/tests/unit/Factories.PackageUrlFactory.spec.js +++ b/tests/unit/Factories.PackageUrlFactory.spec.js @@ -26,7 +26,7 @@ const { const { randomString } = require('../_helpers/stringFunctions') -suite('Factories.PackageUrlFactory', () => { +suite('unit: Factories.PackageUrlFactory', () => { test('construct', () => { const type = randomString(5) diff --git a/tests/unit/Models.Bom.spec.js b/tests/unit/Models.Bom.spec.js index 3d1efaa01..c6960274f 100644 --- a/tests/unit/Models.Bom.spec.js +++ b/tests/unit/Models.Bom.spec.js @@ -27,7 +27,7 @@ const { } } = require('../../') -suite('Models.Bom', () => { +suite('unit: Models.Bom', () => { test('construct with empty properties', () => { const bom = new Bom() diff --git a/tests/unit/Models.Component.spec.js b/tests/unit/Models.Component.spec.js index b81c15ac7..17ab7c0ae 100644 --- a/tests/unit/Models.Component.spec.js +++ b/tests/unit/Models.Component.spec.js @@ -34,7 +34,7 @@ const { } } = require('../../') -suite('Models.Component', () => { +suite('unit: Models.Component', () => { test('constructor', () => { const component = new Component('application', 'foobar') diff --git a/tests/unit/Models.Vulnerability.Vulnerability.spec.js b/tests/unit/Models.Vulnerability.Vulnerability.spec.js index 5e5a79844..07f1267bf 100644 --- a/tests/unit/Models.Vulnerability.Vulnerability.spec.js +++ b/tests/unit/Models.Vulnerability.Vulnerability.spec.js @@ -31,7 +31,7 @@ const { Types: { CweRepository } } = require('../../') -suite('Models.Vulnerability.Vulnerability', () => { +suite('unit: Models.Vulnerability.Vulnerability', () => { test('construct with empty properties', () => { const vulnerability = new Vulnerability() diff --git a/tests/unit/Models.bomLink.spec.js b/tests/unit/Models.bomLink.spec.js index 7996325a4..a1e388b85 100644 --- a/tests/unit/Models.bomLink.spec.js +++ b/tests/unit/Models.bomLink.spec.js @@ -24,7 +24,7 @@ const { Models: { BomLinkDocument, BomLinkElement } } = require('../../') -suite('Models.BomLinkDocument', () => { +suite('unit: Models.BomLinkDocument', () => { suite('isValid()', () => { test('pass', () => { // taken from examples in https://cyclonedx.org/capabilities/bomlink/ diff --git a/tests/unit/SPDX.spec.js b/tests/unit/SPDX.spec.js index 951333a9e..e7f4d9631 100644 --- a/tests/unit/SPDX.spec.js +++ b/tests/unit/SPDX.spec.js @@ -24,7 +24,7 @@ const { SPDX: { fixupSpdxId, isSupportedSpdxId } } = require('../../') -suite('SPDX.isSupportedSpdxId()', () => { +suite('unit: SPDX.isSupportedSpdxId()', () => { const knownSpdxIds = Object.freeze(['MIT', 'Apache-2.0']) suite('is true', () => @@ -44,7 +44,7 @@ suite('SPDX.isSupportedSpdxId()', () => { ) }) -suite('fixupSpdxId()', () => { +suite('unit: SPDX.fixupSpdxId()', () => { const expectedFixed = new Map([ ['MIT', 'MIT'], ['mit', 'MIT'], diff --git a/tests/unit/Serialize.BomRefDiscriminator.spec.js b/tests/unit/Serialize.BomRefDiscriminator.spec.js index 74b0aa881..4f36feb03 100644 --- a/tests/unit/Serialize.BomRefDiscriminator.spec.js +++ b/tests/unit/Serialize.BomRefDiscriminator.spec.js @@ -27,7 +27,7 @@ const { const { randomString } = require('../_helpers/stringFunctions') -suite('Serialize.BomRefDiscriminator', () => { +suite('unit: Serialize.BomRefDiscriminator', () => { test('constructor', () => { const bomRef1 = new BomRef() const bomRef2 = new BomRef('foo') diff --git a/tests/unit/Serialize.JsonSerializer.spec.js b/tests/unit/Serialize.JsonSerializer.spec.js index d5176bb5c..b247f8744 100644 --- a/tests/unit/Serialize.JsonSerializer.spec.js +++ b/tests/unit/Serialize.JsonSerializer.spec.js @@ -28,7 +28,7 @@ const { Spec: { Format, Spec1dot4, UnsupportedFormatError } } = require('../../') -suite('Serialize.JsonSerializer', () => { +suite('unit: Serialize.JsonSerializer', () => { suite('constructor', () => { test('happy path', () => { const normalizerFactory = new Factory(Spec1dot4) diff --git a/tests/unit/Serialize.XML._xsd.spec.js b/tests/unit/Serialize.XML._xsd.spec.js index 66fe2f83f..54b4c0af8 100644 --- a/tests/unit/Serialize.XML._xsd.spec.js +++ b/tests/unit/Serialize.XML._xsd.spec.js @@ -25,7 +25,7 @@ const { token } = require('../../dist.node/serialize/xml/_xsd.js') -suite('Serialize.XML._xsd', () => { +suite('unit: Serialize.XML._xsd', () => { const normalizedStringCases = { '': '', '123': '123', diff --git a/tests/unit/Serialize.XmlBaseSerializer.spec.js b/tests/unit/Serialize.XmlBaseSerializer.spec.js index 8c6c8b507..41d7730f9 100644 --- a/tests/unit/Serialize.XmlBaseSerializer.spec.js +++ b/tests/unit/Serialize.XmlBaseSerializer.spec.js @@ -28,7 +28,7 @@ const { Spec: { Format, Spec1dot4, UnsupportedFormatError } } = require('../../') -suite('Serialize.XmlBaseSerializer', () => { +suite('unit: Serialize.XmlBaseSerializer', () => { suite('constructor', () => { class MySerializer extends XmlBaseSerializer {} test('happy path', () => { diff --git a/tests/unit/Serialize.XmlSerializer.spec.js b/tests/unit/Serialize.XmlSerializer.spec.js index e047d4c49..4fdcc1c33 100644 --- a/tests/unit/Serialize.XmlSerializer.spec.js +++ b/tests/unit/Serialize.XmlSerializer.spec.js @@ -28,7 +28,7 @@ const { Spec: { Format, Spec1dot4, UnsupportedFormatError } } = require('../../') -suite('Serialize.XmlSerializer', () => { +suite('unit: Serialize.XmlSerializer', () => { suite('constructor', () => { test('happy path', () => { const normalizerFactory = new Factory(Spec1dot4) diff --git a/tests/unit/Types.cpe.spec.js b/tests/unit/Types.cpe.spec.js index 61de93f1e..76006a55a 100644 --- a/tests/unit/Types.cpe.spec.js +++ b/tests/unit/Types.cpe.spec.js @@ -24,7 +24,7 @@ const { Types: { isCPE } } = require('../../') -suite('Types.cpe', () => { +suite('unit: Types.cpe', () => { suite('isCPE()', () => { test('2.2', () => { const actual = isCPE('cpe:/a:microsoft:internet_explorer:11:-') diff --git a/tests/unit/Utils.BomUtility.spec.js b/tests/unit/Utils.BomUtility.spec.js index 2f23c6813..7a7bca7fb 100644 --- a/tests/unit/Utils.BomUtility.spec.js +++ b/tests/unit/Utils.BomUtility.spec.js @@ -26,7 +26,7 @@ const { } } = require('../../') -suite('Utils.BomUtility', () => { +suite('unit: Utils.BomUtility', () => { suite('randomSerialNumber()', () => { test('has correct format according to XSD', () => { const value = BomUtility.randomSerialNumber()