aboutsummaryrefslogtreecommitdiff
path: root/tvloader/parser2v2/parse_package_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'tvloader/parser2v2/parse_package_test.go')
-rw-r--r--tvloader/parser2v2/parse_package_test.go131
1 files changed, 66 insertions, 65 deletions
diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go
index 6b58d0f..a1610f7 100644
--- a/tvloader/parser2v2/parse_package_test.go
+++ b/tvloader/parser2v2/parse_package_test.go
@@ -4,7 +4,8 @@ package parser2v2
import (
"testing"
- "github.com/spdx/tools-golang/spdx"
+ "github.com/spdx/tools-golang/spdx/common"
+ "github.com/spdx/tools-golang/spdx/v2_2"
)
// ===== Parser package section state change tests =====
@@ -13,9 +14,9 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T
pkgOldName := "p1"
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: pkgOldName, PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: pkgOldName, PackageSPDXIdentifier: "p1"},
}
pkgOld := parser.pkg
parser.doc.Packages = append(parser.doc.Packages, pkgOld)
@@ -69,7 +70,7 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack
// pkg is nil, so that Files appearing before the first PackageName tag
// are added to Files instead of Packages
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psFile2_2,
pkg: nil,
}
@@ -112,9 +113,9 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack
func TestParser2_2PackageMovesToFileAfterParsingFileNameTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
pkgCurrent := parser.pkg
@@ -135,9 +136,9 @@ func TestParser2_2PackageMovesToFileAfterParsingFileNameTag(t *testing.T) {
func TestParser2_2PackageMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -152,9 +153,9 @@ func TestParser2_2PackageMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing.
func TestParser2_2PackageMovesToReviewAfterParsingReviewerTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -169,9 +170,9 @@ func TestParser2_2PackageMovesToReviewAfterParsingReviewerTag(t *testing.T) {
func TestParser2_2PackageStaysAfterParsingRelationshipTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -196,9 +197,9 @@ func TestParser2_2PackageStaysAfterParsingRelationshipTags(t *testing.T) {
func TestParser2_2PackageStaysAfterParsingAnnotationTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -246,9 +247,9 @@ func TestParser2_2PackageStaysAfterParsingAnnotationTags(t *testing.T) {
// ===== Package data section tests =====
func TestParser2_2CanParsePackageTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// should not yet be in Packages map, b/c no SPDX identifier
@@ -355,15 +356,15 @@ func TestParser2_2CanParsePackageTags(t *testing.T) {
}
for _, checksum := range parser.pkg.PackageChecksums {
switch checksum.Algorithm {
- case spdx.SHA1:
+ case common.SHA1:
if checksum.Value != codeSha1 {
t.Errorf("expected %s for FileChecksumSHA1, got %s", codeSha1, checksum.Value)
}
- case spdx.SHA256:
+ case common.SHA256:
if checksum.Value != codeSha256 {
t.Errorf("expected %s for FileChecksumSHA1, got %s", codeSha256, checksum.Value)
}
- case spdx.MD5:
+ case common.MD5:
if checksum.Value != codeMd5 {
t.Errorf("expected %s for FileChecksumSHA1, got %s", codeMd5, checksum.Value)
}
@@ -589,9 +590,9 @@ func TestParser2_2CanParsePackageTags(t *testing.T) {
func TestParser2_2CanParsePackageSupplierPersonTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -607,9 +608,9 @@ func TestParser2_2CanParsePackageSupplierPersonTag(t *testing.T) {
func TestParser2_2CanParsePackageSupplierOrganizationTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -625,9 +626,9 @@ func TestParser2_2CanParsePackageSupplierOrganizationTag(t *testing.T) {
func TestParser2_2CanParsePackageSupplierNOASSERTIONTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -643,9 +644,9 @@ func TestParser2_2CanParsePackageSupplierNOASSERTIONTag(t *testing.T) {
func TestParser2_2CanParsePackageOriginatorPersonTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -661,9 +662,9 @@ func TestParser2_2CanParsePackageOriginatorPersonTag(t *testing.T) {
func TestParser2_2CanParsePackageOriginatorOrganizationTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -679,9 +680,9 @@ func TestParser2_2CanParsePackageOriginatorOrganizationTag(t *testing.T) {
func TestParser2_2CanParsePackageOriginatorNOASSERTIONTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -697,9 +698,9 @@ func TestParser2_2CanParsePackageOriginatorNOASSERTIONTag(t *testing.T) {
func TestParser2_2CanParsePackageVerificationCodeTagWithExcludes(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -722,9 +723,9 @@ func TestParser2_2CanParsePackageVerificationCodeTagWithExcludes(t *testing.T) {
func TestParser2_2CanParsePackageVerificationCodeTagWithoutExcludes(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -745,9 +746,9 @@ func TestParser2_2CanParsePackageVerificationCodeTagWithoutExcludes(t *testing.T
func TestParser2_2PackageExternalRefPointerChangesAfterTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -790,9 +791,9 @@ func TestParser2_2PackageExternalRefPointerChangesAfterTags(t *testing.T) {
func TestParser2_2PackageCreatesRelationshipInDocument(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -810,9 +811,9 @@ func TestParser2_2PackageCreatesRelationshipInDocument(t *testing.T) {
func TestParser2_2PackageCreatesAnnotationInDocument(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -830,9 +831,9 @@ func TestParser2_2PackageCreatesAnnotationInDocument(t *testing.T) {
func TestParser2_2PackageUnknownTagFails(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"},
+ pkg: &v2_2.Package{PackageName: "p1", PackageSPDXIdentifier: "p1"},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
@@ -844,9 +845,9 @@ func TestParser2_2PackageUnknownTagFails(t *testing.T) {
func TestParser2_2FailsIfInvalidSPDXIDInPackageSection(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -863,9 +864,9 @@ func TestParser2_2FailsIfInvalidSPDXIDInPackageSection(t *testing.T) {
func TestParser2_2FailsIfInvalidPackageSupplierFormat(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -882,9 +883,9 @@ func TestParser2_2FailsIfInvalidPackageSupplierFormat(t *testing.T) {
func TestParser2_2FailsIfUnknownPackageSupplierType(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -901,9 +902,9 @@ func TestParser2_2FailsIfUnknownPackageSupplierType(t *testing.T) {
func TestParser2_2FailsIfInvalidPackageOriginatorFormat(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -920,9 +921,9 @@ func TestParser2_2FailsIfInvalidPackageOriginatorFormat(t *testing.T) {
func TestParser2_2FailsIfUnknownPackageOriginatorType(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -939,9 +940,9 @@ func TestParser2_2FailsIfUnknownPackageOriginatorType(t *testing.T) {
func TestParser2_2SetsFilesAnalyzedTagsCorrectly(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -964,9 +965,9 @@ func TestParser2_2SetsFilesAnalyzedTagsCorrectly(t *testing.T) {
func TestParser2_2FailsIfInvalidPackageChecksumFormat(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -983,9 +984,9 @@ func TestParser2_2FailsIfInvalidPackageChecksumFormat(t *testing.T) {
func TestParser2_2FailsIfInvalidPackageChecksumType(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -1002,9 +1003,9 @@ func TestParser2_2FailsIfInvalidPackageChecksumType(t *testing.T) {
func TestParser2_2FailsIfInvalidExternalRefFormat(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -1021,9 +1022,9 @@ func TestParser2_2FailsIfInvalidExternalRefFormat(t *testing.T) {
func TestParser2_2FailsIfExternalRefCommentBeforeExternalRef(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{},
+ pkg: &v2_2.Package{},
}
// start with Package Name
@@ -1107,9 +1108,9 @@ func TestParser2_2PackageWithoutSpdxIdentifierThrowsError(t *testing.T) {
// More than one package, the previous package doesn't contain an SPDX ID
pkgOldName := "p1"
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psPackage2_2,
- pkg: &spdx.Package2_2{PackageName: pkgOldName},
+ pkg: &v2_2.Package{PackageName: pkgOldName},
}
pkgOld := parser.pkg
parser.doc.Packages = append(parser.doc.Packages, pkgOld)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 10:43:06 +0000