Skip to content

Commit a3b5eca

Browse files
jkowalleckjkowalleck
committed
tests
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 75d20d2 commit a3b5eca

File tree

51 files changed

+1018
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1018
-125
lines changed

‎tests/_data/models.py

Lines changed: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,8 +1051,14 @@ def get_bom_with_tools() -> Bom:
10511051
return _make_bom(
10521052
metadata=BomMetaData(
10531053
tools=(
1054-
Tool(name='test-tool-b', version='1.33.7'),
1055-
Tool(name='test-tool-a', version='23.42'),
1054+
Tool(name='test-tool-b'),
1055+
Tool(vendor='example',
1056+
name='test-tool-a',
1057+
version='1.33.7',
1058+
hashes=[HashType.from_composite_str(
1059+
'sha256:adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6')],
1060+
external_references=[get_external_reference_1()],
1061+
),
10561062
)
10571063
)
10581064
)
@@ -1063,10 +1069,15 @@ def get_bom_with_tools_with_component_migrate() -> Bom:
10631069
metadata=BomMetaData(
10641070
tools=ToolsRepository(
10651071
components=(
1066-
Component(type=ComponentType.APPLICATION, group='adobe',
1067-
name='test-component', version='1.2.3', bom_ref='test-component'),
1068-
Component(type=ComponentType.APPLICATION, group='acme',
1069-
name='other-component', bom_ref='other-component'),
1072+
Component(name='test-component', bom_ref='test-component'),
1073+
Component(type=ComponentType.APPLICATION,
1074+
bom_ref='other-component',
1075+
group='acme',
1076+
name='other-component',
1077+
hashes=[HashType.from_composite_str(
1078+
'sha256:49b420bd8d8182542a76d4422e0c7890dcc88a3d8ddad04da06366d8c40ac8ca')],
1079+
external_references=[get_external_reference_1()],
1080+
),
10701081
)
10711082
)
10721083
)
@@ -1079,7 +1090,11 @@ def get_bom_with_tools_with_service_migrate() -> Bom:
10791090
tools=ToolsRepository(
10801091
services=(
10811092
Service(name='test-service', bom_ref='test-service'),
1082-
Service(name='other-service', bom_ref='other-service'),
1093+
Service(group='acme',
1094+
name='other-service',
1095+
bom_ref='other-service',
1096+
external_references=[get_external_reference_1()],
1097+
),
10831098
)
10841099
)
10851100
)
@@ -1091,14 +1106,23 @@ def get_bom_with_tools_with_component_and_service_migrate() -> Bom:
10911106
metadata=BomMetaData(
10921107
tools=ToolsRepository(
10931108
components=(
1094-
Component(type=ComponentType.APPLICATION, group='adobe',
1095-
name='test-component', version='1.2.3', bom_ref='test-component'),
1096-
Component(type=ComponentType.APPLICATION, group='acme',
1097-
name='other-component', bom_ref='other-component'),
1109+
Component(name='test-component', bom_ref='test-component'),
1110+
Component(type=ComponentType.APPLICATION,
1111+
bom_ref='other-component',
1112+
group='acme',
1113+
name='other-component',
1114+
hashes=[HashType.from_composite_str(
1115+
'sha256:49b420bd8d8182542a76d4422e0c7890dcc88a3d8ddad04da06366d8c40ac8ca')],
1116+
external_references=[get_external_reference_1()],
1117+
),
10981118
),
10991119
services=(
11001120
Service(name='test-service', bom_ref='test-service'),
1101-
Service(name='other-service', bom_ref='other-service'),
1121+
Service(group='acme',
1122+
name='other-service',
1123+
bom_ref='other-service',
1124+
external_references=[get_external_reference_1()],
1125+
),
11021126
)
11031127
)
11041128
)
@@ -1110,9 +1134,35 @@ def get_bom_with_tools_with_component_and_service_and_tools_migrate() -> Bom:
11101134
tcomp = tools.components
11111135
tserv = tools.services
11121136
ttools = tools.tools
1113-
tcomp.add(Component(type=ComponentType.APPLICATION, name='test-component', version='1.2.3'))
1114-
tserv.add(Service(name='test-service', bom_ref='my-service'))
1115-
ttools.add(Tool(name='test-tool', version='1.33.7'))
1137+
tcomp.update((
1138+
Component(name='test-component', bom_ref='test-component'),
1139+
Component(type=ComponentType.APPLICATION,
1140+
bom_ref='other-component',
1141+
group='acme',
1142+
name='other-component',
1143+
hashes=[HashType.from_composite_str(
1144+
'sha256:49b420bd8d8182542a76d4422e0c7890dcc88a3d8ddad04da06366d8c40ac8ca')],
1145+
external_references=[get_external_reference_1()],
1146+
),
1147+
))
1148+
tserv.update((
1149+
Service(name='test-service', bom_ref='test-service'),
1150+
Service(group='acme',
1151+
name='other-service',
1152+
bom_ref='other-service',
1153+
external_references=[get_external_reference_1()],
1154+
),
1155+
))
1156+
ttools.update((
1157+
Tool(name='test-tool-b'),
1158+
Tool(vendor='example',
1159+
name='test-tool-a',
1160+
version='1.33.7',
1161+
hashes=[HashType.from_composite_str(
1162+
'sha256:adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6')],
1163+
external_references=[get_external_reference_1()],
1164+
),
1165+
))
11161166
return _make_bom(metadata=BomMetaData(tools=tools))
11171167

11181168

‎tests/_data/snapshots/get_bom_with_tools-1.2.json.bin

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@
33
"timestamp": "2023-01-07T13:44:32.312678+00:00",
44
"tools": [
55
{
6+
"hashes": [
7+
{
8+
"alg": "SHA-256",
9+
"content": "adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6"
10+
}
11+
],
612
"name": "test-tool-a",
7-
"version": "23.42"
13+
"vendor": "example",
14+
"version": "1.33.7"
815
},
916
{
10-
"name": "test-tool-b",
11-
"version": "1.33.7"
17+
"name": "test-tool-b"
1218
}
1319
]
1420
},

‎tests/_data/snapshots/get_bom_with_tools-1.2.xml.bin

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
<timestamp>2023-01-07T13:44:32.312678+00:00</timestamp>
55
<tools>
66
<tool>
7+
<vendor>example</vendor>
78
<name>test-tool-a</name>
8-
<version>23.42</version>
9+
<version>1.33.7</version>
10+
<hashes>
11+
<hash alg="SHA-256">adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6</hash>
12+
</hashes>
913
</tool>
1014
<tool>
1115
<name>test-tool-b</name>
12-
<version>1.33.7</version>
1316
</tool>
1417
</tools>
1518
</metadata>

‎tests/_data/snapshots/get_bom_with_tools-1.3.json.bin

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@
33
"timestamp": "2023-01-07T13:44:32.312678+00:00",
44
"tools": [
55
{
6+
"hashes": [
7+
{
8+
"alg": "SHA-256",
9+
"content": "adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6"
10+
}
11+
],
612
"name": "test-tool-a",
7-
"version": "23.42"
13+
"vendor": "example",
14+
"version": "1.33.7"
815
},
916
{
10-
"name": "test-tool-b",
11-
"version": "1.33.7"
17+
"name": "test-tool-b"
1218
}
1319
]
1420
},

‎tests/_data/snapshots/get_bom_with_tools-1.3.xml.bin

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
<timestamp>2023-01-07T13:44:32.312678+00:00</timestamp>
55
<tools>
66
<tool>
7+
<vendor>example</vendor>
78
<name>test-tool-a</name>
8-
<version>23.42</version>
9+
<version>1.33.7</version>
10+
<hashes>
11+
<hash alg="SHA-256">adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6</hash>
12+
</hashes>
913
</tool>
1014
<tool>
1115
<name>test-tool-b</name>
12-
<version>1.33.7</version>
1316
</tool>
1417
</tools>
1518
</metadata>

‎tests/_data/snapshots/get_bom_with_tools-1.4.json.bin

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,31 @@
33
"timestamp": "2023-01-07T13:44:32.312678+00:00",
44
"tools": [
55
{
6+
"externalReferences": [
7+
{
8+
"comment": "No comment",
9+
"hashes": [
10+
{
11+
"alg": "SHA-256",
12+
"content": "806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"
13+
}
14+
],
15+
"type": "distribution",
16+
"url": "https://cyclonedx.org"
17+
}
18+
],
19+
"hashes": [
20+
{
21+
"alg": "SHA-256",
22+
"content": "adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6"
23+
}
24+
],
625
"name": "test-tool-a",
7-
"version": "23.42"
26+
"vendor": "example",
27+
"version": "1.33.7"
828
},
929
{
10-
"name": "test-tool-b",
11-
"version": "1.33.7"
30+
"name": "test-tool-b"
1231
}
1332
]
1433
},

‎tests/_data/snapshots/get_bom_with_tools-1.4.xml.bin

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@
44
<timestamp>2023-01-07T13:44:32.312678+00:00</timestamp>
55
<tools>
66
<tool>
7+
<vendor>example</vendor>
78
<name>test-tool-a</name>
8-
<version>23.42</version>
9+
<version>1.33.7</version>
10+
<hashes>
11+
<hash alg="SHA-256">adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6</hash>
12+
</hashes>
13+
<externalReferences>
14+
<reference type="distribution">
15+
<url>https://cyclonedx.org</url>
16+
<comment>No comment</comment>
17+
<hashes>
18+
<hash alg="SHA-256">806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b</hash>
19+
</hashes>
20+
</reference>
21+
</externalReferences>
922
</tool>
1023
<tool>
1124
<name>test-tool-b</name>
12-
<version>1.33.7</version>
1325
</tool>
1426
</tools>
1527
</metadata>

‎tests/_data/snapshots/get_bom_with_tools-1.5.json.bin

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,31 @@
33
"timestamp": "2023-01-07T13:44:32.312678+00:00",
44
"tools": [
55
{
6+
"externalReferences": [
7+
{
8+
"comment": "No comment",
9+
"hashes": [
10+
{
11+
"alg": "SHA-256",
12+
"content": "806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"
13+
}
14+
],
15+
"type": "distribution",
16+
"url": "https://cyclonedx.org"
17+
}
18+
],
19+
"hashes": [
20+
{
21+
"alg": "SHA-256",
22+
"content": "adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6"
23+
}
24+
],
625
"name": "test-tool-a",
7-
"version": "23.42"
26+
"vendor": "example",
27+
"version": "1.33.7"
828
},
929
{
10-
"name": "test-tool-b",
11-
"version": "1.33.7"
30+
"name": "test-tool-b"
1231
}
1332
]
1433
},

‎tests/_data/snapshots/get_bom_with_tools-1.5.xml.bin

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@
44
<timestamp>2023-01-07T13:44:32.312678+00:00</timestamp>
55
<tools>
66
<tool>
7+
<vendor>example</vendor>
78
<name>test-tool-a</name>
8-
<version>23.42</version>
9+
<version>1.33.7</version>
10+
<hashes>
11+
<hash alg="SHA-256">adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6</hash>
12+
</hashes>
13+
<externalReferences>
14+
<reference type="distribution">
15+
<url>https://cyclonedx.org</url>
16+
<comment>No comment</comment>
17+
<hashes>
18+
<hash alg="SHA-256">806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b</hash>
19+
</hashes>
20+
</reference>
21+
</externalReferences>
922
</tool>
1023
<tool>
1124
<name>test-tool-b</name>
12-
<version>1.33.7</version>
1325
</tool>
1426
</tools>
1527
</metadata>

‎tests/_data/snapshots/get_bom_with_tools-1.6.json.bin

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,31 @@
33
"timestamp": "2023-01-07T13:44:32.312678+00:00",
44
"tools": [
55
{
6+
"externalReferences": [
7+
{
8+
"comment": "No comment",
9+
"hashes": [
10+
{
11+
"alg": "SHA-256",
12+
"content": "806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"
13+
}
14+
],
15+
"type": "distribution",
16+
"url": "https://cyclonedx.org"
17+
}
18+
],
19+
"hashes": [
20+
{
21+
"alg": "SHA-256",
22+
"content": "adbbbe72c8f023b4a2d96a3978f69d94873ab2fef424e0298287c3368519c1a6"
23+
}
24+
],
625
"name": "test-tool-a",
7-
"version": "23.42"
26+
"vendor": "example",
27+
"version": "1.33.7"
828
},
929
{
10-
"name": "test-tool-b",
11-
"version": "1.33.7"
30+
"name": "test-tool-b"
1231
}
1332
]
1433
},

0 commit comments

Comments
 (0)