aboutsummaryrefslogtreecommitdiff
path: root/tvloader/parser2v2/parse_other_license_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'tvloader/parser2v2/parse_other_license_test.go')
-rw-r--r--tvloader/parser2v2/parse_other_license_test.go58
1 files changed, 29 insertions, 29 deletions
diff --git a/tvloader/parser2v2/parse_other_license_test.go b/tvloader/parser2v2/parse_other_license_test.go
index ebf4170..e0607ee 100644
--- a/tvloader/parser2v2/parse_other_license_test.go
+++ b/tvloader/parser2v2/parse_other_license_test.go
@@ -14,9 +14,9 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T)
olname1 := "License 11"
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_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{
LicenseIdentifier: olid1,
@@ -24,8 +24,8 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T)
},
}
olic1 := parser.otherLic
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
// the Document's OtherLicenses should have this one only
@@ -90,13 +90,13 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T)
func TestParser2_2OLMovesToReviewAfterParsingReviewerTag(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}},
+ pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
}
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
err := parser.parsePair2_2("Reviewer", "Person: John Doe")
@@ -110,17 +110,17 @@ func TestParser2_2OLMovesToReviewAfterParsingReviewerTag(t *testing.T) {
func TestParser2_2OtherLicenseStaysAfterParsingRelationshipTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_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{
LicenseIdentifier: "LicenseRef-whatever",
LicenseName: "the whatever license",
},
}
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
err := parser.parsePair2_2("Relationship", "SPDXRef-blah CONTAINS SPDXRef-blah-else")
@@ -152,17 +152,17 @@ func TestParser2_2OtherLicenseStaysAfterParsingRelationshipTags(t *testing.T) {
func TestParser2_2OtherLicenseStaysAfterParsingAnnotationTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_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{
LicenseIdentifier: "LicenseRef-whatever",
LicenseName: "the whatever license",
},
}
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
err := parser.parsePair2_2("Annotator", "Person: John Doe ()")
@@ -209,24 +209,24 @@ func TestParser2_2OtherLicenseStaysAfterParsingAnnotationTags(t *testing.T) {
if len(parser.doc.Annotations) != 1 {
t.Fatalf("expected doc.Annotations to have len 1, got %d", len(parser.doc.Annotations))
}
- if parser.doc.Annotations[0].Annotator != "John Doe ()" {
+ if parser.doc.Annotations[0].Annotator.Annotator != "John Doe ()" {
t.Errorf("expected Annotator to be %s, got %s", "John Doe ()", parser.doc.Annotations[0].Annotator)
}
}
func TestParser2_2OLFailsAfterParsingOtherSectionTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_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{
LicenseIdentifier: "LicenseRef-Lic11",
LicenseName: "License 11",
},
}
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
// can't go back to old sections
@@ -247,13 +247,13 @@ func TestParser2_2OLFailsAfterParsingOtherSectionTags(t *testing.T) {
// ===== Other License data section tests =====
func TestParser2_2CanParseOtherLicenseTags(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}},
+ pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
}
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
// License Identifier
@@ -323,13 +323,13 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) {
func TestParser2_2OLUnknownTagFails(t *testing.T) {
parser := tvParser2_2{
- doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}},
+ doc: &spdx.Document2_2{Packages: []*spdx.Package2_2{}},
st: psOtherLicense2_2,
- pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}},
+ pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: []*spdx.File2_2{}},
file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"},
}
- parser.doc.Packages["test"] = parser.pkg
- parser.pkg.Files["f1"] = parser.file
+ parser.doc.Packages = append(parser.doc.Packages, parser.pkg)
+ parser.pkg.Files = append(parser.pkg.Files, parser.file)
parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic)
err := parser.parsePairFromOtherLicense2_2("blah", "something")
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 09:32:38 +0000