diff options
Diffstat (limited to 'spdxlib/relationships_test.go')
-rw-r--r-- | spdxlib/relationships_test.go | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/spdxlib/relationships_test.go b/spdxlib/relationships_test.go index 3c0ef24..e710d6e 100644 --- a/spdxlib/relationships_test.go +++ b/spdxlib/relationships_test.go @@ -13,17 +13,16 @@ import ( func Test2_1FilterForDependencies(t *testing.T) { // set up document and some packages and relationships doc := &spdx.Document2_1{ - CreationInfo: &spdx.CreationInfo2_1{ - SPDXVersion: "SPDX-2.1", - DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - }, - Packages: map[spdx.ElementID]*spdx.Package2_1{ - spdx.ElementID("p1"): {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, - spdx.ElementID("p3"): {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, - spdx.ElementID("p4"): {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, - spdx.ElementID("p5"): {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, + SPDXVersion: "SPDX-2.1", + DataLicense: "CC0-1.0", + SPDXIdentifier: spdx.ElementID("DOCUMENT"), + CreationInfo: &spdx.CreationInfo2_1{}, + Packages: []*spdx.Package2_1{ + {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, + {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, + {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, + {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, + {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, }, Relationships: []*spdx.Relationship2_1{ { @@ -82,17 +81,16 @@ func Test2_1FilterForDependencies(t *testing.T) { func Test2_2FindsDependsOnRelationships(t *testing.T) { // set up document and some packages and relationships doc := &spdx.Document2_2{ - CreationInfo: &spdx.CreationInfo2_2{ - SPDXVersion: "SPDX-2.2", - DataLicense: "CC0-1.0", - SPDXIdentifier: spdx.ElementID("DOCUMENT"), - }, - Packages: map[spdx.ElementID]*spdx.Package2_2{ - spdx.ElementID("p1"): {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, - spdx.ElementID("p3"): {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, - spdx.ElementID("p4"): {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, - spdx.ElementID("p5"): {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, + SPDXVersion: "SPDX-2.2", + DataLicense: "CC0-1.0", + SPDXIdentifier: spdx.ElementID("DOCUMENT"), + CreationInfo: &spdx.CreationInfo2_2{}, + Packages: []*spdx.Package2_2{ + {PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, + {PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, + {PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, + {PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, + {PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, }, Relationships: []*spdx.Relationship2_2{ { |