aboutsummaryrefslogtreecommitdiff
path: root/tvloader/parser2v2/parse_review_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'tvloader/parser2v2/parse_review_test.go')
-rw-r--r--tvloader/parser2v2/parse_review_test.go100
1 files changed, 50 insertions, 50 deletions
diff --git a/tvloader/parser2v2/parse_review_test.go b/tvloader/parser2v2/parse_review_test.go
index de73ede..f93afbf 100644
--- a/tvloader/parser2v2/parse_review_test.go
+++ b/tvloader/parser2v2/parse_review_test.go
@@ -4,7 +4,7 @@ package parser2v2
import (
"testing"
- "github.com/spdx/tools-golang/spdx"
+ "github.com/spdx/tools-golang/spdx/v2_2"
)
// ===== Parser review section state change tests =====
@@ -12,15 +12,15 @@ func TestParser2_2ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) {
// create the first review
rev1 := "John Doe"
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{
+ rev: &v2_2.Review{
Reviewer: rev1,
ReviewerType: "Person",
},
@@ -82,15 +82,15 @@ func TestParser2_2ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) {
func TestParser2_2ReviewStaysAfterParsingRelationshipTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{
+ rev: &v2_2.Review{
Reviewer: "Jane Doe",
ReviewerType: "Person",
},
@@ -129,15 +129,15 @@ func TestParser2_2ReviewStaysAfterParsingRelationshipTags(t *testing.T) {
func TestParser2_2ReviewStaysAfterParsingAnnotationTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{
+ rev: &v2_2.Review{
Reviewer: "Jane Doe",
ReviewerType: "Person",
},
@@ -198,15 +198,15 @@ func TestParser2_2ReviewStaysAfterParsingAnnotationTags(t *testing.T) {
func TestParser2_2ReviewFailsAfterParsingOtherSectionTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
parser.pkg.Files = append(parser.pkg.Files, parser.file)
@@ -235,15 +235,15 @@ func TestParser2_2ReviewFailsAfterParsingOtherSectionTags(t *testing.T) {
// ===== Review data section tests =====
func TestParser2_2CanParseReviewTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
parser.pkg.Files = append(parser.pkg.Files, parser.file)
@@ -274,15 +274,15 @@ func TestParser2_2CanParseReviewTags(t *testing.T) {
func TestParser2_2CanParseReviewerPersonTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
parser.pkg.Files = append(parser.pkg.Files, parser.file)
@@ -304,15 +304,15 @@ func TestParser2_2CanParseReviewerPersonTag(t *testing.T) {
func TestParser2_2CanParseReviewerOrganizationTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
parser.pkg.Files = append(parser.pkg.Files, parser.file)
@@ -334,15 +334,15 @@ func TestParser2_2CanParseReviewerOrganizationTag(t *testing.T) {
func TestParser2_2CanParseReviewerToolTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
parser.pkg.Files = append(parser.pkg.Files, parser.file)
@@ -364,9 +364,9 @@ func TestParser2_2CanParseReviewerToolTag(t *testing.T) {
func TestParser2_2FailsIfReviewerInvalidFormat(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Reviews = append(parser.doc.Reviews, parser.rev)
@@ -378,9 +378,9 @@ func TestParser2_2FailsIfReviewerInvalidFormat(t *testing.T) {
func TestParser2_2FailsIfReviewerUnknownType(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Reviews = append(parser.doc.Reviews, parser.rev)
@@ -392,15 +392,15 @@ func TestParser2_2FailsIfReviewerUnknownType(t *testing.T) {
func TestParser2_2ReviewUnknownTagFails(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
+ doc: &v2_2.Document{Packages: []*v2_2.Package{}},
st: psReview2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
- file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
- otherLic: &spdx.OtherLicense2_2{
+ pkg: &v2_2.Package{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*v2_2.File{}},
+ file: &v2_2.File{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
+ otherLic: &v2_2.OtherLicense{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
- rev: &spdx.Review2_2{},
+ rev: &v2_2.Review{},
}
parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
parser.pkg.Files = append(parser.pkg.Files, parser.file)