Skip to content

Commit 5f985e2

Browse files
tdrueztdruez
committed
Fix unit tests following the documentDescribes refactoring
Signed-off-by: tdruez <[email protected]>
1 parent 45e54ab commit 5f985e2

File tree

4 files changed

+69
-20
lines changed

4 files changed

+69
-20
lines changed

‎scanpipe/tests/data/asgiref/asgiref-3.3.0.spdx.json‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"SPDXID": "SPDXRef-DOCUMENT-804c3391-e6f9-415f-bb7a-cb6653853a46",
55
"name": "scancodeio_asgiref",
66
"documentNamespace": "https://scancode.io/spdxdocs/804c3391-e6f9-415f-bb7a-cb6653853a46",
7+
"documentDescribes": [
8+
"SPDXRef-scancodeio-project-804c3391-e6f9-415f-bb7a-cb6653853a46"
9+
],
710
"creationInfo": {
811
"created": "2000-01-01T01:02:03Z",
912
"creators": [
@@ -12,6 +15,15 @@
1215
"licenseListVersion": "3.20"
1316
},
1417
"packages": [
18+
{
19+
"name": "asgiref",
20+
"SPDXID": "SPDXRef-scancodeio-project-804c3391-e6f9-415f-bb7a-cb6653853a46",
21+
"downloadLocation": "NOASSERTION",
22+
"licenseConcluded": "NOASSERTION",
23+
"copyrightText": "NOASSERTION",
24+
"filesAnalyzed": true,
25+
"licenseDeclared": "NOASSERTION"
26+
},
1527
{
1628
"name": "asgiref",
1729
"SPDXID": "SPDXRef-scancodeio-discoveredpackage-9d0bdc32-1117-407a-9908-08d3558dc739",
@@ -115,16 +127,18 @@
115127
]
116128
}
117129
],
118-
"documentDescribes": [
119-
"SPDXRef-scancodeio-discoveredpackage-9d0bdc32-1117-407a-9908-08d3558dc739",
120-
"SPDXRef-scancodeio-discoveredpackage-7969de5e-5589-4441-bffa-a60e12b43280",
121-
"SPDXRef-scancodeio-discovereddependency-4cff8bf8-197c-4698-a43a-5c793586c780",
122-
"SPDXRef-scancodeio-discovereddependency-4c5c1313-3850-4f81-ac27-8d496080d667",
123-
"SPDXRef-scancodeio-discovereddependency-f983278c-22f1-43e1-ba2b-a020d659531b",
124-
"SPDXRef-scancodeio-discovereddependency-98aeddb5-b81a-43d4-ac56-dc873a589fdf"
125-
],
126130
"files": [],
127131
"relationships": [
132+
{
133+
"spdxElementId": "SPDXRef-scancodeio-project-804c3391-e6f9-415f-bb7a-cb6653853a46",
134+
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-9d0bdc32-1117-407a-9908-08d3558dc739",
135+
"relationshipType": "DEPENDS_ON"
136+
},
137+
{
138+
"spdxElementId": "SPDXRef-scancodeio-project-804c3391-e6f9-415f-bb7a-cb6653853a46",
139+
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-7969de5e-5589-4441-bffa-a60e12b43280",
140+
"relationshipType": "DEPENDS_ON"
141+
},
128142
{
129143
"spdxElementId": "SPDXRef-scancodeio-discovereddependency-4cff8bf8-197c-4698-a43a-5c793586c780",
130144
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-9d0bdc32-1117-407a-9908-08d3558dc739",

‎scanpipe/tests/data/spdx/dependencies.spdx.json‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"SPDXID": "SPDXRef-DOCUMENT-b74fe5df-e965-415e-ba65-f38421a0695d",
55
"name": "scancodeio_analysis",
66
"documentNamespace": "https://scancode.io/spdxdocs/b74fe5df-e965-415e-ba65-f38421a0695d",
7+
"documentDescribes": [
8+
"SPDXRef-scancodeio-project-b74fe5df-e965-415e-ba65-f38421a0695d"
9+
],
710
"creationInfo": {
811
"created": "2000-01-01T01:02:03Z",
912
"creators": [
@@ -12,6 +15,15 @@
1215
"licenseListVersion": "3.20"
1316
},
1417
"packages": [
18+
{
19+
"name": "Analysis",
20+
"SPDXID": "SPDXRef-scancodeio-project-b74fe5df-e965-415e-ba65-f38421a0695d",
21+
"downloadLocation": "NOASSERTION",
22+
"licenseConcluded": "NOASSERTION",
23+
"copyrightText": "NOASSERTION",
24+
"filesAnalyzed": true,
25+
"licenseDeclared": "NOASSERTION"
26+
},
1527
{
1628
"name": "a",
1729
"SPDXID": "SPDXRef-scancodeio-discoveredpackage-a83a60de-81bc-4bf4-b48c-dc78e0e658a9",
@@ -83,14 +95,22 @@
8395
]
8496
}
8597
],
86-
"documentDescribes": [
87-
"SPDXRef-scancodeio-discoveredpackage-a83a60de-81bc-4bf4-b48c-dc78e0e658a9",
88-
"SPDXRef-scancodeio-discoveredpackage-81147701-285f-485c-ba36-9cd3742790b1",
89-
"SPDXRef-scancodeio-discoveredpackage-e391c33e-d7d0-4a97-a3c3-e947375c53d5",
90-
"SPDXRef-scancodeio-discovereddependency-d0e1eab2-9b8b-449b-b9d1-12147ffdd8a8",
91-
"SPDXRef-scancodeio-discovereddependency-29fbe562-a191-44b4-88e8-a9678071ecee"
92-
],
9398
"relationships": [
99+
{
100+
"spdxElementId": "SPDXRef-scancodeio-project-b74fe5df-e965-415e-ba65-f38421a0695d",
101+
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-a83a60de-81bc-4bf4-b48c-dc78e0e658a9",
102+
"relationshipType": "DEPENDS_ON"
103+
},
104+
{
105+
"spdxElementId": "SPDXRef-scancodeio-project-b74fe5df-e965-415e-ba65-f38421a0695d",
106+
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-81147701-285f-485c-ba36-9cd3742790b1",
107+
"relationshipType": "DEPENDS_ON"
108+
},
109+
{
110+
"spdxElementId": "SPDXRef-scancodeio-project-b74fe5df-e965-415e-ba65-f38421a0695d",
111+
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-e391c33e-d7d0-4a97-a3c3-e947375c53d5",
112+
"relationshipType": "DEPENDS_ON"
113+
},
94114
{
95115
"spdxElementId": "SPDXRef-scancodeio-discoveredpackage-81147701-285f-485c-ba36-9cd3742790b1",
96116
"relatedSpdxElement": "SPDXRef-scancodeio-discoveredpackage-a83a60de-81bc-4bf4-b48c-dc78e0e658a9",

‎scanpipe/tests/pipes/test_output.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,8 @@ def test_scanpipe_pipes_outputs_to_spdx_dependencies(self, mock_uuid4):
507507

508508
output_file = output.to_spdx(project=project)
509509
results_json = json.loads(output_file.read_text())
510-
self.assertEqual(5, len(results_json["packages"]))
511-
self.assertEqual(3, len(results_json["relationships"]))
510+
self.assertEqual(6, len(results_json["packages"]))
511+
self.assertEqual(6, len(results_json["relationships"]))
512512

513513
# Patch the `created` date and tool version
514514
results_json["creationInfo"]["created"] = "2000-01-01T01:02:03Z"

‎scanpipe/tests/pipes/test_spdx.py‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ def setUp(self):
9090
"https://license1.homepage",
9191
],
9292
}
93+
self.project_as_root_package_data = {
94+
"spdx_id": "SPDXRef-project",
95+
"name": "Project",
96+
}
9397
self.package_data = {
9498
"spdx_id": "SPDXRef-package1",
9599
"name": "lxml",
@@ -170,7 +174,9 @@ def setUp(self):
170174
"name": "Document name",
171175
"namespace": "https://[CreatorWebsite]/[DocumentName]-[UUID]",
172176
"creation_info": spdx.CreationInfo(**self.creation_info_data),
177+
"describes": [self.project_as_root_package_data["spdx_id"]],
173178
"packages": [
179+
spdx.Package(**self.project_as_root_package_data),
174180
spdx.Package(**self.package_data),
175181
],
176182
"extracted_licenses": [
@@ -190,6 +196,7 @@ def setUp(self):
190196
"SPDXID": "SPDXRef-DOCUMENT",
191197
"name": "document_name",
192198
"documentNamespace": "https://[CreatorWebsite]/[DocumentName]-[UUID]",
199+
"documentDescribes": ["SPDXRef-project"],
193200
"creationInfo": {
194201
"created": "2022-09-21T13:50:20Z",
195202
"creators": [
@@ -201,6 +208,15 @@ def setUp(self):
201208
"comment": "Generated with SPDXCode",
202209
},
203210
"packages": [
211+
{
212+
"name": "Project",
213+
"SPDXID": "SPDXRef-project",
214+
"downloadLocation": "NOASSERTION",
215+
"licenseConcluded": "NOASSERTION",
216+
"copyrightText": "NOASSERTION",
217+
"filesAnalyzed": False,
218+
"licenseDeclared": "NOASSERTION",
219+
},
204220
{
205221
"name": "lxml",
206222
"SPDXID": "SPDXRef-package1",
@@ -228,7 +244,7 @@ def setUp(self):
228244
"referenceLocator": "pkg:pypi/[email protected]",
229245
}
230246
],
231-
}
247+
},
232248
],
233249
"files": [
234250
{
@@ -247,7 +263,6 @@ def setUp(self):
247263
"licenseComments": "license_comments",
248264
}
249265
],
250-
"documentDescribes": ["SPDXRef-package1"],
251266
"hasExtractedLicensingInfos": [
252267
{
253268
"licenseId": "LicenseRef-1",
@@ -353,7 +368,7 @@ def test_spdx_relationship_from_data(self):
353368

354369
def test_spdx_document_as_dict(self):
355370
document = spdx.Document(**self.document_data)
356-
assert self.document_spdx_data == document.as_dict()
371+
assert self.document_spdx_data == document.as_dict(), document.as_dict()
357372

358373
def test_spdx_relationship_is_dependency_relationship_property(self):
359374
relationship = spdx.Relationship.from_data(self.relationship_spdx_data)

0 commit comments

Comments
 (0)