From 240e16abc6fa09ba7a2a138f5b8e258052bef856 Mon Sep 17 00:00:00 2001 From: specter25 Date: Sun, 28 Mar 2021 00:47:44 +0530 Subject: Error on missing package and file ids in v2.2 - Shows error if a Package has a missing SPDXID tag - Show error if a File has a missing SPDXID tag Signed-off-by: specter25 --- tvloader/parser2v2/parse_creation_info.go | 4 +++ tvloader/parser2v2/parse_file.go | 8 +++++ tvloader/parser2v2/parse_file_test.go | 59 +++++++++++++++++++++++++++++++ tvloader/parser2v2/parse_package.go | 4 +++ tvloader/parser2v2/parse_package_test.go | 40 +++++++++++++++++++++ tvloader/parser2v2/parse_snippet.go | 4 +++ tvloader/parser2v2/parser.go | 7 +++- 7 files changed, 125 insertions(+), 1 deletion(-) (limited to 'tvloader/parser2v2') diff --git a/tvloader/parser2v2/parse_creation_info.go b/tvloader/parser2v2/parse_creation_info.go index a3c7fbf..48efc58 100644 --- a/tvloader/parser2v2/parse_creation_info.go +++ b/tvloader/parser2v2/parse_creation_info.go @@ -76,6 +76,10 @@ func (parser *tvParser2_2) parsePairFromCreationInfo2_2(tag string, value string // tag for going on to package section case "PackageName": + //before starting the parsing of packages check if the last unpackaged file did contain a SPDX file Identifier + if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { + return fmt.Errorf("Invalid file without a package SPDX identifier") + } parser.st = psPackage2_2 parser.pkg = &spdx.Package2_2{ FilesAnalyzed: true, diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go index 86886d3..f6447fa 100644 --- a/tvloader/parser2v2/parse_file.go +++ b/tvloader/parser2v2/parse_file.go @@ -18,11 +18,19 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error switch tag { // tag for creating new file section case "FileName": + //check if the previous file contained a spdxId or not + if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { + return fmt.Errorf("Invalid file without a file SPDX identifier") + } parser.file = &spdx.File2_2{} parser.file.FileName = value // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 + //check if the previous file containes a spdxId or not + if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { + return fmt.Errorf("Invalid file without a file SPDX identifier") + } parser.file = nil return parser.parsePairFromPackage2_2(tag, value) // tag for going on to snippet section diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go index 411593f..3af06a1 100644 --- a/tvloader/parser2v2/parse_file_test.go +++ b/tvloader/parser2v2/parse_file_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/tvloader/reader" ) // ===== Parser file section state change tests ===== @@ -917,3 +918,61 @@ func TestParser2_2FailsIfArtifactURIBeforeArtifactName(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } + +func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { + //case 1 + // Last unpackaged file no packages in doc + // Last file of last package in the doc + var tvPairs []reader.TagValuePair + tvPair1 := reader.TagValuePair{Tag: "SPDXVersion", Value: "SPDX-2.2"} + tvPairs = append(tvPairs, tvPair1) + tvPair2 := reader.TagValuePair{Tag: "DataLicense", Value: "CC0-1.0"} + tvPairs = append(tvPairs, tvPair2) + tvPair3 := reader.TagValuePair{Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"} + tvPairs = append(tvPairs, tvPair3) + tvPair4 := reader.TagValuePair{Tag: "FileName", Value: "f1"} + tvPairs = append(tvPairs, tvPair4) + _, err := ParseTagValues(tvPairs) + if err == nil { + t.Errorf("files withoutSpdx Identifiers getting accepted") + } + + //case 2 : The previous file (packaged or unpackaged does not contain spdxID) + tvPair5 := reader.TagValuePair{Tag: "FileName", Value: "f2"} + tvPairs = append(tvPairs, tvPair5) + _, err = ParseTagValues(tvPairs) + if err == nil { + t.Errorf("%s", err) + } + + //case 3 : Invalid file with snippet + //Last unpackaged file before the packges start + //Last file of a package and New package starts + sid1 := spdx.ElementID("s1") + parser := tvParser2_2{ + doc: &spdx.Document2_2{}, + st: psCreationInfo2_2, + } + fileName := "f2.txt" + err = parser.parsePair2_2("FileName", fileName) + err = parser.parsePair2_2("SnippetSPDXID", string(sid1)) + err = parser.parsePair2_2("PackageName", "p2") + if err == nil { + t.Errorf("files withoutSpdx Identifiers getting accepted") + } + + //case 4 : Invalid File without snippets + //Last unpackaged file before the packges start + //Last file of a package and New package starts + parser3 := tvParser2_2{ + doc: &spdx.Document2_2{}, + st: psCreationInfo2_2, + } + fileName = "f3.txt" + err = parser3.parsePair2_2("FileName", fileName) + err = parser3.parsePair2_2("PackageName", "p2") + if err == nil { + t.Errorf("files withoutSpdx Identifiers getting accepted") + } + err = parser3.parsePair2_2("PackageName", "p2") +} diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go index 3f5939b..729db18 100644 --- a/tvloader/parser2v2/parse_package.go +++ b/tvloader/parser2v2/parse_package.go @@ -20,6 +20,10 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err case "PackageName": // if package already has a name, create and go on to a new package if parser.pkg == nil || parser.pkg.PackageName != "" { + //check if the previous package contained a spdxId or not + if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == spdx.ElementID("") { + return fmt.Errorf("Invalid package without a package SPDX identifier") + } parser.pkg = &spdx.Package2_2{ FilesAnalyzed: true, IsFilesAnalyzedTagPresent: false, diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go index 33b4784..1983baf 100644 --- a/tvloader/parser2v2/parse_package_test.go +++ b/tvloader/parser2v2/parse_package_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/tvloader/reader" ) // ===== Parser package section state change tests ===== @@ -1102,3 +1103,42 @@ func TestFailsPackageExternalRefWithInvalidFormat(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } + +func TestParser2_2PackageWithoutSpdxIdentifierThrowsError(t *testing.T) { + // More than one package , the previous package doesn't contain the SPDXID + pkgOldName := "p1" + parser := tvParser2_2{ + doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, + st: psPackage2_2, + pkg: &spdx.Package2_2{PackageName: pkgOldName}, + } + pkgOld := parser.pkg + parser.doc.Packages["p1"] = pkgOld + // the Document's Packages should have this one only + if parser.doc.Packages["p1"] != pkgOld { + t.Errorf("expected package %v, got %v", pkgOld, parser.doc.Packages["p1"]) + } + if len(parser.doc.Packages) != 1 { + t.Errorf("expected 1 package, got %d", len(parser.doc.Packages)) + } + + // Case 2: Checks the Last package + pkgName := "p2" + err := parser.parsePair2_2("PackageName", pkgName) + if err == nil { + t.Errorf("Packages withoutSpdx Identifiers getting accepted") + } + var tvPairs []reader.TagValuePair + tvPair1 := reader.TagValuePair{Tag: "SPDXVersion", Value: "SPDX-2.2"} + tvPairs = append(tvPairs, tvPair1) + tvPair2 := reader.TagValuePair{Tag: "DataLicense", Value: "CC0-1.0"} + tvPairs = append(tvPairs, tvPair2) + tvPair3 := reader.TagValuePair{Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"} + tvPairs = append(tvPairs, tvPair3) + tvPair4 := reader.TagValuePair{Tag: "PackageName", Value: "p1"} + tvPairs = append(tvPairs, tvPair4) + _, err = ParseTagValues(tvPairs) + if err == nil { + t.Errorf("Packages withoutSpdx Identifiers getting accepted") + } +} diff --git a/tvloader/parser2v2/parse_snippet.go b/tvloader/parser2v2/parse_snippet.go index 0d9dc3f..0de54e2 100644 --- a/tvloader/parser2v2/parse_snippet.go +++ b/tvloader/parser2v2/parse_snippet.go @@ -34,6 +34,10 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 + //check here whether the last file of the previous package contained the FileSpdxIdentifier + if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { + return fmt.Errorf("Invalid file without a file SPDX identifier") + } parser.file = nil parser.snippet = nil return parser.parsePairFromPackage2_2(tag, value) diff --git a/tvloader/parser2v2/parser.go b/tvloader/parser2v2/parser.go index e89bab1..8216fbb 100644 --- a/tvloader/parser2v2/parser.go +++ b/tvloader/parser2v2/parser.go @@ -20,7 +20,12 @@ func ParseTagValues(tvs []reader.TagValuePair) (*spdx.Document2_2, error) { return nil, err } } - + if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { + return nil, fmt.Errorf("Invalid file without a file SPDX identifier") + } + if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == spdx.ElementID("") { + return nil, fmt.Errorf("Invalid package without a package SPDX identifier") + } return parser.doc, nil } -- cgit v1.2.3 From 07cb513803ea144c9ca427b413c9ac89f6b8006d Mon Sep 17 00:00:00 2001 From: specter25 Date: Sun, 28 Mar 2021 01:04:16 +0530 Subject: Error on missing package and file ids in v2.1 - Shows error if a Package has a missing SPDXID tag - Show error if a File has a missing SPDXID tag Signed-off-by: specter25 --- tvloader/parser2v2/parse_creation_info.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tvloader/parser2v2') diff --git a/tvloader/parser2v2/parse_creation_info.go b/tvloader/parser2v2/parse_creation_info.go index 48efc58..b70fe84 100644 --- a/tvloader/parser2v2/parse_creation_info.go +++ b/tvloader/parser2v2/parse_creation_info.go @@ -76,7 +76,7 @@ func (parser *tvParser2_2) parsePairFromCreationInfo2_2(tag string, value string // tag for going on to package section case "PackageName": - //before starting the parsing of packages check if the last unpackaged file did contain a SPDX file Identifier + //Error if last file does not has FileSPDXId if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { return fmt.Errorf("Invalid file without a package SPDX identifier") } -- cgit v1.2.3 From 7985e5bdac9e2328e648e8d00ced420da3a3c11d Mon Sep 17 00:00:00 2001 From: specter25 Date: Sun, 4 Apr 2021 15:52:30 +0530 Subject: Structural changes in spdxId fix for package and files - Fix capitalized initials of error messages - Other structural changes to increase code efficiency Signed-off-by: specter25 --- tvloader/parser2v2/parse_creation_info.go | 8 +++--- tvloader/parser2v2/parse_file.go | 12 ++++----- tvloader/parser2v2/parse_file_test.go | 41 ++++++++++++++----------------- tvloader/parser2v2/parse_package.go | 6 ++--- tvloader/parser2v2/parse_package_test.go | 21 +++++++--------- tvloader/parser2v2/parse_snippet.go | 6 ++--- tvloader/parser2v2/parser.go | 12 ++++----- tvloader/parser2v2/types.go | 2 ++ 8 files changed, 51 insertions(+), 57 deletions(-) (limited to 'tvloader/parser2v2') diff --git a/tvloader/parser2v2/parse_creation_info.go b/tvloader/parser2v2/parse_creation_info.go index b70fe84..930ff00 100644 --- a/tvloader/parser2v2/parse_creation_info.go +++ b/tvloader/parser2v2/parse_creation_info.go @@ -12,7 +12,7 @@ import ( func (parser *tvParser2_2) parsePairFromCreationInfo2_2(tag string, value string) error { // fail if not in Creation Info parser state if parser.st != psCreationInfo2_2 { - return fmt.Errorf("Got invalid state %v in parsePairFromCreationInfo2_2", parser.st) + return fmt.Errorf("got invalid state %v in parsePairFromCreationInfo2_2", parser.st) } // create an SPDX Creation Info data struct if we don't have one already @@ -76,9 +76,9 @@ func (parser *tvParser2_2) parsePairFromCreationInfo2_2(tag string, value string // tag for going on to package section case "PackageName": - //Error if last file does not has FileSPDXId - if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { - return fmt.Errorf("Invalid file without a package SPDX identifier") + // Error if last file does not has FileSPDXId + if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { + return fmt.Errorf("invalid file without a package SPDX identifier") } parser.st = psPackage2_2 parser.pkg = &spdx.Package2_2{ diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go index f6447fa..7e004e9 100644 --- a/tvloader/parser2v2/parse_file.go +++ b/tvloader/parser2v2/parse_file.go @@ -18,18 +18,18 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error switch tag { // tag for creating new file section case "FileName": - //check if the previous file contained a spdxId or not - if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { - return fmt.Errorf("Invalid file without a file SPDX identifier") + // check if the previous file contained a spdxId or not + if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { + return fmt.Errorf("invalid file without a file SPDX identifier") } parser.file = &spdx.File2_2{} parser.file.FileName = value // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 - //check if the previous file containes a spdxId or not - if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { - return fmt.Errorf("Invalid file without a file SPDX identifier") + // check if the previous file containes a spdxId or not + if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { + return fmt.Errorf("invalid file without a file SPDX identifier") } parser.file = nil return parser.parsePairFromPackage2_2(tag, value) diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go index 3af06a1..f5234a2 100644 --- a/tvloader/parser2v2/parse_file_test.go +++ b/tvloader/parser2v2/parse_file_test.go @@ -920,59 +920,54 @@ func TestParser2_2FailsIfArtifactURIBeforeArtifactName(t *testing.T) { } func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { - //case 1 + // case 1 // Last unpackaged file no packages in doc // Last file of last package in the doc - var tvPairs []reader.TagValuePair - tvPair1 := reader.TagValuePair{Tag: "SPDXVersion", Value: "SPDX-2.2"} - tvPairs = append(tvPairs, tvPair1) - tvPair2 := reader.TagValuePair{Tag: "DataLicense", Value: "CC0-1.0"} - tvPairs = append(tvPairs, tvPair2) - tvPair3 := reader.TagValuePair{Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"} - tvPairs = append(tvPairs, tvPair3) - tvPair4 := reader.TagValuePair{Tag: "FileName", Value: "f1"} - tvPairs = append(tvPairs, tvPair4) + tvPairs := []reader.TagValuePair{ + {Tag: "SPDXVersion", Value: "SPDX-2.2"}, + {Tag: "DataLicense", Value: "CC0-1.0"}, + {Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"}, + {Tag: "FileName", Value: "f1"}, + } _, err := ParseTagValues(tvPairs) if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") } - //case 2 : The previous file (packaged or unpackaged does not contain spdxID) - tvPair5 := reader.TagValuePair{Tag: "FileName", Value: "f2"} - tvPairs = append(tvPairs, tvPair5) + // case 2 : The previous file (packaged or unpackaged does not contain spdxID) + tvPairs = append(tvPairs, reader.TagValuePair{Tag: "FileName", Value: "f2"}) _, err = ParseTagValues(tvPairs) if err == nil { t.Errorf("%s", err) } - //case 3 : Invalid file with snippet - //Last unpackaged file before the packges start - //Last file of a package and New package starts + // case 3 : Invalid file with snippet + // Last unpackaged file before the packges start + // Last file of a package and New package starts sid1 := spdx.ElementID("s1") parser := tvParser2_2{ doc: &spdx.Document2_2{}, st: psCreationInfo2_2, } fileName := "f2.txt" - err = parser.parsePair2_2("FileName", fileName) - err = parser.parsePair2_2("SnippetSPDXID", string(sid1)) + _ = parser.parsePair2_2("FileName", fileName) + _ = parser.parsePair2_2("SnippetSPDXID", string(sid1)) err = parser.parsePair2_2("PackageName", "p2") if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") } - //case 4 : Invalid File without snippets - //Last unpackaged file before the packges start - //Last file of a package and New package starts + // case 4 : Invalid File without snippets + // Last unpackaged file before the packges start + // Last file of a package and New package starts parser3 := tvParser2_2{ doc: &spdx.Document2_2{}, st: psCreationInfo2_2, } fileName = "f3.txt" - err = parser3.parsePair2_2("FileName", fileName) + _ = parser3.parsePair2_2("FileName", fileName) err = parser3.parsePair2_2("PackageName", "p2") if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") } - err = parser3.parsePair2_2("PackageName", "p2") } diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go index 729db18..3d16272 100644 --- a/tvloader/parser2v2/parse_package.go +++ b/tvloader/parser2v2/parse_package.go @@ -20,9 +20,9 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err case "PackageName": // if package already has a name, create and go on to a new package if parser.pkg == nil || parser.pkg.PackageName != "" { - //check if the previous package contained a spdxId or not - if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == spdx.ElementID("") { - return fmt.Errorf("Invalid package without a package SPDX identifier") + // check if the previous package contained a spdxId or not + if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == nullSpdxElementId2_2 { + return fmt.Errorf("invalid package without a package SPDX identifier") } parser.pkg = &spdx.Package2_2{ FilesAnalyzed: true, diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go index 1983baf..6ed5dce 100644 --- a/tvloader/parser2v2/parse_package_test.go +++ b/tvloader/parser2v2/parse_package_test.go @@ -1126,19 +1126,16 @@ func TestParser2_2PackageWithoutSpdxIdentifierThrowsError(t *testing.T) { pkgName := "p2" err := parser.parsePair2_2("PackageName", pkgName) if err == nil { - t.Errorf("Packages withoutSpdx Identifiers getting accepted") - } - var tvPairs []reader.TagValuePair - tvPair1 := reader.TagValuePair{Tag: "SPDXVersion", Value: "SPDX-2.2"} - tvPairs = append(tvPairs, tvPair1) - tvPair2 := reader.TagValuePair{Tag: "DataLicense", Value: "CC0-1.0"} - tvPairs = append(tvPairs, tvPair2) - tvPair3 := reader.TagValuePair{Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"} - tvPairs = append(tvPairs, tvPair3) - tvPair4 := reader.TagValuePair{Tag: "PackageName", Value: "p1"} - tvPairs = append(tvPairs, tvPair4) + t.Errorf("packages withoutSpdx Identifiers getting accepted") + } + tvPairs := []reader.TagValuePair{ + {Tag: "SPDXVersion", Value: "SPDX-2.2"}, + {Tag: "DataLicense", Value: "CC0-1.0"}, + {Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"}, + {Tag: "PackageName", Value: "p1"}, + } _, err = ParseTagValues(tvPairs) if err == nil { - t.Errorf("Packages withoutSpdx Identifiers getting accepted") + t.Errorf("packages withoutSpdx Identifiers getting accepted") } } diff --git a/tvloader/parser2v2/parse_snippet.go b/tvloader/parser2v2/parse_snippet.go index 0de54e2..59b8472 100644 --- a/tvloader/parser2v2/parse_snippet.go +++ b/tvloader/parser2v2/parse_snippet.go @@ -34,9 +34,9 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 - //check here whether the last file of the previous package contained the FileSpdxIdentifier - if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { - return fmt.Errorf("Invalid file without a file SPDX identifier") + // check here whether the last file of the previous package contained the FileSpdxIdentifier + if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { + return fmt.Errorf("invalid file without a file SPDX identifier") } parser.file = nil parser.snippet = nil diff --git a/tvloader/parser2v2/parser.go b/tvloader/parser2v2/parser.go index 8216fbb..4f47de5 100644 --- a/tvloader/parser2v2/parser.go +++ b/tvloader/parser2v2/parser.go @@ -20,11 +20,11 @@ func ParseTagValues(tvs []reader.TagValuePair) (*spdx.Document2_2, error) { return nil, err } } - if parser.file != nil && parser.file.FileSPDXIdentifier == spdx.ElementID("") { - return nil, fmt.Errorf("Invalid file without a file SPDX identifier") + if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { + return nil, fmt.Errorf("invalid file without a file SPDX identifier") } - if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == spdx.ElementID("") { - return nil, fmt.Errorf("Invalid package without a package SPDX identifier") + if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == nullSpdxElementId2_2 { + return nil, fmt.Errorf("invalid package without a package SPDX identifier") } return parser.doc, nil } @@ -46,14 +46,14 @@ func (parser *tvParser2_2) parsePair2_2(tag string, value string) error { case psReview2_2: return parser.parsePairFromReview2_2(tag, value) default: - return fmt.Errorf("Parser state %v not recognized when parsing (%s, %s)", parser.st, tag, value) + return fmt.Errorf("parser state %v not recognized when parsing (%s, %s)", parser.st, tag, value) } } func (parser *tvParser2_2) parsePairFromStart2_2(tag string, value string) error { // fail if not in Start parser state if parser.st != psStart2_2 { - return fmt.Errorf("Got invalid state %v in parsePairFromStart2_2", parser.st) + return fmt.Errorf("got invalid state %v in parsePairFromStart2_2", parser.st) } // create an SPDX Document data struct if we don't have one already diff --git a/tvloader/parser2v2/types.go b/tvloader/parser2v2/types.go index 6039a1c..1cdbcef 100644 --- a/tvloader/parser2v2/types.go +++ b/tvloader/parser2v2/types.go @@ -52,3 +52,5 @@ const ( // in review section psReview2_2 ) + +const nullSpdxElementId2_2 = spdx.ElementID("") -- cgit v1.2.3 From 4efac7b1447c34fd10fa3b5a8cdb1e690d2b6be6 Mon Sep 17 00:00:00 2001 From: specter25 Date: Wed, 12 May 2021 19:26:25 +0530 Subject: Structural modifications in error checks -- Added file name display in error messages - Structured the tests in respective files Signed-off-by: specter25 --- tvloader/parser2v2/parse_creation_info.go | 2 +- tvloader/parser2v2/parse_file.go | 4 +-- tvloader/parser2v2/parse_file_test.go | 42 +++++++++++++------------------ tvloader/parser2v2/parse_package.go | 2 +- tvloader/parser2v2/parse_package_test.go | 12 --------- tvloader/parser2v2/parse_snippet.go | 8 +++--- tvloader/parser2v2/parser.go | 4 +-- tvloader/parser2v2/parser_test.go | 30 ++++++++++++++++++++++ 8 files changed, 57 insertions(+), 47 deletions(-) (limited to 'tvloader/parser2v2') diff --git a/tvloader/parser2v2/parse_creation_info.go b/tvloader/parser2v2/parse_creation_info.go index 930ff00..8e7d270 100644 --- a/tvloader/parser2v2/parse_creation_info.go +++ b/tvloader/parser2v2/parse_creation_info.go @@ -78,7 +78,7 @@ func (parser *tvParser2_2) parsePairFromCreationInfo2_2(tag string, value string case "PackageName": // Error if last file does not has FileSPDXId if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { - return fmt.Errorf("invalid file without a package SPDX identifier") + return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } parser.st = psPackage2_2 parser.pkg = &spdx.Package2_2{ diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go index 7e004e9..ad2d32c 100644 --- a/tvloader/parser2v2/parse_file.go +++ b/tvloader/parser2v2/parse_file.go @@ -20,7 +20,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error case "FileName": // check if the previous file contained a spdxId or not if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { - return fmt.Errorf("invalid file without a file SPDX identifier") + return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } parser.file = &spdx.File2_2{} parser.file.FileName = value @@ -29,7 +29,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error parser.st = psPackage2_2 // check if the previous file containes a spdxId or not if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { - return fmt.Errorf("invalid file without a file SPDX identifier") + return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } parser.file = nil return parser.parsePairFromPackage2_2(tag, value) diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go index f5234a2..6b8f878 100644 --- a/tvloader/parser2v2/parse_file_test.go +++ b/tvloader/parser2v2/parse_file_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/spdx/tools-golang/spdx" - "github.com/spdx/tools-golang/tvloader/reader" ) // ===== Parser file section state change tests ===== @@ -920,44 +919,34 @@ func TestParser2_2FailsIfArtifactURIBeforeArtifactName(t *testing.T) { } func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { - // case 1 - // Last unpackaged file no packages in doc - // Last file of last package in the doc - tvPairs := []reader.TagValuePair{ - {Tag: "SPDXVersion", Value: "SPDX-2.2"}, - {Tag: "DataLicense", Value: "CC0-1.0"}, - {Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"}, - {Tag: "FileName", Value: "f1"}, - } - _, err := ParseTagValues(tvPairs) - if err == nil { - t.Errorf("files withoutSpdx Identifiers getting accepted") + // case 1 : The previous file (packaged or unpackaged does not contain spdxID) + parser1 := tvParser2_2{ + doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, + st: psFile2_2, + file: &spdx.File2_2{FileName: "FileName"}, } - // case 2 : The previous file (packaged or unpackaged does not contain spdxID) - tvPairs = append(tvPairs, reader.TagValuePair{Tag: "FileName", Value: "f2"}) - _, err = ParseTagValues(tvPairs) + err := parser1.parsePair2_2("FileName", "f2") if err == nil { - t.Errorf("%s", err) + t.Errorf("files withoutSpdx Identifiers getting accepted") } - // case 3 : Invalid file with snippet - // Last unpackaged file before the packges start + // case 2 : Invalid file with snippet + // Last unpackaged file before the snippet start // Last file of a package and New package starts sid1 := spdx.ElementID("s1") - parser := tvParser2_2{ + parser2 := tvParser2_2{ doc: &spdx.Document2_2{}, st: psCreationInfo2_2, } fileName := "f2.txt" - _ = parser.parsePair2_2("FileName", fileName) - _ = parser.parsePair2_2("SnippetSPDXID", string(sid1)) - err = parser.parsePair2_2("PackageName", "p2") + _ = parser2.parsePair2_2("FileName", fileName) + err = parser2.parsePair2_2("SnippetSPDXID", string(sid1)) if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") } - // case 4 : Invalid File without snippets + // case 3 : Invalid File without snippets // Last unpackaged file before the packges start // Last file of a package and New package starts parser3 := tvParser2_2{ @@ -965,7 +954,10 @@ func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { st: psCreationInfo2_2, } fileName = "f3.txt" - _ = parser3.parsePair2_2("FileName", fileName) + err = parser3.parsePair2_2("FileName", fileName) + if err != nil { + t.Errorf("%s", err) + } err = parser3.parsePair2_2("PackageName", "p2") if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go index 3d16272..a9bcb6c 100644 --- a/tvloader/parser2v2/parse_package.go +++ b/tvloader/parser2v2/parse_package.go @@ -22,7 +22,7 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err if parser.pkg == nil || parser.pkg.PackageName != "" { // check if the previous package contained a spdxId or not if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == nullSpdxElementId2_2 { - return fmt.Errorf("invalid package without a package SPDX identifier") + return fmt.Errorf("package with PackageName %s does not have SPDX identifier", parser.pkg.PackageName) } parser.pkg = &spdx.Package2_2{ FilesAnalyzed: true, diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go index 6ed5dce..1028a64 100644 --- a/tvloader/parser2v2/parse_package_test.go +++ b/tvloader/parser2v2/parse_package_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/spdx/tools-golang/spdx" - "github.com/spdx/tools-golang/tvloader/reader" ) // ===== Parser package section state change tests ===== @@ -1122,20 +1121,9 @@ func TestParser2_2PackageWithoutSpdxIdentifierThrowsError(t *testing.T) { t.Errorf("expected 1 package, got %d", len(parser.doc.Packages)) } - // Case 2: Checks the Last package pkgName := "p2" err := parser.parsePair2_2("PackageName", pkgName) if err == nil { t.Errorf("packages withoutSpdx Identifiers getting accepted") } - tvPairs := []reader.TagValuePair{ - {Tag: "SPDXVersion", Value: "SPDX-2.2"}, - {Tag: "DataLicense", Value: "CC0-1.0"}, - {Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"}, - {Tag: "PackageName", Value: "p1"}, - } - _, err = ParseTagValues(tvPairs) - if err == nil { - t.Errorf("packages withoutSpdx Identifiers getting accepted") - } } diff --git a/tvloader/parser2v2/parse_snippet.go b/tvloader/parser2v2/parse_snippet.go index 59b8472..6ea1f5d 100644 --- a/tvloader/parser2v2/parse_snippet.go +++ b/tvloader/parser2v2/parse_snippet.go @@ -13,6 +13,10 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err switch tag { // tag for creating new snippet section case "SnippetSPDXID": + // check here whether the file containe + if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { + return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) + } parser.snippet = &spdx.Snippet2_2{} eID, err := extractElementID(value) if err != nil { @@ -34,10 +38,6 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 - // check here whether the last file of the previous package contained the FileSpdxIdentifier - if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { - return fmt.Errorf("invalid file without a file SPDX identifier") - } parser.file = nil parser.snippet = nil return parser.parsePairFromPackage2_2(tag, value) diff --git a/tvloader/parser2v2/parser.go b/tvloader/parser2v2/parser.go index 4f47de5..9886874 100644 --- a/tvloader/parser2v2/parser.go +++ b/tvloader/parser2v2/parser.go @@ -21,10 +21,10 @@ func ParseTagValues(tvs []reader.TagValuePair) (*spdx.Document2_2, error) { } } if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { - return nil, fmt.Errorf("invalid file without a file SPDX identifier") + return nil, fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == nullSpdxElementId2_2 { - return nil, fmt.Errorf("invalid package without a package SPDX identifier") + return nil, fmt.Errorf("package with PackageName %s does not have SPDX identifier", parser.pkg.PackageName) } return parser.doc, nil } diff --git a/tvloader/parser2v2/parser_test.go b/tvloader/parser2v2/parser_test.go index 7eec49c..8393358 100644 --- a/tvloader/parser2v2/parser_test.go +++ b/tvloader/parser2v2/parser_test.go @@ -77,3 +77,33 @@ func TestParser2_2StartFailsToParseIfInInvalidState(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } + +func TestParser2_2FilesWithoutSpdxIdThrowErrorAtCompleteParse(t *testing.T) { + // case + // Last unpackaged file no packages in doc + // Last file of last package in the doc + tvPairs := []reader.TagValuePair{ + {Tag: "SPDXVersion", Value: "SPDX-2.2"}, + {Tag: "DataLicense", Value: "CC0-1.0"}, + {Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"}, + {Tag: "FileName", Value: "f1"}, + } + _, err := ParseTagValues(tvPairs) + if err == nil { + t.Errorf("files withoutSpdx Identifiers getting accepted") + } +} + +func TestParser2_2PackageWithoutSpdxIdThrowErrorAtCompleteParse(t *testing.T) { + // case : Checks the last package + tvPairs := []reader.TagValuePair{ + {Tag: "SPDXVersion", Value: "SPDX-2.2"}, + {Tag: "DataLicense", Value: "CC0-1.0"}, + {Tag: "SPDXID", Value: "SPDXRef-DOCUMENT"}, + {Tag: "PackageName", Value: "p1"}, + } + _, err := ParseTagValues(tvPairs) + if err == nil { + t.Errorf("packages withoutSpdx Identifiers getting accepted") + } +} -- cgit v1.2.3 From b5d120102fa763bbe482a85a00d9a4d4b4e34657 Mon Sep 17 00:00:00 2001 From: specter25 Date: Wed, 12 May 2021 22:11:11 +0530 Subject: Units Tests in tvloader structured and a few tests added Signed-off-by: specter25 --- tvloader/parser2v2/parse_file_test.go | 8 ++++---- tvloader/parser2v2/parse_snippet_test.go | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'tvloader/parser2v2') diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go index 6b8f878..c0cbe92 100644 --- a/tvloader/parser2v2/parse_file_test.go +++ b/tvloader/parser2v2/parse_file_test.go @@ -934,13 +934,13 @@ func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { // case 2 : Invalid file with snippet // Last unpackaged file before the snippet start // Last file of a package and New package starts + fileName := "f2.txt" sid1 := spdx.ElementID("s1") parser2 := tvParser2_2{ - doc: &spdx.Document2_2{}, - st: psCreationInfo2_2, + doc: &spdx.Document2_2{}, + st: psCreationInfo2_2, + file: &spdx.File2_2{FileName: fileName}, } - fileName := "f2.txt" - _ = parser2.parsePair2_2("FileName", fileName) err = parser2.parsePair2_2("SnippetSPDXID", string(sid1)) if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") diff --git a/tvloader/parser2v2/parse_snippet_test.go b/tvloader/parser2v2/parse_snippet_test.go index 987fe2a..1cabe3c 100644 --- a/tvloader/parser2v2/parse_snippet_test.go +++ b/tvloader/parser2v2/parse_snippet_test.go @@ -614,3 +614,21 @@ func TestParser2_2FailsForInvalidSnippetLineValues(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } + +func TestParser2_2FilesWithoutSpdxIdThrowErrorWithSniipets(t *testing.T) { + // Invalid file with snippet + // Last unpackaged file before the snippet start + // Last file of a package and New package starts + fileName := "f2.txt" + sid1 := spdx.ElementID("s1") + parser2 := tvParser2_2{ + doc: &spdx.Document2_2{}, + st: psCreationInfo2_2, + file: &spdx.File2_2{FileName: fileName}, + } + err := parser2.parsePair2_2("SnippetSPDXID", string(sid1)) + if err == nil { + t.Errorf("files withoutSpdx Identifiers getting accepted") + } + +} -- cgit v1.2.3 From b238c888559fcfaba7abc4d73741b633746c10d2 Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Sun, 4 Jul 2021 10:54:31 -0400 Subject: Minor cleanup edits to text and comments Signed-off-by: Steve Winslow --- tvloader/parser2v2/parse_creation_info.go | 5 ++++- tvloader/parser2v2/parse_file.go | 4 ++-- tvloader/parser2v2/parse_file_test.go | 15 +++++++-------- tvloader/parser2v2/parse_package.go | 2 +- tvloader/parser2v2/parse_package_test.go | 4 ++-- tvloader/parser2v2/parse_snippet.go | 2 +- tvloader/parser2v2/parse_snippet_test.go | 6 +++--- tvloader/parser2v2/parser_test.go | 10 +++++----- 8 files changed, 25 insertions(+), 23 deletions(-) (limited to 'tvloader/parser2v2') diff --git a/tvloader/parser2v2/parse_creation_info.go b/tvloader/parser2v2/parse_creation_info.go index 8e7d270..c2bfe40 100644 --- a/tvloader/parser2v2/parse_creation_info.go +++ b/tvloader/parser2v2/parse_creation_info.go @@ -76,7 +76,10 @@ func (parser *tvParser2_2) parsePairFromCreationInfo2_2(tag string, value string // tag for going on to package section case "PackageName": - // Error if last file does not has FileSPDXId + // error if last file does not have an identifier + // this may be a null case: can we ever have a "last file" in + // the "creation info" state? should go on to "file" state + // even when parsing unpackaged files. if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go index ad2d32c..27ec6a4 100644 --- a/tvloader/parser2v2/parse_file.go +++ b/tvloader/parser2v2/parse_file.go @@ -18,7 +18,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error switch tag { // tag for creating new file section case "FileName": - // check if the previous file contained a spdxId or not + // check if the previous file contained an spdx Id or not if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } @@ -27,7 +27,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 - // check if the previous file containes a spdxId or not + // check if the previous file contained an spdx Id or not if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go index c0cbe92..689a2df 100644 --- a/tvloader/parser2v2/parse_file_test.go +++ b/tvloader/parser2v2/parse_file_test.go @@ -919,7 +919,7 @@ func TestParser2_2FailsIfArtifactURIBeforeArtifactName(t *testing.T) { } func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { - // case 1 : The previous file (packaged or unpackaged does not contain spdxID) + // case 1: The previous file (packaged or unpackaged) does not contain spdx ID parser1 := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, @@ -928,12 +928,11 @@ func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { err := parser1.parsePair2_2("FileName", "f2") if err == nil { - t.Errorf("files withoutSpdx Identifiers getting accepted") + t.Errorf("file without SPDX Identifier getting accepted") } - // case 2 : Invalid file with snippet + // case 2: Invalid file with snippet // Last unpackaged file before the snippet start - // Last file of a package and New package starts fileName := "f2.txt" sid1 := spdx.ElementID("s1") parser2 := tvParser2_2{ @@ -943,11 +942,11 @@ func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { } err = parser2.parsePair2_2("SnippetSPDXID", string(sid1)) if err == nil { - t.Errorf("files withoutSpdx Identifiers getting accepted") + t.Errorf("file without SPDX Identifier getting accepted") } - // case 3 : Invalid File without snippets - // Last unpackaged file before the packges start + // case 3: Invalid File without snippets + // Last unpackaged file before the package starts // Last file of a package and New package starts parser3 := tvParser2_2{ doc: &spdx.Document2_2{}, @@ -960,6 +959,6 @@ func TestParser2_2FilesWithoutSpdxIdThrowError(t *testing.T) { } err = parser3.parsePair2_2("PackageName", "p2") if err == nil { - t.Errorf("files withoutSpdx Identifiers getting accepted") + t.Errorf("file without SPDX Identifier getting accepted") } } diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go index a9bcb6c..15f7dc6 100644 --- a/tvloader/parser2v2/parse_package.go +++ b/tvloader/parser2v2/parse_package.go @@ -20,7 +20,7 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err case "PackageName": // if package already has a name, create and go on to a new package if parser.pkg == nil || parser.pkg.PackageName != "" { - // check if the previous package contained a spdxId or not + // check if the previous package contained an spdx Id or not if parser.pkg != nil && parser.pkg.PackageSPDXIdentifier == nullSpdxElementId2_2 { return fmt.Errorf("package with PackageName %s does not have SPDX identifier", parser.pkg.PackageName) } diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go index 1028a64..5809931 100644 --- a/tvloader/parser2v2/parse_package_test.go +++ b/tvloader/parser2v2/parse_package_test.go @@ -1104,7 +1104,7 @@ func TestFailsPackageExternalRefWithInvalidFormat(t *testing.T) { } func TestParser2_2PackageWithoutSpdxIdentifierThrowsError(t *testing.T) { - // More than one package , the previous package doesn't contain the SPDXID + // More than one package, the previous package doesn't contain an SPDX ID pkgOldName := "p1" parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, @@ -1124,6 +1124,6 @@ func TestParser2_2PackageWithoutSpdxIdentifierThrowsError(t *testing.T) { pkgName := "p2" err := parser.parsePair2_2("PackageName", pkgName) if err == nil { - t.Errorf("packages withoutSpdx Identifiers getting accepted") + t.Errorf("package without SPDX Identifier getting accepted") } } diff --git a/tvloader/parser2v2/parse_snippet.go b/tvloader/parser2v2/parse_snippet.go index 6ea1f5d..7f58604 100644 --- a/tvloader/parser2v2/parse_snippet.go +++ b/tvloader/parser2v2/parse_snippet.go @@ -13,7 +13,7 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err switch tag { // tag for creating new snippet section case "SnippetSPDXID": - // check here whether the file containe + // check here whether the file contained an SPDX ID or not if parser.file != nil && parser.file.FileSPDXIdentifier == nullSpdxElementId2_2 { return fmt.Errorf("file with FileName %s does not have SPDX identifier", parser.file.FileName) } diff --git a/tvloader/parser2v2/parse_snippet_test.go b/tvloader/parser2v2/parse_snippet_test.go index 1cabe3c..d019a0c 100644 --- a/tvloader/parser2v2/parse_snippet_test.go +++ b/tvloader/parser2v2/parse_snippet_test.go @@ -615,9 +615,9 @@ func TestParser2_2FailsForInvalidSnippetLineValues(t *testing.T) { } } -func TestParser2_2FilesWithoutSpdxIdThrowErrorWithSniipets(t *testing.T) { +func TestParser2_2FilesWithoutSpdxIdThrowErrorWithSnippets(t *testing.T) { // Invalid file with snippet - // Last unpackaged file before the snippet start + // Last unpackaged file before the snippet starts // Last file of a package and New package starts fileName := "f2.txt" sid1 := spdx.ElementID("s1") @@ -628,7 +628,7 @@ func TestParser2_2FilesWithoutSpdxIdThrowErrorWithSniipets(t *testing.T) { } err := parser2.parsePair2_2("SnippetSPDXID", string(sid1)) if err == nil { - t.Errorf("files withoutSpdx Identifiers getting accepted") + t.Errorf("file without SPDX Identifier getting accepted") } } diff --git a/tvloader/parser2v2/parser_test.go b/tvloader/parser2v2/parser_test.go index 8393358..4cd5228 100644 --- a/tvloader/parser2v2/parser_test.go +++ b/tvloader/parser2v2/parser_test.go @@ -79,8 +79,8 @@ func TestParser2_2StartFailsToParseIfInInvalidState(t *testing.T) { } func TestParser2_2FilesWithoutSpdxIdThrowErrorAtCompleteParse(t *testing.T) { - // case - // Last unpackaged file no packages in doc + // case: Checks the last file + // Last unpackaged file with no packages in doc // Last file of last package in the doc tvPairs := []reader.TagValuePair{ {Tag: "SPDXVersion", Value: "SPDX-2.2"}, @@ -90,12 +90,12 @@ func TestParser2_2FilesWithoutSpdxIdThrowErrorAtCompleteParse(t *testing.T) { } _, err := ParseTagValues(tvPairs) if err == nil { - t.Errorf("files withoutSpdx Identifiers getting accepted") + t.Errorf("file without SPDX Identifier getting accepted") } } func TestParser2_2PackageWithoutSpdxIdThrowErrorAtCompleteParse(t *testing.T) { - // case : Checks the last package + // case: Checks the last package tvPairs := []reader.TagValuePair{ {Tag: "SPDXVersion", Value: "SPDX-2.2"}, {Tag: "DataLicense", Value: "CC0-1.0"}, @@ -104,6 +104,6 @@ func TestParser2_2PackageWithoutSpdxIdThrowErrorAtCompleteParse(t *testing.T) { } _, err := ParseTagValues(tvPairs) if err == nil { - t.Errorf("packages withoutSpdx Identifiers getting accepted") + t.Errorf("package without SPDX Identifier getting accepted") } } -- cgit v1.2.3