Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SPDX Expression Parsing #719

Merged
merged 9 commits into from
Jul 10, 2024
Merged

Update SPDX Expression Parsing #719

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
154c150
add @onebeyond/spdx-license-satisfies to DR Action project
elireisman Jun 5, 2024
bc5b235
move jest to dev dependencies
elireisman Jun 5, 2024
ecd706f
register spdx lib as ES Module, start converting call sites to use ne…
elireisman Jun 5, 2024
2e4eaa4
complete test suite conversions; simplify fn name
elireisman Jun 5, 2024
bbed6f3
update licenses pkg and tests
elireisman Jun 6, 2024
ed624db
more SPDX unit tests to illustrate matching behavior
elireisman Jun 6, 2024
f60d593
npm run package
elireisman Jun 6, 2024
d85edeb
remove redundant declaration from TS types module registration
elireisman Jun 10, 2024
b4ae47c
Properly display test failures using jest
juxtin Jun 10, 2024
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
52 changes: 21 additions & 31 deletions __tests__/spdx.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {expect, test} from '@jest/globals'
import {expect, test, describe} from '@jest/globals'
import * as spdx from '../src/spdx'

test('satisfiesAny', () => {
describe('satisfiesAny', () => {
const units = [
{
candidate: 'MIT',
Expand Down Expand Up @@ -59,17 +59,14 @@ test('satisfiesAny', () => {
]

for (const unit of units) {
let got: boolean = spdx.satisfiesAny(unit.candidate, unit.licenses)
if (got != unit.expected) {
console.log(
`failing unit test inputs: candidate(${unit.candidate}) licenses(${unit.licenses})`
)
}
expect(got).toBe(unit.expected)
const got: boolean = spdx.satisfiesAny(unit.candidate, unit.licenses)
test(`should return ${unit.expected} for ("${unit.candidate}", "${unit.licenses}")`, () => {
expect(got).toBe(unit.expected)
})
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh nice change! 😍

})

test('satisfiesAll', () => {
describe('satisfiesAll', () => {
const units = [
{
candidate: 'MIT',
Expand Down Expand Up @@ -137,17 +134,14 @@ test('satisfiesAll', () => {
]

for (const unit of units) {
let got: boolean = spdx.satisfiesAll(unit.candidate, unit.licenses)
if (got != unit.expected) {
console.log(
`failing unit test inputs: candidate(${unit.candidate}) licenses(${unit.licenses})`
)
}
expect(got).toBe(unit.expected)
const got: boolean = spdx.satisfiesAll(unit.candidate, unit.licenses)
test(`should return ${unit.expected} for ("${unit.candidate}", "${unit.licenses}")`, () => {
expect(got).toBe(unit.expected)
})
}
})

test('satisfies', () => {
describe('satisfies', () => {
const units = [
{
candidate: 'MIT',
Expand Down Expand Up @@ -220,17 +214,14 @@ test('satisfies', () => {
]

for (const unit of units) {
let got: boolean = spdx.satisfies(unit.candidate, unit.constraint)
if (got != unit.expected) {
console.log(
`failing unit test inputs: candidateExpr(${unit.candidate}) constraintExpr(${unit.constraint})`
)
}
expect(got).toBe(unit.expected)
const got: boolean = spdx.satisfies(unit.candidate, unit.constraint)
test(`should return ${unit.expected} for ("${unit.candidate}", "${unit.constraint}")`, () => {
expect(got).toBe(unit.expected)
})
}
})

test('isValid', () => {
describe('isValid', () => {
const units = [
{
candidate: 'MIT',
Expand Down Expand Up @@ -258,10 +249,9 @@ test('isValid', () => {
}
]
for (const unit of units) {
let got: boolean = spdx.isValid(unit.candidate)
if (got != unit.expected) {
console.log(`failing unit test inputs: candidateExpr(${unit.candidate})`)
}
expect(got).toBe(unit.expected)
const got: boolean = spdx.isValid(unit.candidate)
test(`should return ${unit.expected} for ("${unit.candidate}")`, () => {
expect(got).toBe(unit.expected)
})
}
})
elireisman marked this conversation as resolved.
Show resolved Hide resolved