diff options
author | Adolfo García Veytia (Puerco) <puerco@chainguard.dev> | 2022-11-30 20:18:33 -0600 |
---|---|---|
committer | Adolfo García Veytia (Puerco) <puerco@chainguard.dev> | 2022-12-05 18:35:28 -0600 |
commit | f843a8c045007f7e1424c68fae0cfa0e0eff23d3 (patch) | |
tree | 8007f8a629ad9887b5c4013b5b995c36639f9bf6 | |
parent | 1180c790fdb13d248d45b8f0a78407b569889966 (diff) | |
download | spdx-tools-f843a8c045007f7e1424c68fae0cfa0e0eff23d3.tar.gz |
Update tests to support all algorithms
Signed-off-by: Adolfo García Veytia (Puerco) <puerco@chainguard.dev>
-rw-r--r-- | rdfloader/parser2v2/parse_file_test.go | 4 | ||||
-rw-r--r-- | rdfloader/parser2v2/parse_package_test.go | 2 | ||||
-rw-r--r-- | rdfloader/parser2v3/parse_file_test.go | 4 | ||||
-rw-r--r-- | rdfloader/parser2v3/parse_package_test.go | 2 | ||||
-rw-r--r-- | tvloader/parser2v3/parse_file_test.go | 2 | ||||
-rw-r--r-- | tvloader/parser2v3/parse_package_test.go | 1 |
6 files changed, 9 insertions, 6 deletions
diff --git a/rdfloader/parser2v2/parse_file_test.go b/rdfloader/parser2v2/parse_file_test.go index 2509351..0383cd9 100644 --- a/rdfloader/parser2v2/parse_file_test.go +++ b/rdfloader/parser2v2/parse_file_test.go @@ -315,7 +315,7 @@ func Test_rdfParser2_2_setFileChecksumFromNode(t *testing.T) { // TestCase 6: valid checksum algorithm which is invalid for file (like md4, md6, sha384, etc.) parser, _ = parserFromBodyContent(` <spdx:Checksum> - <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha384" /> + <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha2000" /> <spdx:checksumValue>d2356e0fe1c0b85285d83c6b2ad51b5f</spdx:checksumValue> </spdx:Checksum> `) @@ -355,7 +355,7 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { <spdx:File rdf:about="http://anupam-VirtualBox/repo/SPDX2_time-1.9.tar.gz_1535120734-spdx.rdf#SPDXRef-item177"> <spdx:checksum> <spdx:Checksum> - <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha384" /> + <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha2000" /> <spdx:checksumValue>0a3a0e1ab72b7c132f5021c538a7a3ea6d539bcd</spdx:checksumValue> </spdx:Checksum> </spdx:checksum> diff --git a/rdfloader/parser2v2/parse_package_test.go b/rdfloader/parser2v2/parse_package_test.go index 0e01dbe..f458984 100644 --- a/rdfloader/parser2v2/parse_package_test.go +++ b/rdfloader/parser2v2/parse_package_test.go @@ -607,7 +607,7 @@ func Test_rdfParser2_2_setPackageChecksum(t *testing.T) { parser, _ = parserFromBodyContent(` <spdx:Checksum> <spdx:checksumValue>2fd4e1c67a2d28fced849ee1bb76e7391b93eb12</spdx:checksumValue> - <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha384"/> + <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha2000"/> </spdx:Checksum> `) pkg = &v2_2.Package{} diff --git a/rdfloader/parser2v3/parse_file_test.go b/rdfloader/parser2v3/parse_file_test.go index 3ea79bb..f7348ef 100644 --- a/rdfloader/parser2v3/parse_file_test.go +++ b/rdfloader/parser2v3/parse_file_test.go @@ -315,7 +315,7 @@ func Test_rdfParser2_3_setFileChecksumFromNode(t *testing.T) { // TestCase 6: valid checksum algorithm which is invalid for file (like md4, md6, sha384, etc.) parser, _ = parserFromBodyContent(` <spdx:Checksum> - <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha384" /> + <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha2000" /> <spdx:checksumValue>d2356e0fe1c0b85285d83c6b2ad51b5f</spdx:checksumValue> </spdx:Checksum> `) @@ -355,7 +355,7 @@ func Test_rdfParser2_3_getFileFromNode(t *testing.T) { <spdx:File rdf:about="http://anupam-VirtualBox/repo/SPDX2_time-1.9.tar.gz_1535120734-spdx.rdf#SPDXRef-item177"> <spdx:checksum> <spdx:Checksum> - <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha384" /> + <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha2000" /> <spdx:checksumValue>0a3a0e1ab72b7c132f5021c538a7a3ea6d539bcd</spdx:checksumValue> </spdx:Checksum> </spdx:checksum> diff --git a/rdfloader/parser2v3/parse_package_test.go b/rdfloader/parser2v3/parse_package_test.go index cdaaced..23be653 100644 --- a/rdfloader/parser2v3/parse_package_test.go +++ b/rdfloader/parser2v3/parse_package_test.go @@ -627,7 +627,7 @@ func Test_rdfParser2_3_setPackageChecksum(t *testing.T) { parser, _ = parserFromBodyContent(` <spdx:Checksum> <spdx:checksumValue>2fd4e1c67a2d28fced849ee1bb76e7391b93eb12</spdx:checksumValue> - <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha384"/> + <spdx:algorithm rdf:resource="http://spdx.org/rdf/terms#checksumAlgorithm_sha2000"/> </spdx:Checksum> `) pkg = &v2_3.Package{} diff --git a/tvloader/parser2v3/parse_file_test.go b/tvloader/parser2v3/parse_file_test.go index 1f4fadb..f158baf 100644 --- a/tvloader/parser2v3/parse_file_test.go +++ b/tvloader/parser2v3/parse_file_test.go @@ -431,6 +431,7 @@ func TestParser2_3CanParseFileTags(t *testing.T) { "SHA1": "85ed0817af83a24ad8da68c2b5094de69833983c", "SHA256": "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", "SHA512": "4ced3267f5ed38df65ceebc43e97aa6c2948cc7ef3288c2e5074e7df7fab544cc93339604513ea5f65616f9ed1c48581465043c8a9b693ef20fd4fddaf25e1b9", + "BLAKE3": "981d32ed7aad9e408c5c36f6346c915ba11c2bd8b3e7d44902a11d7a141abdd9", } for algo, tc := range testChecksums { @@ -448,6 +449,7 @@ func TestParser2_3CanParseFileTags(t *testing.T) { ) } } + // Concluded License err = parser.parsePairFromFile2_3("LicenseConcluded", "Apache-2.0 OR GPL-2.0-or-later") if err != nil { diff --git a/tvloader/parser2v3/parse_package_test.go b/tvloader/parser2v3/parse_package_test.go index c33e461..c5f09af 100644 --- a/tvloader/parser2v3/parse_package_test.go +++ b/tvloader/parser2v3/parse_package_test.go @@ -341,6 +341,7 @@ func TestParser2_3CanParsePackageTags(t *testing.T) { "SHA1": "85ed0817af83a24ad8da68c2b5094de69833983c", "SHA256": "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", "SHA512": "4ced3267f5ed38df65ceebc43e97aa6c2948cc7ef3288c2e5074e7df7fab544cc93339604513ea5f65616f9ed1c48581465043c8a9b693ef20fd4fddaf25e1b9", + "BLAKE3": "981d32ed7aad9e408c5c36f6346c915ba11c2bd8b3e7d44902a11d7a141abdd9", } for algo, tc := range testChecksums { |