fixin bug in jsonsaver - avoid producing "Files: null" and "Snippets:…

… null" if saveing a package without files (filesAnalyzed is false) Signed-off-by: Yan Yagudayev <yanyag@gmail.com>
spdx · Nov 25, 2021 · a6b19d6 · a6b19d6
1 parent 1d27f44
commit a6b19d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/jsonsaver/saver2v2/save_document.go b/jsonsaver/saver2v2/save_document.go
@@ -71,7 +71,7 @@ func RenderDocument2_2(doc *spdx.Document2_2, buf *bytes.Buffer) error {
 	}
 
 	// save files and snippets from spdx to json
-	if allfiles != nil {
+	if len(allfiles) > 0 {
 		_, err = renderFiles2_2(doc, jsondocument, allfiles)
 		if err != nil {
 			return err

diff --git a/jsonsaver/saver2v2/save_document_test.go b/jsonsaver/saver2v2/save_document_test.go
@@ -88,6 +88,11 @@ func TestRenderDocument2_2(t *testing.T) {
 				RefB:         spdx.DocElementID{DocumentRefID: "", ElementRefID: "Package"},
 				Relationship: "CONTAINS",
 			},
+			{
+				RefA:         spdx.DocElementID{DocumentRefID: "", ElementRefID: "DOCUMENT"},
+				RefB:         spdx.DocElementID{DocumentRefID: "", ElementRefID: "p1"},
+				Relationship: "CONTAINS",
+			},
 			{
 				RefA:                spdx.DocElementID{DocumentRefID: "", ElementRefID: "DOCUMENT"},
 				RefB:                spdx.DocElementID{DocumentRefID: "", ElementRefID: "File"},
@@ -255,6 +260,11 @@ func TestRenderDocument2_2(t *testing.T) {
 				"relatedSpdxElement": "SPDXRef-Package",
 				"relationshipType":   "CONTAINS",
 			},
+			map[string]interface{}{
+				"spdxElementId":      "SPDXRef-DOCUMENT",
+				"relatedSpdxElement": "SPDXRef-p1",
+				"relationshipType":   "CONTAINS",
+			},
 			map[string]interface{}{
 				"spdxElementId":      "SPDXRef-DOCUMENT",
 				"relatedSpdxElement": "SPDXRef-File",