Skip to content

Commit a185691

Browse files
madpahmadpah
committed
JSON unit tests now passing - still have CycloneDX/specification#146 to workaround which breaks Dependency (de-)serialization for JSON
Signed-off-by: Paul Horton <[email protected]>
1 parent a93d48c commit a185691

26 files changed

+359
-45
lines changed

Diff for: ‎poetry.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ keywords = [
4848
python = "^3.7"
4949
importlib-metadata = { version = ">= 3.4", python = "< 3.8" }
5050
packageurl-python = ">= 0.9"
51-
py-serializable = "^0.9.1"
51+
py-serializable = "^0.9.2"
5252
setuptools = ">= 47.0.0"
5353
toml = "^0.10.0"
5454
sortedcontainers = "^2.4.0"

Diff for: ‎requirements.lowest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# see pyptoject file for ranges
33

44
packageurl-python == 0.9.0
5-
py-serializable == 0.9.1
5+
py-serializable == 0.9.2
66
importlib-metadata == 3.4.0 # ; python_version < '3.8'
77
setuptools == 47.0.0
88
types-setuptools == 57.0.0

Diff for: ‎tests/data.py

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
MOCK_UUID_9 = UUID('859ff614-35a7-4d37-803b-d89130cb2577')
9292
MOCK_UUID_10 = UUID('0afa65bc-4acd-428b-9e17-8e97b1969745')
9393
MOCK_BOM_UUID_1 = UUID('3e671687-395b-41f5-a30f-a58921a69b79')
94+
MOCK_BOM_UUID_2 = UUID('d0b24ba4-102b-497e-b31f-4fdc3f0a3005')
9495

9596
TEST_UUIDS = [
9697
UUID(MOCK_UUID_1), UUID(MOCK_UUID_2), UUID(MOCK_UUID_3), UUID(MOCK_UUID_4), UUID(MOCK_UUID_5), UUID(MOCK_UUID_6)

Diff for: ‎tests/fixtures/json/1.2/bom_services_complex.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.2",
5-
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2021-09-01T10:50:42.051979+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.2/bom_services_nested.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"type": "library",
99
"version": "1.0.0"
1010
},
11-
"timestamp": "2022-01-27T16:16:35.622354+00:00",
11+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
1212
"tools": [
1313
{
1414
"name": "cyclonedx-python-lib",
@@ -17,7 +17,7 @@
1717
}
1818
]
1919
},
20-
"serialNumber": "urn:uuid:1d2c4529-8cf8-447d-b2a1-e4ebb610adb9",
20+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
2121
"services": [
2222
{
2323
"authenticated": false,

Diff for: ‎tests/fixtures/json/1.2/bom_services_simple.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.2",
5-
"serialNumber": "urn:uuid:228f339b-f73c-4379-af8e-3ad09dbde1d8",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:57.753759+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.2/bom_setuptools_complete.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2021-09-01T10:50:42.051979+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.2/bom_setuptools_no_version.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json",
3+
"bomFormat": "CycloneDX",
4+
"specVersion": "1.3",
5+
"serialNumber": "urn:uuid:77d15ab9-5602-4cca-8ed2-59ae579aafd3",
6+
"version": 1,
7+
"metadata": {
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
9+
"tools": [
10+
{
11+
"vendor": "CycloneDX",
12+
"name": "cyclonedx-python-lib",
13+
"version": "TESTING"
14+
}
15+
]
16+
},
17+
"components": [
18+
{
19+
"type": "library",
20+
"bom-ref": "pkg:pypi/setuptools?extension=tar.gz",
21+
"author": "Test Author",
22+
"name": "setuptools",
23+
"version": "",
24+
"licenses": [
25+
{
26+
"expression": "MIT License"
27+
}
28+
],
29+
"purl": "pkg:pypi/setuptools?extension=tar.gz"
30+
}
31+
],
32+
"dependencies": [
33+
{
34+
"ref": "pkg:pypi/setuptools?extension=tar.gz"
35+
}
36+
]
37+
}

Diff for: ‎tests/fixtures/json/1.2/bom_toml_1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.2",
5-
"serialNumber": "urn:uuid:f60062dc-9bb8-4415-be36-78f0c52c5c64",
5+
"serialNumber": "urn:uuid:6f266d1c-760f-4552-ae3b-41a9b74232fa",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:57.552271+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.2/bom_with_full_metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.2",
5-
"serialNumber": "urn:uuid:47f912c6-4879-4f4b-ae9c-2cf51f15be08",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:57.775590+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_services_complex.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.3",
5-
"serialNumber": "urn:uuid:401351ba-6438-4b6d-8f6f-f10f1ae41f8b",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.031955+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_services_nested.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.3",
5-
"serialNumber": "urn:uuid:6ae24228-acba-422e-bc82-450a230cf04d",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.058446+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_services_simple.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.3",
5-
"serialNumber": "urn:uuid:e3ad515c-a48a-44d8-a17f-ed11e6a68a1a",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.086656+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_setuptools_complete.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2021-09-01T10:50:42.051979+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_setuptools_no_version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.3",
5-
"serialNumber": "urn:uuid:3e6b7d74-47af-41c2-b716-aefdc229aa23",
5+
"serialNumber": "urn:uuid:77d15ab9-5602-4cca-8ed2-59ae579aafd3",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.008536+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_toml_1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.3",
5-
"serialNumber": "urn:uuid:71dc0b05-ae55-4384-8469-1a7755874d6a",
5+
"serialNumber": "urn:uuid:6f266d1c-760f-4552-ae3b-41a9b74232fa",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:57.806505+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.3/bom_with_full_metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.3",
5-
"serialNumber": "urn:uuid:7e20a198-96d1-4b79-8207-56a34598c9f1",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.110075+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_services_complex.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:8b7d855f-b826-4548-9cba-4c018b9afd7c",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.980752+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_services_nested.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:b743da1e-8e6d-464d-bc2e-2295d136c9f4",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:59.022478+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_services_simple.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:fece92d9-75d7-4e94-ad5e-5cc18a621b47",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:59.063187+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_setuptools_no_version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:46d26437-5d99-4915-be3f-9fd53fcaa782",
5+
"serialNumber": "urn:uuid:77d15ab9-5602-4cca-8ed2-59ae579aafd3",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.943672+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_setuptools_with_vulnerabilities.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:313807bd-6f7c-4016-95d0-84c2273c3e65",
5+
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.703824+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_toml_1.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:6b822a8f-bb36-47ff-a9e8-321a3a16a46a",
5+
"serialNumber": "urn:uuid:6f266d1c-760f-4552-ae3b-41a9b74232fa",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:58.628816+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

Diff for: ‎tests/fixtures/json/1.4/bom_with_full_metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
33
"bomFormat": "CycloneDX",
44
"specVersion": "1.4",
5-
"serialNumber": "urn:uuid:cefd0380-8626-476c-ae2d-956079d6d4b2",
5+
"serialNumber": "urn:uuid:d0b24ba4-102b-497e-b31f-4fdc3f0a3005",
66
"version": 1,
77
"metadata": {
8-
"timestamp": "2023-01-07T13:45:59.098229+00:00",
8+
"timestamp": "2023-01-07T13:44:32.312678+00:00",
99
"tools": [
1010
{
1111
"vendor": "CycloneDX",

0 commit comments

Comments
 (0)