diff options
Diffstat (limited to 'tvsaver')
-rw-r--r-- | tvsaver/saver2v2/save_document_test.go | 20 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_file_test.go | 20 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_package_test.go | 32 |
3 files changed, 34 insertions, 38 deletions
diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go index 3656504..e6674a1 100644 --- a/tvsaver/saver2v2/save_document_test.go +++ b/tvsaver/saver2v2/save_document_test.go @@ -29,9 +29,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { f1 := &spdx.File2_2{ FileName: "/tmp/whatever1.txt", FileSPDXIdentifier: spdx.ElementID("File1231"), - // FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, @@ -44,9 +43,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { f2 := &spdx.File2_2{ FileName: "/tmp/whatever2.txt", FileSPDXIdentifier: spdx.ElementID("File1232"), - // FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983d", }, @@ -83,9 +81,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { f3 := &spdx.File2_2{ FileName: "/tmp/file-with-snippets.txt", FileSPDXIdentifier: spdx.ElementID("FileHasSnippets"), - // FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983e", - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983e", }, @@ -107,9 +104,8 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { f4 := &spdx.File2_2{ FileName: "/tmp/another-file.txt", FileSPDXIdentifier: spdx.ElementID("FileAnother"), - // FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983f", - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983f", }, diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go index 0ee8374..070efc6 100644 --- a/tvsaver/saver2v2/save_file_test.go +++ b/tvsaver/saver2v2/save_file_test.go @@ -18,16 +18,16 @@ func TestSaver2_2FileSavesText(t *testing.T) { "TEXT", "DOCUMENTATION", }, - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, - spdx.SHA256: spdx.Checksum2_2{ + spdx.SHA256: spdx.Checksum{ Algorithm: spdx.SHA256, Value: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", }, - spdx.MD5: spdx.Checksum2_2{ + spdx.MD5: spdx.Checksum{ Algorithm: spdx.MD5, Value: "624c1abb3664f4b35547e7c73864ad24", }, @@ -145,8 +145,8 @@ func TestSaver2_2FileSavesSnippetsAlso(t *testing.T) { f := &spdx.File2_2{ FileName: "/tmp/whatever.txt", FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, @@ -200,8 +200,8 @@ func TestSaver2_2FileOmitsOptionalFieldsIfEmpty(t *testing.T) { f := &spdx.File2_2{ FileName: "/tmp/whatever.txt", FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, @@ -242,8 +242,8 @@ func TestSaver2_2FileWrapsCopyrightMultiLine(t *testing.T) { f := &spdx.File2_2{ FileName: "/tmp/whatever.txt", FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go index 8a10d02..bfca9e0 100644 --- a/tvsaver/saver2v2/save_package_test.go +++ b/tvsaver/saver2v2/save_package_test.go @@ -59,16 +59,16 @@ func TestSaver2_2PackageSavesTextCombo1(t *testing.T) { IsFilesAnalyzedTagPresent: true, PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", PackageVerificationCodeExcludedFile: "p1-0.1.0.spdx", - PackageChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + PackageChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, - spdx.SHA256: spdx.Checksum2_2{ + spdx.SHA256: spdx.Checksum{ Algorithm: spdx.SHA256, Value: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", }, - spdx.MD5: spdx.Checksum2_2{ + spdx.MD5: spdx.Checksum{ Algorithm: spdx.MD5, Value: "624c1abb3664f4b35547e7c73864ad24", }, @@ -162,16 +162,16 @@ func TestSaver2_2PackageSavesTextCombo2(t *testing.T) { FilesAnalyzed: true, IsFilesAnalyzedTagPresent: false, PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + PackageChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, - spdx.SHA256: spdx.Checksum2_2{ + spdx.SHA256: spdx.Checksum{ Algorithm: spdx.SHA256, Value: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", }, - spdx.MD5: spdx.Checksum2_2{ + spdx.MD5: spdx.Checksum{ Algorithm: spdx.MD5, Value: "624c1abb3664f4b35547e7c73864ad24", }, @@ -255,16 +255,16 @@ func TestSaver2_2PackageSavesTextCombo3(t *testing.T) { // NOTE that verification code MUST be omitted from output // since FilesAnalyzed is false PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + PackageChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, - spdx.SHA256: spdx.Checksum2_2{ + spdx.SHA256: spdx.Checksum{ Algorithm: spdx.SHA256, Value: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", }, - spdx.MD5: spdx.Checksum2_2{ + spdx.MD5: spdx.Checksum{ Algorithm: spdx.MD5, Value: "624c1abb3664f4b35547e7c73864ad24", }, @@ -386,8 +386,8 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) { f1 := &spdx.File2_2{ FileName: "/tmp/whatever1.txt", FileSPDXIdentifier: spdx.ElementID("File1231"), - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, @@ -401,8 +401,8 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) { f2 := &spdx.File2_2{ FileName: "/tmp/whatever2.txt", FileSPDXIdentifier: spdx.ElementID("File1232"), - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: "85ed0817af83a24ad8da68c2b5094de69833983d", }, |