Structural modifications in error checks

-- Added file name display in error messages
- Structured the tests in respective files

Signed-off-by: specter25 <ujjwalcoding012@gmail.com>

1 files changed, 2 insertions, 2 deletions

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
 }