Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
import path from 'node:path'
import { fileURLToPath } from 'node:url'

import { default as baseCfg, globals } from './tools/code-style/eslint.config.mjs'
import baseCfg, { globals } from './tools/code-style/eslint.config.mjs'

const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
Expand All @@ -36,7 +36,7 @@ export default [
{
name: 'project-specific',
rules: {
"complexity": ["error", { "max": 15 }]
complexity: ['error', { max: 15 }]
}
},
{
Expand All @@ -55,7 +55,7 @@ export default [
{
files: [
'**/*.{test,spec}.{js,mjs,cjs,ts}',
'tests/**.{js,mjs,cjs,ts}'
'tests/**/*.{js,mjs,cjs,ts}'
],
languageOptions: {
globals: globals.mocha
Expand Down
4 changes: 1 addition & 3 deletions tests/_data/models.js
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ function createComplexStructure () {
['encode anyUri: mailto', 'mailto:[email protected]'],
['encode anyUri: relative path', '../foo/bar'],
['encode anyUri: space', 'https://example.org/foo bar bazz%20again+again'],
['encode anyUri: quotation', `https://example.org/this"test"isa'test'`],
['encode anyUri: quotation', 'https://example.org/this"test"isa\'test\''],
['encode anyUri: []', 'https://example.org/?bar[test]=baz[again]'],
['encode anyUri: <>', 'https://example.org/#<test><again>'],
['encode anyUri: {}', 'https://example.org/#{test}{again}'],
Expand Down Expand Up @@ -609,7 +609,6 @@ function createComplexStructure () {
return bom
}


/**
* @returns {Models.Bom}
*/
Expand Down Expand Up @@ -671,7 +670,6 @@ function createAllTools () {
return bom
}


module.exports = {
createAllTools,
createComplexStructure
Expand Down
9 changes: 4 additions & 5 deletions tests/_data/specLoader.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ const { suite, test } = require('mocha')
const { getSpecElement, getSpecEnum, loadSpec } = require('./specLoader')

suite('test helpers: specLoader', () => {

const expected_definitions_affectedStatus_enum = [
const expectedDefinitionsAffectedStatusEnum = [
'affected',
'unaffected',
'unknown'
Expand All @@ -42,7 +41,7 @@ suite('test helpers: specLoader', () => {
test('happy path', () => {
const loaded = loadSpec('bom-1.4.SNAPSHOT.schema.json')
// dummy test to see if loading worked somehow ...
assert.deepStrictEqual(loaded.definitions.affectedStatus.enum, expected_definitions_affectedStatus_enum)
assert.deepStrictEqual(loaded.definitions.affectedStatus.enum, expectedDefinitionsAffectedStatusEnum)
})
})

Expand All @@ -59,7 +58,7 @@ suite('test helpers: specLoader', () => {
'bom-1.4.SNAPSHOT.schema.json',
'definitions', 'affectedStatus', 'enum')
// dummy test to see if loading worked somehow ...
assert.deepStrictEqual(loaded, expected_definitions_affectedStatus_enum)
assert.deepStrictEqual(loaded, expectedDefinitionsAffectedStatusEnum)
})
})

Expand All @@ -69,7 +68,7 @@ suite('test helpers: specLoader', () => {
'bom-1.4.SNAPSHOT.schema.json',
'affectedStatus')
// dummy test to see if loading worked somehow ...
assert.deepStrictEqual(loaded, expected_definitions_affectedStatus_enum)
assert.deepStrictEqual(loaded, expectedDefinitionsAffectedStatusEnum)
})
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ suite('integration: Builders.FromNodePackageJson.ComponentBuilder', () => {
}
],
repository: {
type: "git",
url: "https://github.com/foo/bar.git"
type: 'git',
url: 'https://github.com/foo/bar.git'
}
// to be continued
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', ()
ExternalReferenceType.VCS,
{ comment: 'as detected from PackageJson property "repository"' }
)]
const data = { repository: '../foo/bar' }
const data = { repository: '../foo/bar' }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
Expand All @@ -114,7 +114,7 @@ suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', ()
ExternalReferenceType.VCS,
{ comment: 'as detected from PackageJson property "repository"' }
)]
const data = { repository: '[email protected]:foo/bar'}
const data = { repository: '[email protected]:foo/bar' }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
Expand All @@ -134,19 +134,19 @@ suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', ()
ExternalReferenceType.VCS,
{ comment: 'as detected from PackageJson property "repository"' }
)]
const data = { repository: 'svn://example.com/foo/trunk' }
const data = { repository: 'svn://example.com/foo/trunk' }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
test('empty string', () => {
const expected = []
const data = { repository: '' }
const data = { repository: '' }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
test('undefined', () => {
const expected = []
const data = { }
const data = { }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
Expand All @@ -168,7 +168,7 @@ suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', ()
ExternalReferenceType.VCS,
{ comment: 'as detected from PackageJson property "repository.url"' }
)]
const data = { repository: { url: '[email protected]:foo/bar'} }
const data = { repository: { url: '[email protected]:foo/bar' } }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
Expand Down Expand Up @@ -200,7 +200,7 @@ suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', ()
})
test('undefined', () => {
const expected = []
const data = { repository: { } }
const data = { repository: { } }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
Expand All @@ -222,7 +222,7 @@ suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', ()
ExternalReferenceType.VCS,
{ comment: 'as detected from PackageJson property "repository.url" and "repository.directory"' }
)]
const data = { repository: { url: '[email protected]:foo/bar', directory: 'some/other#23/dir#42'} }
const data = { repository: { url: '[email protected]:foo/bar', directory: 'some/other#23/dir#42' } }
const actual = sut.makeExternalReferences(data)
assert.deepEqual(actual, expected)
})
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/Serialize.JsonSerialize.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const { createAllTools, createComplexStructure } = require('../_data/models')
const { loadSerializeResult, writeSerializeResult } = require('../_data/serialize')

describe('integration.Serialize.JsonSerialize', function () {
this.timeout(60000);
this.timeout(60000)

Object.entries({
complex: createComplexStructure,
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/Serialize.XmlSerialize.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const { loadSerializeResult, writeSerializeResult } = require('../_data/serializ
describe('integration.Serialize.XmlSerialize', function () {
const expectMissingDepError = xmlStringify.fails ?? false

this.timeout(60000);
this.timeout(60000)

Object.entries({
complex: createComplexStructure,
Expand Down Expand Up @@ -100,7 +100,6 @@ describe('integration.Serialize.XmlSerialize', function () {

// TODO add more tests
}))

}))

describe('make bom-refs unique', () => {
Expand Down
1 change: 0 additions & 1 deletion tests/unit/Models.bomLink.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const {
Models: { BomLinkDocument, BomLinkElement }
} = require('../../')


suite('unit: Models.BomLinkDocument', () => {
suite('isValid()', () => {
test('pass', () => {
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/Serialize.BomRefDiscriminator.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ suite('unit: Serialize.BomRefDiscriminator', () => {
const bomRef2 = new BomRef('foo')
const prefix = randomString(10)


const actual = new BomRefDiscriminator([bomRef1, bomRef2], prefix)

assert.strictEqual(actual.prefix, prefix)
Expand Down Expand Up @@ -65,7 +64,6 @@ suite('unit: Serialize.BomRefDiscriminator', () => {
assert.strictEqual(bomRef1.value, 'foo')
assert.strictEqual(bomRef2.value, 'foo')


const discriminator = new BomRefDiscriminator([bomRef1, bomRef2])
discriminator.discriminate()

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Serialize.JsonSerializer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ suite('unit: Serialize.JsonSerializer', () => {
const normalizerFactoryDummy = { spec: { supportsFormat: f => f !== Format.JSON } }
assert.throws(
() => {

/* eslint-disable-next-line no-new -- needed to test constructor */
new JsonSerializer(normalizerFactoryDummy)
},
UnsupportedFormatError,
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/Serialize.XML._xsd.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ const {
suite('unit: Serialize.XML._xsd', () => {
const normalizedStringCases = {
'': '',
'123': '123',
123: '123',
' 0 1\r\n2\t3\n4\t': ' 0 1 2 3 4 ',
' 0 1\r\n 2 \t3 \n 4 \t': ' 0 1 2 3 4 ',
}

const tokenCases = {
'': '',
'123': '123',
123: '123',
' 0 1 \r\n2\t 3 \n4\n ': '0 1 2 3 4',
' 0 1\r\n 2 \t3 \n 4 \t ': '0 1 2 3 4',
}
Expand All @@ -45,7 +45,7 @@ suite('unit: Serialize.XML._xsd', () => {
* @param {string} s
* @return {string}
*/
function escapeTNR(s) {
function escapeTNR (s) {
return s
.replace(/\t/g, '\\t')
.replace(/\n/g, '\\n')
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Serialize.XmlBaseSerializer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ suite('unit: Serialize.XmlBaseSerializer', () => {
const normalizerFactoryDummy = { spec: { supportsFormat: f => f !== Format.XML } }
assert.throws(
() => {

/* eslint-disable-next-line no-new -- needed to test constructor */
new MySerializer(normalizerFactoryDummy)
},
UnsupportedFormatError,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Serialize.XmlSerializer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ suite('unit: Serialize.XmlSerializer', () => {
const normalizerFactoryDummy = { spec: { supportsFormat: f => f !== Format.XML } }
assert.throws(
() => {

/* eslint-disable-next-line no-new -- needed to test constructor */
new XmlSerializer(normalizerFactoryDummy)
},
UnsupportedFormatError,
Expand Down
Loading