Add Tests And Bug Fixes For Remaining Files

 - setting file referenced in the range to parser files instead of the Unpackaged Files.
 - externalReference now requires just a node rather than a triple.
 - tidied and DRYed parsing of Snippet range.
 - allow licenseInfoInFile of File to be AnyLicenseInfo instead of SimpleLicensingInfo.
 - change signature of getSnippetInformation from Triple To Node.
 - add simpleLicensingInfo switch in the anyLicensingInfo switch.
 - change input of getExternaelDocumentRef from triples to Node for easier prototyping.
 - remove unused methods in utils
 - remove parser association from utils functions

Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/rdfloader/parser2v2/parse_relationship.go b/rdfloader/parser2v2/parse_relationship.go
index 91f44f8..b2ccf2f 100644
--- a/rdfloader/parser2v2/parse_relationship.go
+++ b/rdfloader/parser2v2/parse_relationship.go
@@ -72,11 +72,11 @@ func (parser *rdfParser2_2) parseRelatedElementFromTriple(reln *spdx.Relationshi
 	case SPDX_FILE:
 		file, err := parser.getFileFromNode(triple.Subject)
 		if err != nil {
-			return fmt.Errorf("error setting a package: %v", err)
+			return fmt.Errorf("error setting a file: %v", err)
 		}
-		reln.RefB, err = ExtractDocElementID(getLastPartOfURI(triple.Subject.ID))
-		if err != nil {
-			return err
+		reln.RefB = spdx.DocElementID{
+			DocumentRefID: "",
+			ElementRefID:  file.FileSPDXIdentifier,
 		}
 		parser.files[file.FileSPDXIdentifier] = file
 
@@ -85,11 +85,10 @@ func (parser *rdfParser2_2) parseRelatedElementFromTriple(reln *spdx.Relationshi
 		if err != nil {
 			return fmt.Errorf("error setting a package inside a relationship: %v", err)
 		}
-		reln.RefB, err = ExtractDocElementID(getLastPartOfURI(triple.Subject.ID))
-		if err != nil {
-			return err
+		reln.RefB = spdx.DocElementID{
+			DocumentRefID: "",
+			ElementRefID:  pkg.PackageSPDXIdentifier,
 		}
-
 		parser.packages[pkg.PackageSPDXIdentifier] = pkg
 
 	case SPDX_SPDX_ELEMENT: