From 9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1 Mon Sep 17 00:00:00 2001 From: Brandon Lum Date: Tue, 19 Jul 2022 16:43:48 -0400 Subject: replace all v2_1, v2_2 with new convention Signed-off-by: Brandon Lum --- spdxlib/described_elements_test.go | 196 +++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 97 deletions(-) (limited to 'spdxlib/described_elements_test.go') diff --git a/spdxlib/described_elements_test.go b/spdxlib/described_elements_test.go index 4c2a1a1..8ea9cd5 100644 --- a/spdxlib/described_elements_test.go +++ b/spdxlib/described_elements_test.go @@ -5,46 +5,48 @@ package spdxlib 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 tests ===== func Test2_1CanGetIDsOfDescribedPackages(t *testing.T) { // set up document and some packages and relationships - doc := &spdx.Document2_1{ + doc := &v2_1.Document{ SPDXVersion: "SPDX-2.1", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_1{}, - Packages: []*spdx.Package2_1{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_1.CreationInfo{}, + Packages: []*v2_1.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, }, - Relationships: []*spdx.Relationship2_1{ - &spdx.Relationship2_1{ - RefA: spdx.MakeDocElementID("", "DOCUMENT"), - RefB: spdx.MakeDocElementID("", "p1"), + Relationships: []*v2_1.Relationship{ + &v2_1.Relationship{ + RefA: common.MakeDocElementID("", "DOCUMENT"), + RefB: common.MakeDocElementID("", "p1"), Relationship: "DESCRIBES", }, - &spdx.Relationship2_1{ - RefA: spdx.MakeDocElementID("", "DOCUMENT"), - RefB: spdx.MakeDocElementID("", "p5"), + &v2_1.Relationship{ + RefA: common.MakeDocElementID("", "DOCUMENT"), + RefB: common.MakeDocElementID("", "p5"), Relationship: "DESCRIBES", }, // inverse relationship -- should also get detected - &spdx.Relationship2_1{ - RefA: spdx.MakeDocElementID("", "p4"), - RefB: spdx.MakeDocElementID("", "DOCUMENT"), + &v2_1.Relationship{ + RefA: common.MakeDocElementID("", "p4"), + RefB: common.MakeDocElementID("", "DOCUMENT"), Relationship: "DESCRIBED_BY", }, // different relationship - &spdx.Relationship2_1{ - RefA: spdx.MakeDocElementID("", "p1"), - RefB: spdx.MakeDocElementID("", "p2"), + &v2_1.Relationship{ + RefA: common.MakeDocElementID("", "p1"), + RefB: common.MakeDocElementID("", "p2"), Relationship: "DEPENDS_ON", }, }, @@ -59,26 +61,26 @@ func Test2_1CanGetIDsOfDescribedPackages(t *testing.T) { if len(describedPkgIDs) != 3 { t.Fatalf("expected %d packages, got %d", 3, len(describedPkgIDs)) } - if describedPkgIDs[0] != spdx.ElementID("p1") { - t.Errorf("expected %v, got %v", spdx.ElementID("p1"), describedPkgIDs[0]) + if describedPkgIDs[0] != common.ElementID("p1") { + t.Errorf("expected %v, got %v", common.ElementID("p1"), describedPkgIDs[0]) } - if describedPkgIDs[1] != spdx.ElementID("p4") { - t.Errorf("expected %v, got %v", spdx.ElementID("p4"), describedPkgIDs[1]) + if describedPkgIDs[1] != common.ElementID("p4") { + t.Errorf("expected %v, got %v", common.ElementID("p4"), describedPkgIDs[1]) } - if describedPkgIDs[2] != spdx.ElementID("p5") { - t.Errorf("expected %v, got %v", spdx.ElementID("p5"), describedPkgIDs[2]) + if describedPkgIDs[2] != common.ElementID("p5") { + t.Errorf("expected %v, got %v", common.ElementID("p5"), describedPkgIDs[2]) } } func Test2_1GetDescribedPackagesReturnsSinglePackageIfOnlyOne(t *testing.T) { // set up document and one package, but no relationships // b/c only one package - doc := &spdx.Document2_1{ + doc := &v2_1.Document{ SPDXVersion: "SPDX-2.1", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_1{}, - Packages: []*spdx.Package2_1{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_1.CreationInfo{}, + Packages: []*v2_1.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, }, } @@ -92,30 +94,30 @@ func Test2_1GetDescribedPackagesReturnsSinglePackageIfOnlyOne(t *testing.T) { if len(describedPkgIDs) != 1 { t.Fatalf("expected %d package, got %d", 1, len(describedPkgIDs)) } - if describedPkgIDs[0] != spdx.ElementID("p1") { - t.Errorf("expected %v, got %v", spdx.ElementID("p1"), describedPkgIDs[0]) + if describedPkgIDs[0] != common.ElementID("p1") { + t.Errorf("expected %v, got %v", common.ElementID("p1"), describedPkgIDs[0]) } } func Test2_1FailsToGetDescribedPackagesIfMoreThanOneWithoutDescribesRelationship(t *testing.T) { // set up document and multiple packages, but no DESCRIBES relationships - doc := &spdx.Document2_1{ + doc := &v2_1.Document{ SPDXVersion: "SPDX-2.1", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_1{}, - Packages: []*spdx.Package2_1{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_1.CreationInfo{}, + Packages: []*v2_1.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, }, - Relationships: []*spdx.Relationship2_1{ + Relationships: []*v2_1.Relationship{ // different relationship - &spdx.Relationship2_1{ - RefA: spdx.MakeDocElementID("", "p1"), - RefB: spdx.MakeDocElementID("", "p2"), + &v2_1.Relationship{ + RefA: common.MakeDocElementID("", "p1"), + RefB: common.MakeDocElementID("", "p2"), Relationship: "DEPENDS_ON", }, }, @@ -129,12 +131,12 @@ func Test2_1FailsToGetDescribedPackagesIfMoreThanOneWithoutDescribesRelationship func Test2_1FailsToGetDescribedPackagesIfMoreThanOneWithNilRelationships(t *testing.T) { // set up document and multiple packages, but no relationships slice - doc := &spdx.Document2_1{ + doc := &v2_1.Document{ SPDXVersion: "SPDX-2.1", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_1{}, - Packages: []*spdx.Package2_1{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_1.CreationInfo{}, + Packages: []*v2_1.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, }, @@ -148,12 +150,12 @@ func Test2_1FailsToGetDescribedPackagesIfMoreThanOneWithNilRelationships(t *test func Test2_1FailsToGetDescribedPackagesIfZeroPackagesInMap(t *testing.T) { // set up document but no packages - doc := &spdx.Document2_1{ + doc := &v2_1.Document{ SPDXVersion: "SPDX-2.1", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_1{}, - Packages: []*spdx.Package2_1{}, + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_1.CreationInfo{}, + Packages: []*v2_1.Package{}, } _, err := GetDescribedPackageIDs2_1(doc) @@ -164,11 +166,11 @@ func Test2_1FailsToGetDescribedPackagesIfZeroPackagesInMap(t *testing.T) { func Test2_1FailsToGetDescribedPackagesIfNilMap(t *testing.T) { // set up document but no packages - doc := &spdx.Document2_1{ + doc := &v2_1.Document{ SPDXVersion: "SPDX-2.1", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_1{}, + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_1.CreationInfo{}, } _, err := GetDescribedPackageIDs2_1(doc) @@ -181,39 +183,39 @@ func Test2_1FailsToGetDescribedPackagesIfNilMap(t *testing.T) { func Test2_2CanGetIDsOfDescribedPackages(t *testing.T) { // set up document and some packages and relationships - doc := &spdx.Document2_2{ + doc := &v2_2.Document{ SPDXVersion: "SPDX-2.2", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_2{}, - Packages: []*spdx.Package2_2{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_2.CreationInfo{}, + Packages: []*v2_2.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, }, - Relationships: []*spdx.Relationship2_2{ - &spdx.Relationship2_2{ - RefA: spdx.MakeDocElementID("", "DOCUMENT"), - RefB: spdx.MakeDocElementID("", "p1"), + Relationships: []*v2_2.Relationship{ + &v2_2.Relationship{ + RefA: common.MakeDocElementID("", "DOCUMENT"), + RefB: common.MakeDocElementID("", "p1"), Relationship: "DESCRIBES", }, - &spdx.Relationship2_2{ - RefA: spdx.MakeDocElementID("", "DOCUMENT"), - RefB: spdx.MakeDocElementID("", "p5"), + &v2_2.Relationship{ + RefA: common.MakeDocElementID("", "DOCUMENT"), + RefB: common.MakeDocElementID("", "p5"), Relationship: "DESCRIBES", }, // inverse relationship -- should also get detected - &spdx.Relationship2_2{ - RefA: spdx.MakeDocElementID("", "p4"), - RefB: spdx.MakeDocElementID("", "DOCUMENT"), + &v2_2.Relationship{ + RefA: common.MakeDocElementID("", "p4"), + RefB: common.MakeDocElementID("", "DOCUMENT"), Relationship: "DESCRIBED_BY", }, // different relationship - &spdx.Relationship2_2{ - RefA: spdx.MakeDocElementID("", "p1"), - RefB: spdx.MakeDocElementID("", "p2"), + &v2_2.Relationship{ + RefA: common.MakeDocElementID("", "p1"), + RefB: common.MakeDocElementID("", "p2"), Relationship: "DEPENDS_ON", }, }, @@ -228,26 +230,26 @@ func Test2_2CanGetIDsOfDescribedPackages(t *testing.T) { if len(describedPkgIDs) != 3 { t.Fatalf("expected %d packages, got %d", 3, len(describedPkgIDs)) } - if describedPkgIDs[0] != spdx.ElementID("p1") { - t.Errorf("expected %v, got %v", spdx.ElementID("p1"), describedPkgIDs[0]) + if describedPkgIDs[0] != common.ElementID("p1") { + t.Errorf("expected %v, got %v", common.ElementID("p1"), describedPkgIDs[0]) } - if describedPkgIDs[1] != spdx.ElementID("p4") { - t.Errorf("expected %v, got %v", spdx.ElementID("p4"), describedPkgIDs[1]) + if describedPkgIDs[1] != common.ElementID("p4") { + t.Errorf("expected %v, got %v", common.ElementID("p4"), describedPkgIDs[1]) } - if describedPkgIDs[2] != spdx.ElementID("p5") { - t.Errorf("expected %v, got %v", spdx.ElementID("p5"), describedPkgIDs[2]) + if describedPkgIDs[2] != common.ElementID("p5") { + t.Errorf("expected %v, got %v", common.ElementID("p5"), describedPkgIDs[2]) } } func Test2_2GetDescribedPackagesReturnsSinglePackageIfOnlyOne(t *testing.T) { // set up document and one package, but no relationships // b/c only one package - doc := &spdx.Document2_2{ + doc := &v2_2.Document{ SPDXVersion: "SPDX-2.2", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_2{}, - Packages: []*spdx.Package2_2{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_2.CreationInfo{}, + Packages: []*v2_2.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, }, } @@ -261,30 +263,30 @@ func Test2_2GetDescribedPackagesReturnsSinglePackageIfOnlyOne(t *testing.T) { if len(describedPkgIDs) != 1 { t.Fatalf("expected %d package, got %d", 1, len(describedPkgIDs)) } - if describedPkgIDs[0] != spdx.ElementID("p1") { - t.Errorf("expected %v, got %v", spdx.ElementID("p1"), describedPkgIDs[0]) + if describedPkgIDs[0] != common.ElementID("p1") { + t.Errorf("expected %v, got %v", common.ElementID("p1"), describedPkgIDs[0]) } } func Test2_2FailsToGetDescribedPackagesIfMoreThanOneWithoutDescribesRelationship(t *testing.T) { // set up document and multiple packages, but no DESCRIBES relationships - doc := &spdx.Document2_2{ + doc := &v2_2.Document{ SPDXVersion: "SPDX-2.2", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_2{}, - Packages: []*spdx.Package2_2{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_2.CreationInfo{}, + Packages: []*v2_2.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, }, - Relationships: []*spdx.Relationship2_2{ + Relationships: []*v2_2.Relationship{ // different relationship - &spdx.Relationship2_2{ - RefA: spdx.MakeDocElementID("", "p1"), - RefB: spdx.MakeDocElementID("", "p2"), + &v2_2.Relationship{ + RefA: common.MakeDocElementID("", "p1"), + RefB: common.MakeDocElementID("", "p2"), Relationship: "DEPENDS_ON", }, }, @@ -298,12 +300,12 @@ func Test2_2FailsToGetDescribedPackagesIfMoreThanOneWithoutDescribesRelationship func Test2_2FailsToGetDescribedPackagesIfMoreThanOneWithNilRelationships(t *testing.T) { // set up document and multiple packages, but no relationships slice - doc := &spdx.Document2_2{ + doc := &v2_2.Document{ SPDXVersion: "SPDX-2.2", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_2{}, - Packages: []*spdx.Package2_2{ + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_2.CreationInfo{}, + Packages: []*v2_2.Package{ {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, }, @@ -317,12 +319,12 @@ func Test2_2FailsToGetDescribedPackagesIfMoreThanOneWithNilRelationships(t *test func Test2_2FailsToGetDescribedPackagesIfZeroPackagesInMap(t *testing.T) { // set up document but no packages - doc := &spdx.Document2_2{ + doc := &v2_2.Document{ SPDXVersion: "SPDX-2.2", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_2{}, - Packages: []*spdx.Package2_2{}, + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_2.CreationInfo{}, + Packages: []*v2_2.Package{}, } _, err := GetDescribedPackageIDs2_2(doc) @@ -333,11 +335,11 @@ func Test2_2FailsToGetDescribedPackagesIfZeroPackagesInMap(t *testing.T) { func Test2_2FailsToGetDescribedPackagesIfNilMap(t *testing.T) { // set up document but no packages - doc := &spdx.Document2_2{ + doc := &v2_2.Document{ SPDXVersion: "SPDX-2.2", DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - CreationInfo: &spdx.CreationInfo2_2{}, + SPDXIdentifier: common.ElementID("DOCUMENT"), + CreationInfo: &v2_2.CreationInfo{}, } _, err := GetDescribedPackageIDs2_2(doc) -- cgit v1.2.3