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/parser2v1/parse_file_test.go | 8 ++++---- tvloader/parser2v1/parse_snippet_test.go | 17 +++++++++++++++++ tvloader/parser2v2/parse_file_test.go | 8 ++++---- tvloader/parser2v2/parse_snippet_test.go | 18 ++++++++++++++++++ 4 files changed, 43 insertions(+), 8 deletions(-) (limited to 'tvloader') diff --git a/tvloader/parser2v1/parse_file_test.go b/tvloader/parser2v1/parse_file_test.go index e302a53..df14a18 100644 --- a/tvloader/parser2v1/parse_file_test.go +++ b/tvloader/parser2v1/parse_file_test.go @@ -902,12 +902,12 @@ func TestParser2_1FilesWithoutSpdxIdThrowError(t *testing.T) { // Last unpackaged file before the snippet start // Last file of a package and New package starts sid1 := spdx.ElementID("s1") + fileName := "f2.txt" parser2 := tvParser2_1{ - doc: &spdx.Document2_1{}, - st: psCreationInfo2_1, + doc: &spdx.Document2_1{}, + st: psCreationInfo2_1, + file: &spdx.File2_1{FileName: fileName}, } - fileName := "f2.txt" - _ = parser2.parsePair2_1("FileName", fileName) err = parser2.parsePair2_1("SnippetSPDXID", string(sid1)) if err == nil { t.Errorf("files withoutSpdx Identifiers getting accepted") diff --git a/tvloader/parser2v1/parse_snippet_test.go b/tvloader/parser2v1/parse_snippet_test.go index a4412df..7b83f3d 100644 --- a/tvloader/parser2v1/parse_snippet_test.go +++ b/tvloader/parser2v1/parse_snippet_test.go @@ -587,3 +587,20 @@ func TestParser2_1FailsForInvalidSnippetLineValues(t *testing.T) { } } +func TestParser2_1FilesWithoutSpdxIdThrowErrorWithSniipets(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_1{ + doc: &spdx.Document2_1{}, + st: psCreationInfo2_1, + file: &spdx.File2_1{FileName: fileName}, + } + err := parser2.parsePair2_1("SnippetSPDXID", string(sid1)) + if err == nil { + t.Errorf("files withoutSpdx Identifiers getting accepted") + } + +} 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