Fix broken references during bump so that the written test json validates properly against the shacl model. Also fill in required root elements for document.

Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>

Author: fholger

src/spdx_tools/spdx3/bump_from_spdx2/annotation.py

@@ -43,7 +43,7 @@ def bump_annotation(
             spdx_id,
             annotation_type,
             creation_info=creation_info,
-            subject=spdx2_annotation.spdx_id,
+            subject=f"{document_namespace}#{spdx2_annotation.spdx_id}",
             statement=spdx2_annotation.annotation_comment,
         )
     )

src/spdx_tools/spdx3/bump_from_spdx2/creation_info.py

@@ -73,7 +73,7 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
         name=spdx2_creation_info.name,
         comment=document_comment,
         element=[],
-        root_element=[],
+        root_element=[spdx_id],
         imports=imports,
         namespaces=namespaces,
     )

src/spdx_tools/spdx3/bump_from_spdx2/relationship.py

@@ -204,9 +204,9 @@ def bump_relationship(
 
         return SoftwareDependencyRelationship(
             spdx_id,
-            from_element,
+            f"{document_namespace}#{from_element}",
             relationship_type,
-            to,
+            [f"{document_namespace}#{t}" for t in to],
             creation_info=creation_info,
             comment=spdx2_relationship.comment,
             completeness=completeness,
@@ -217,9 +217,9 @@ def bump_relationship(
 
     return Relationship(
         spdx_id,
-        from_element,
+        f"{document_namespace}#{from_element}",
         relationship_type,
-        to,
+        [f"{document_namespace}#{t}" for t in to],
         creation_info=creation_info,
         comment=spdx2_relationship.comment,
         completeness=completeness,