diff options
Diffstat (limited to 'licensediff/licensediff_test.go')
| -rw-r--r-- | licensediff/licensediff_test.go | 316 |
1 files changed, 159 insertions, 157 deletions
diff --git a/licensediff/licensediff_test.go b/licensediff/licensediff_test.go index 2142efc..1992cce 100644 --- a/licensediff/licensediff_test.go +++ b/licensediff/licensediff_test.go @@ -5,17 +5,19 @@ package licensediff import ( "testing" - "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/spdx/common" + "github.com/spdx/tools-golang/spdx/v2_1" + "github.com/spdx/tools-golang/spdx/v2_2" ) // ===== 2.1 License diff top-level function tests ===== func Test2_1DifferCanCreateDiffPairs(t *testing.T) { // create files to be used in diff // f1 will be identical in both - f1 := &spdx.File2_1{ + f1 := &v2_1.File{ FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - Checksums: []spdx.Checksum{{Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File561"), + Checksums: []common.Checksum{{Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", Algorithm: common.SHA1}}, LicenseConcluded: "Apache-2.0", LicenseInfoInFiles: []string{ "LicenseRef-We-will-ignore-LicenseInfoInFiles", @@ -24,10 +26,10 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { } // f2 will only appear in the first Package - f2 := &spdx.File2_1{ + f2 := &v2_1.File{ FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - Checksums: []spdx.Checksum{{Value: "066c5139bd9a43d15812ec1a1755b08ccf199824", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File562"), + Checksums: []common.Checksum{{Value: "066c5139bd9a43d15812ec1a1755b08ccf199824", Algorithm: common.SHA1}}, LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -36,10 +38,10 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { } // f3 will only appear in the second Package - f3 := &spdx.File2_1{ + f3 := &v2_1.File{ FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - Checksums: []spdx.Checksum{{Value: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File563"), + Checksums: []common.Checksum{{Value: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", Algorithm: common.SHA1}}, LicenseConcluded: "MPL-2.0", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -49,20 +51,20 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license - f4_1 := &spdx.File2_1{ + f4_1 := &v2_1.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: common.SHA1}}, LicenseConcluded: "MIT", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f4_2 := &spdx.File2_1{ + f4_2 := &v2_1.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: common.SHA1}}, LicenseConcluded: "Apache-2.0 AND MIT", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -72,20 +74,20 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license - f5_1 := &spdx.File2_1{ + f5_1 := &v2_1.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: common.SHA1}}, LicenseConcluded: "BSD-3-Clause", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f5_2 := &spdx.File2_1{ + f5_2 := &v2_1.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: common.SHA1}}, LicenseConcluded: "BSD-3-Clause", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -95,20 +97,20 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license - f6_1 := &spdx.File2_1{ + f6_1 := &v2_1.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: common.SHA1}}, LicenseConcluded: "CC0-1.0", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f6_2 := &spdx.File2_1{ + f6_2 := &v2_1.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: common.SHA1}}, LicenseConcluded: "Unlicense", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -117,21 +119,21 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { } // create Packages - p1 := &spdx.Package2_1{ + p1 := &v2_1.Package{ PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), + PackageSPDXIdentifier: common.ElementID("p1"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "abc123abc123"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "abc123abc123"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_1{ + Files: []*v2_1.File{ f1, f2, f4_1, @@ -139,21 +141,21 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { f6_1, }, } - p2 := &spdx.Package2_1{ + p2 := &v2_1.Package{ PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), + PackageSPDXIdentifier: common.ElementID("p2"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "def456def456"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "def456def456"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_1{ + Files: []*v2_1.File{ f1, f3, f4_2, @@ -251,10 +253,10 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // create files to be used in diff // f1 will be identical in both - f1 := &spdx.File2_1{ + f1 := &v2_1.File{ FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - Checksums: []spdx.Checksum{{Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File561"), + Checksums: []common.Checksum{{Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", Algorithm: common.SHA1}}, LicenseConcluded: "Apache-2.0", LicenseInfoInFiles: []string{ "LicenseRef-We-will-ignore-LicenseInfoInFiles", @@ -263,10 +265,10 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { } // f2 will only appear in the first Package - f2 := &spdx.File2_1{ + f2 := &v2_1.File{ FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - Checksums: []spdx.Checksum{{Value: "066c5139bd9a43d15812ec1a1755b08ccf199824", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File562"), + Checksums: []common.Checksum{{Value: "066c5139bd9a43d15812ec1a1755b08ccf199824", Algorithm: common.SHA1}}, LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -275,10 +277,10 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { } // f3 will only appear in the second Package - f3 := &spdx.File2_1{ + f3 := &v2_1.File{ FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - Checksums: []spdx.Checksum{{Value: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File563"), + Checksums: []common.Checksum{{Value: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", Algorithm: common.SHA1}}, LicenseConcluded: "MPL-2.0", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -288,20 +290,20 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license - f4_1 := &spdx.File2_1{ + f4_1 := &v2_1.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: common.SHA1}}, LicenseConcluded: "MIT", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f4_2 := &spdx.File2_1{ + f4_2 := &v2_1.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{Value: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", Algorithm: common.SHA1}}, LicenseConcluded: "Apache-2.0 AND MIT", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -311,20 +313,20 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license - f5_1 := &spdx.File2_1{ + f5_1 := &v2_1.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: common.SHA1}}, LicenseConcluded: "BSD-3-Clause", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f5_2 := &spdx.File2_1{ + f5_2 := &v2_1.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: common.SHA1}}, LicenseConcluded: "BSD-3-Clause", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -334,20 +336,20 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license - f6_1 := &spdx.File2_1{ + f6_1 := &v2_1.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{Value: "ba226db943bbbf455da77afab6f16dbab156d000", Algorithm: common.SHA1}}, LicenseConcluded: "CC0-1.0", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f6_2 := &spdx.File2_1{ + f6_2 := &v2_1.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: spdx.SHA1}}, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{Value: "b6e0ec7d085c5699b46f6f8d425413702652874d", Algorithm: common.SHA1}}, LicenseConcluded: "Unlicense", LicenseInfoInFiles: []string{ "NOASSERTION", @@ -356,21 +358,21 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { } // create Packages - p1 := &spdx.Package2_1{ + p1 := &v2_1.Package{ PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), + PackageSPDXIdentifier: common.ElementID("p1"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "abc123abc123"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "abc123abc123"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_1{ + Files: []*v2_1.File{ f1, f2, f4_1, @@ -378,21 +380,21 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { f6_1, }, } - p2 := &spdx.Package2_1{ + p2 := &v2_1.Package{ PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), + PackageSPDXIdentifier: common.ElementID("p2"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "def456def456"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "def456def456"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_1{ + Files: []*v2_1.File{ f1, f3, f4_2, @@ -498,11 +500,11 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { func Test2_2DifferCanCreateDiffPairs(t *testing.T) { // create files to be used in diff // f1 will be identical in both - f1 := &spdx.File2_2{ + f1 := &v2_2.File{ FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File561"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -514,11 +516,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { } // f2 will only appear in the first Package - f2 := &spdx.File2_2{ + f2 := &v2_2.File{ FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File562"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -530,11 +532,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { } // f3 will only appear in the second Package - f3 := &spdx.File2_2{ + f3 := &v2_2.File{ FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File563"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -547,11 +549,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license - f4_1 := &spdx.File2_2{ + f4_1 := &v2_2.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -561,11 +563,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { }, FileCopyrightText: "NOASSERTION", } - f4_2 := &spdx.File2_2{ + f4_2 := &v2_2.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -578,11 +580,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license - f5_1 := &spdx.File2_2{ + f5_1 := &v2_2.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -592,11 +594,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { }, FileCopyrightText: "NOASSERTION", } - f5_2 := &spdx.File2_2{ + f5_2 := &v2_2.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -609,11 +611,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license - f6_1 := &spdx.File2_2{ + f6_1 := &v2_2.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -623,11 +625,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { }, FileCopyrightText: "NOASSERTION", } - f6_2 := &spdx.File2_2{ + f6_2 := &v2_2.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -639,21 +641,21 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { } // create Packages - p1 := &spdx.Package2_2{ + p1 := &v2_2.Package{ PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), + PackageSPDXIdentifier: common.ElementID("p1"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "abc123abc123"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "abc123abc123"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_2{ + Files: []*v2_2.File{ f1, f2, f4_1, @@ -661,21 +663,21 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { f6_1, }, } - p2 := &spdx.Package2_2{ + p2 := &v2_2.Package{ PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), + PackageSPDXIdentifier: common.ElementID("p2"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "def456def456"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "def456def456"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_2{ + Files: []*v2_2.File{ f1, f3, f4_2, @@ -773,11 +775,11 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // create files to be used in diff // f1 will be identical in both - f1 := &spdx.File2_2{ + f1 := &v2_2.File{ FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File561"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -789,11 +791,11 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { } // f2 will only appear in the first Package - f2 := &spdx.File2_2{ + f2 := &v2_2.File{ FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File562"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -805,11 +807,11 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { } // f3 will only appear in the second Package - f3 := &spdx.File2_2{ + f3 := &v2_2.File{ FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File563"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -822,11 +824,11 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license - f4_1 := &spdx.File2_2{ + f4_1 := &v2_2.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -836,11 +838,11 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { }, FileCopyrightText: "NOASSERTION", } - f4_2 := &spdx.File2_2{ + f4_2 := &v2_2.File{ FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File564"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -853,20 +855,20 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license - f5_1 := &spdx.File2_2{ + f5_1 := &v2_2.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), + FileSPDXIdentifier: common.ElementID("File565"), LicenseConcluded: "BSD-3-Clause", LicenseInfoInFiles: []string{ "NOASSERTION", }, FileCopyrightText: "NOASSERTION", } - f5_2 := &spdx.File2_2{ + f5_2 := &v2_2.File{ FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File565"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -880,11 +882,11 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license - f6_1 := &spdx.File2_2{ + f6_1 := &v2_2.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -894,11 +896,11 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { }, FileCopyrightText: "NOASSERTION", } - f6_2 := &spdx.File2_2{ + f6_2 := &v2_2.File{ FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - Checksums: []spdx.Checksum{{ - Algorithm: spdx.SHA1, + FileSPDXIdentifier: common.ElementID("File566"), + Checksums: []common.Checksum{{ + Algorithm: common.SHA1, Value: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", }, }, @@ -910,21 +912,21 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { } // create Packages - p1 := &spdx.Package2_2{ + p1 := &v2_2.Package{ PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), + PackageSPDXIdentifier: common.ElementID("p1"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "abc123abc123"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "abc123abc123"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_2{ + Files: []*v2_2.File{ f1, f2, f4_1, @@ -932,21 +934,21 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { f6_1, }, } - p2 := &spdx.Package2_2{ + p2 := &v2_2.Package{ PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), + PackageSPDXIdentifier: common.ElementID("p2"), PackageDownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: spdx.PackageVerificationCode{Value: "def456def456"}, + PackageVerificationCode: common.PackageVerificationCode{Value: "def456def456"}, PackageLicenseConcluded: "NOASSERTION", PackageLicenseInfoFromFiles: []string{ "NOASSERTION", }, PackageLicenseDeclared: "NOASSERTION", PackageCopyrightText: "NOASSERTION", - Files: []*spdx.File2_2{ + Files: []*v2_2.File{ f1, f3, f4_2, |