Skip to content

Commit df96070

Browse files
committed
chore: update test snapshots
Signed-off-by: MTsfoni <[email protected]>
1 parent 69306fe commit df96070

File tree

4 files changed

+14
-48
lines changed

4 files changed

+14
-48
lines changed

tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</authors>
2121
<properties>
2222
<property name="spdx:spdxid">SPDXRef-DOCUMENT</property>
23-
<property name="spdx:document:spdx-version">SPDX-2.2</property>
23+
<property name="spdx:document:spdx-version">SPDX-2.3</property>
2424
<property name="spdx:comment">This document was created using CycloneDX.Spdx 2.0 using licenses from the web site.</property>
2525
<property name="spdx:document:name">SPDX-Tools-v2.0</property>
2626
<property name="spdx:document:document-namespace">http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301</property>

tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</authors>
2121
<properties>
2222
<property name="spdx:spdxid">SPDXRef-DOCUMENT</property>
23-
<property name="spdx:document:spdx-version">SPDX-2.2</property>
23+
<property name="spdx:document:spdx-version">SPDX-2.3</property>
2424
<property name="spdx:comment">This document was created using CycloneDX.Spdx 2.0 using licenses from the web site.</property>
2525
<property name="spdx:document:name">SPDX-Tools-v2.0</property>
2626
<property name="spdx:document:document-namespace">http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301</property>

tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertToSpdxJson_autodetect.snap

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SPDXID": "SPDXRef-DOCUMENT",
3-
"spdxVersion": "SPDX-2.2",
3+
"spdxVersion": "SPDX-2.3",
44
"creationInfo": {
55
"comment": "This package has been shipped in source and binary form.\nThe binaries were created with gcc 4.5.1 and expect to link to\ncompatible system run time libraries.",
66
"created": "2010-01-29T18:30:22Z",
@@ -54,11 +54,11 @@
5454
"comment": "Another example reviewer."
5555
}
5656
],
57-
"documentNamespace": "http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301",
5857
"documentDescribes": [
5958
"SPDXRef-File",
6059
"SPDXRef-Package"
6160
],
61+
"documentNamespace": "http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301",
6262
"packages": [
6363
{
6464
"SPDXID": "SPDXRef-Package",
@@ -122,29 +122,22 @@
122122
],
123123
"packageVerificationCodeValue": "d6a770ba38583ed4bb4525bd96e50461655d2758"
124124
},
125+
"primaryPackagePurpose": "LIBRARY",
125126
"sourceInfo": "uses glibc-2_11-branch from git://sourceware.org/git/glibc.git.",
126127
"summary": "GNU C library.",
127128
"supplier": "Person: Jane Doe ([email protected])",
128129
"versionInfo": "2.11.1"
129130
},
130131
{
131132
"SPDXID": "SPDXRef-fromDoap-1",
132-
"copyrightText": "NOASSERTION",
133133
"downloadLocation": "NOASSERTION",
134134
"filesAnalyzed": false,
135135
"homepage": "http://commons.apache.org/proper/commons-lang/",
136-
"licenseConcluded": "NOASSERTION",
137-
"licenseDeclared": "NOASSERTION",
138-
"licenseInfoFromFiles": [
139-
"NOASSERTION"
140-
],
141136
"name": "Apache Commons Lang",
142-
"originator": "NOASSERTION",
143-
"supplier": "NOASSERTION"
137+
"primaryPackagePurpose": "LIBRARY"
144138
},
145139
{
146140
"SPDXID": "SPDXRef-fromDoap-0",
147-
"copyrightText": "NOASSERTION",
148141
"downloadLocation": "https://search.maven.org/remotecontent?filepath=org/apache/jena/apache-jena/3.12.0/apache-jena-3.12.0.tar.gz",
149142
"externalRefs": [
150143
{
@@ -155,14 +148,8 @@
155148
],
156149
"filesAnalyzed": false,
157150
"homepage": "http://www.openjena.org/",
158-
"licenseConcluded": "NOASSERTION",
159-
"licenseDeclared": "NOASSERTION",
160-
"licenseInfoFromFiles": [
161-
"NOASSERTION"
162-
],
163151
"name": "Jena",
164-
"originator": "NOASSERTION",
165-
"supplier": "NOASSERTION",
152+
"primaryPackagePurpose": "LIBRARY",
166153
"versionInfo": "3.12.0"
167154
},
168155
{
@@ -181,13 +168,9 @@
181168
"licenseComments": "Other versions available for a commercial license",
182169
"licenseConcluded": "MPL-1.0",
183170
"licenseDeclared": "MPL-1.0",
184-
"licenseInfoFromFiles": [
185-
"NOASSERTION"
186-
],
187171
"name": "Saxon",
188-
"originator": "NOASSERTION",
189172
"packageFileName": "saxonB-8.8.zip",
190-
"supplier": "NOASSERTION",
173+
"primaryPackagePurpose": "LIBRARY",
191174
"versionInfo": "8.8"
192175
}
193176
],

tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertToSpdxJson_spdxjson.snap

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SPDXID": "SPDXRef-DOCUMENT",
3-
"spdxVersion": "SPDX-2.2",
3+
"spdxVersion": "SPDX-2.3",
44
"creationInfo": {
55
"comment": "This package has been shipped in source and binary form.\nThe binaries were created with gcc 4.5.1 and expect to link to\ncompatible system run time libraries.",
66
"created": "2010-01-29T18:30:22Z",
@@ -54,11 +54,11 @@
5454
"comment": "Another example reviewer."
5555
}
5656
],
57-
"documentNamespace": "http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301",
5857
"documentDescribes": [
5958
"SPDXRef-File",
6059
"SPDXRef-Package"
6160
],
61+
"documentNamespace": "http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301",
6262
"packages": [
6363
{
6464
"SPDXID": "SPDXRef-Package",
@@ -122,29 +122,22 @@
122122
],
123123
"packageVerificationCodeValue": "d6a770ba38583ed4bb4525bd96e50461655d2758"
124124
},
125+
"primaryPackagePurpose": "LIBRARY",
125126
"sourceInfo": "uses glibc-2_11-branch from git://sourceware.org/git/glibc.git.",
126127
"summary": "GNU C library.",
127128
"supplier": "Person: Jane Doe ([email protected])",
128129
"versionInfo": "2.11.1"
129130
},
130131
{
131132
"SPDXID": "SPDXRef-fromDoap-1",
132-
"copyrightText": "NOASSERTION",
133133
"downloadLocation": "NOASSERTION",
134134
"filesAnalyzed": false,
135135
"homepage": "http://commons.apache.org/proper/commons-lang/",
136-
"licenseConcluded": "NOASSERTION",
137-
"licenseDeclared": "NOASSERTION",
138-
"licenseInfoFromFiles": [
139-
"NOASSERTION"
140-
],
141136
"name": "Apache Commons Lang",
142-
"originator": "NOASSERTION",
143-
"supplier": "NOASSERTION"
137+
"primaryPackagePurpose": "LIBRARY"
144138
},
145139
{
146140
"SPDXID": "SPDXRef-fromDoap-0",
147-
"copyrightText": "NOASSERTION",
148141
"downloadLocation": "https://search.maven.org/remotecontent?filepath=org/apache/jena/apache-jena/3.12.0/apache-jena-3.12.0.tar.gz",
149142
"externalRefs": [
150143
{
@@ -155,14 +148,8 @@
155148
],
156149
"filesAnalyzed": false,
157150
"homepage": "http://www.openjena.org/",
158-
"licenseConcluded": "NOASSERTION",
159-
"licenseDeclared": "NOASSERTION",
160-
"licenseInfoFromFiles": [
161-
"NOASSERTION"
162-
],
163151
"name": "Jena",
164-
"originator": "NOASSERTION",
165-
"supplier": "NOASSERTION",
152+
"primaryPackagePurpose": "LIBRARY",
166153
"versionInfo": "3.12.0"
167154
},
168155
{
@@ -181,13 +168,9 @@
181168
"licenseComments": "Other versions available for a commercial license",
182169
"licenseConcluded": "MPL-1.0",
183170
"licenseDeclared": "MPL-1.0",
184-
"licenseInfoFromFiles": [
185-
"NOASSERTION"
186-
],
187171
"name": "Saxon",
188-
"originator": "NOASSERTION",
189172
"packageFileName": "saxonB-8.8.zip",
190-
"supplier": "NOASSERTION",
173+
"primaryPackagePurpose": "LIBRARY",
191174
"versionInfo": "8.8"
192175
}
193176
],

0 commit comments

Comments
 (0)