aboutsummaryrefslogtreecommitdiff
path: root/licensediff
diff options
context:
space:
mode:
authorspecter25 <ujjwalcoding012@gmail.com>2021-03-21 03:44:52 +0530
committerspecter25 <ujjwalcoding012@gmail.com>2021-03-21 03:44:52 +0530
commite62e0b5ac8d26d7cf76e185c62bf69fa5ddf6f11 (patch)
tree2b86e4241549f26981a3da50604539c361d4ceb5 /licensediff
parentaf976619f2cc0badd250fb12628a0ac42b5a18ca (diff)
downloadspdx-tools-e62e0b5ac8d26d7cf76e185c62bf69fa5ddf6f11.tar.gz
Change naming convention of checksum struct
- Change the name of Checksum struct so that it can be used by all spdx versions - Remove unnecessary commented code Signed-off-by: specter25 <ujjwalcoding012@gmail.com>
Diffstat (limited to 'licensediff')
-rw-r--r--licensediff/licensediff_test.go88
1 files changed, 35 insertions, 53 deletions
diff --git a/licensediff/licensediff_test.go b/licensediff/licensediff_test.go
index 26622f0..ec8b728 100644
--- a/licensediff/licensediff_test.go
+++ b/licensediff/licensediff_test.go
@@ -501,9 +501,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f1 := &spdx.File2_2{
FileName: "/project/file1.txt",
FileSPDXIdentifier: spdx.ElementID("File561"),
- // FileChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -520,9 +519,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f2 := &spdx.File2_2{
FileName: "/project/file2.txt",
FileSPDXIdentifier: spdx.ElementID("File562"),
- // FileChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -539,9 +537,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f3 := &spdx.File2_2{
FileName: "/project/file3.txt",
FileSPDXIdentifier: spdx.ElementID("File563"),
- // FileChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -559,9 +556,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f4_1 := &spdx.File2_2{
FileName: "/project/file4.txt",
FileSPDXIdentifier: spdx.ElementID("File564"),
- // FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -576,9 +572,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f4_2 := &spdx.File2_2{
FileName: "/project/file4.txt",
FileSPDXIdentifier: spdx.ElementID("File564"),
- // FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -596,9 +591,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f5_1 := &spdx.File2_2{
FileName: "/project/file5.txt",
FileSPDXIdentifier: spdx.ElementID("File565"),
- // FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -613,9 +607,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f5_2 := &spdx.File2_2{
FileName: "/project/file5.txt",
FileSPDXIdentifier: spdx.ElementID("File565"),
- // FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -633,9 +626,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f6_1 := &spdx.File2_2{
FileName: "/project/file6.txt",
FileSPDXIdentifier: spdx.ElementID("File566"),
- // FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -650,9 +642,8 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
f6_2 := &spdx.File2_2{
FileName: "/project/file6.txt",
FileSPDXIdentifier: spdx.ElementID("File566"),
- // FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -803,9 +794,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f1 := &spdx.File2_2{
FileName: "/project/file1.txt",
FileSPDXIdentifier: spdx.ElementID("File561"),
- // FileChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -822,9 +812,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f2 := &spdx.File2_2{
FileName: "/project/file2.txt",
FileSPDXIdentifier: spdx.ElementID("File562"),
- // FileChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -841,9 +830,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f3 := &spdx.File2_2{
FileName: "/project/file3.txt",
FileSPDXIdentifier: spdx.ElementID("File563"),
- // FileChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -861,9 +849,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f4_1 := &spdx.File2_2{
FileName: "/project/file4.txt",
FileSPDXIdentifier: spdx.ElementID("File564"),
- // FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -878,9 +865,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f4_2 := &spdx.File2_2{
FileName: "/project/file4.txt",
FileSPDXIdentifier: spdx.ElementID("File564"),
- // FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -898,8 +884,7 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f5_1 := &spdx.File2_2{
FileName: "/project/file5.txt",
FileSPDXIdentifier: spdx.ElementID("File565"),
- // FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000",
- LicenseConcluded: "BSD-3-Clause",
+ LicenseConcluded: "BSD-3-Clause",
LicenseInfoInFile: []string{
"NOASSERTION",
},
@@ -908,9 +893,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f5_2 := &spdx.File2_2{
FileName: "/project/file5.txt",
FileSPDXIdentifier: spdx.ElementID("File565"),
- // FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -928,9 +912,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f6_1 := &spdx.File2_2{
FileName: "/project/file6.txt",
FileSPDXIdentifier: spdx.ElementID("File566"),
- // FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
@@ -945,9 +928,8 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
f6_2 := &spdx.File2_2{
FileName: "/project/file6.txt",
FileSPDXIdentifier: spdx.ElementID("File566"),
- // FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d",
- 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: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 06:03:18 +0000