[issue-514] fix writing of multiple packages to rdf files

Signed-off-by: Meret Behrens <[email protected]>

Author: meretp

spdx/writers/rdf.py

@@ -793,18 +793,9 @@ def create_package_node(self, package):
         Return a Node representing the package.
         Files must have been added to the graph before this method is called.
         """
-        package_node = URIRef("http://www.spdx.org/tools#SPDXRef-Package")
+        package_node = URIRef(f"http://www.spdx.org/tools#{package.spdx_id}")
         type_triple = (package_node, RDF.type, self.spdx_namespace.Package)
         self.graph.add(type_triple)
-        # Package SPDXID
-        if package.spdx_id:
-            pkg_spdx_id = URIRef(package.spdx_id)
-            pkg_spdx_id_triple = (
-                package_node,
-                self.spdx_namespace.Package,
-                pkg_spdx_id,
-            )
-            self.graph.add(pkg_spdx_id_triple)
         # Handle optional fields:
         self.handle_pkg_optional_fields(package, package_node)
         # package name

tests/data/doc_write/rdf-simple-plus.json

@@ -6,9 +6,6 @@
       "ns1:describesPackage": {
         "ns1:Package": {
           "@rdf:about": "http://www.spdx.org/tools#SPDXRef-Package",
-          "ns1:Package": {
-            "@rdf:resource": "SPDXRef-Package"
-          },
           "ns1:hasFile": {
             "@rdf:resource": "http://www.spdx.org/files#SPDXRef-File"
           },

tests/data/doc_write/rdf-simple.json

@@ -6,9 +6,6 @@
       "ns1:describesPackage": {
         "ns1:Package": {
           "@rdf:about": "http://www.spdx.org/tools#SPDXRef-Package",
-          "ns1:Package": {
-            "@rdf:resource": "SPDXRef-Package"
-          },
           "ns1:hasFile": {
             "@rdf:resource": "http://www.spdx.org/files#SPDXRef-File"
           },

tests/test_rdf_writer.py

@@ -1,4 +1,6 @@
 import os
+from typing import Optional
+from unittest import TestCase
 
 import pytest
 from rdflib import URIRef
@@ -62,6 +64,35 @@ def test_external_package_references(temporary_file_path) -> None:
     assert second_ref.category in parsed_reference_categories
 
 
+# This test is really clunky since it's hard to isolate features of the rdf writer to test. Should be improved when
+# that part is refactored.
+def test_multiple_packages_in_one_document(temporary_file_path) -> None:
+    doc_node = URIRef("http://www.spdx.org/tools#SPDXRef-DOCUMENT")
+    document = Document()
+    document.creation_info.set_created_now()
+    package = Package()
+    package.spdx_id = "SPDXRef-Package"
+    package.version = "2.1"
+    document.add_package(package)
+    package2 = Package()
+    package2.spdx_id = "SPDXRef-Another-Package"
+    package2.version = "2.3"
+    document.add_package(package2)
+
+    with open(temporary_file_path, "wb") as out:
+        writer = Writer(document, out)
+        writer.write(doc_node)
+    parser = Parser(Builder(), StandardLogger())
+    with open(temporary_file_path, "r") as file:
+        parsed_document: Document = parser.parse(file)[0]
+
+    assert len(parsed_document.packages) == 2
+    first_package = get_package_by_spdx_id("SPDXRef-Package", document)
+    assert first_package.version == "2.1"
+    second_package = get_package_by_spdx_id("SPDXRef-Another-Package", document)
+    assert second_package.version == "2.3"
+
+
 def minimal_document_with_package() -> Document:
     document = Document(data_license=License.from_identifier('CC0-1.0'))
     document.creation_info.set_created_now()
@@ -72,7 +103,15 @@ def minimal_document_with_package() -> Document:
 
 def minimal_package() -> Package:
     package = Package()
+    package.spdx_id = "SPDXRef-Package"
     package.conc_lics = NoAssert()
     package.license_declared = NoAssert()
     package.add_lics_from_file(NoAssert())
     return package
+
+
+def get_package_by_spdx_id(package_spdx_id: str, document: Document) -> Optional[Package]:
+    for package in document.packages:
+        if package.spdx_id == package_spdx_id:
+            return package
+    return None