fix tests and formatting

Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>

Author: armintaenzertng

src/spdx_tools/spdx3/bump_from_spdx2/snippet.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 spdx contributors
 #
 # SPDX-License-Identifier: Apache-2.0
-from typing import List, Tuple, Optional
+from typing import List, Optional, Tuple
 
 from spdx_tools.spdx3.bump_from_spdx2.license_expression import bump_license_expression_or_none_or_no_assertion
 from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion

src/spdx_tools/spdx3/writer/json_ld/owl_to_context.py

@@ -63,7 +63,7 @@ def convert_spdx_owl_to_jsonld_context(spdx_owl: str = "SPDX_OWL.json"):
             name = node["@id"].split(":")[-1]
             type_id = node["rdfs:range"]["@id"]
 
-            if name in context_dict and context_dict[name]["@id"].startswith('core'):
+            if name in context_dict and context_dict[name]["@id"].startswith("core"):
                 # if in doubt, prioritize core properties
                 continue
 

tests/spdx3/bump/test_file_bump.py

@@ -27,7 +27,7 @@ def test_bump_file(creation_info):
     assert file.spdx_id == expected_new_file_id
     assert file.verified_using == [integrity_method]
     assert file.concluded_license == ConjunctiveLicenseSet(
-        [ListedLicense("MIT", "MIT", ""), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "")]
+        [ListedLicense("MIT", "MIT", "blank"), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "blank")]
     )
     assert file.copyright_text == spdx2_file.copyright_text
     assert file.attribution_text == spdx2_file.attribution_texts[0]

tests/spdx3/bump/test_license_expression_bump.py

@@ -40,8 +40,8 @@ def test_license_expression_or_none_or_no_assertion(element, expected_class):
 @pytest.mark.parametrize(
     "license_expression, extracted_licensing_info, expected_element",
     [
-        (get_spdx_licensing().parse("MIT"), [], ListedLicense("MIT", "MIT", "")),
-        (get_spdx_licensing().parse("LGPL-2.0"), [], ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", "")),
+        (get_spdx_licensing().parse("MIT"), [], ListedLicense("MIT", "MIT", "blank")),
+        (get_spdx_licensing().parse("LGPL-2.0"), [], ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", "blank")),
         (
             get_spdx_licensing().parse("LicenseRef-1"),
             [extracted_licensing_info_fixture()],
@@ -51,7 +51,7 @@ def test_license_expression_or_none_or_no_assertion(element, expected_class):
             get_spdx_licensing().parse("MIT AND LGPL-2.0"),
             [],
             ConjunctiveLicenseSet(
-                [ListedLicense("MIT", "MIT", ""), ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", "")]
+                [ListedLicense("MIT", "MIT", "blank"), ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", "blank")]
             ),
         ),
         (
@@ -60,15 +60,16 @@ def test_license_expression_or_none_or_no_assertion(element, expected_class):
             DisjunctiveLicenseSet(
                 [
                     CustomLicense("LicenseRef-1", "licenseName", "extractedText"),
-                    ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", ""),
+                    ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", "blank"),
                 ]
             ),
         ),
         (
             get_spdx_licensing().parse("LGPL-2.0 WITH 389-exception"),
             [],
             WithAdditionOperator(
-                ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", ""), ListedLicenseException("389-exception", "", "")
+                ListedLicense("LGPL-2.0-only", "LGPL-2.0-only", "blank"),
+                ListedLicenseException("389-exception", "", ""),
             ),
         ),
         (
@@ -90,7 +91,7 @@ def test_license_expression_or_none_or_no_assertion(element, expected_class):
             ],
             ConjunctiveLicenseSet(
                 [
-                    ListedLicense("MIT", "MIT", ""),
+                    ListedLicense("MIT", "MIT", "blank"),
                     WithAdditionOperator(
                         CustomLicense("LicenseRef-1", "licenseName", "extractedText"),
                         CustomLicenseAddition("custom-exception", "exceptionName", "This is a custom exception"),

tests/spdx3/bump/test_package_bump.py

@@ -69,10 +69,10 @@ def test_bump_package(creation_info, originator, expected_originator, supplier,
     assert package.copyright_text == spdx2_package.copyright_text
     assert package.attribution_text == spdx2_package.attribution_texts[0]
     assert package.concluded_license == ConjunctiveLicenseSet(
-        [ListedLicense("MIT", "MIT", ""), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "")]
+        [ListedLicense("MIT", "MIT", "blank"), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "blank")]
     )
     assert package.declared_license == ConjunctiveLicenseSet(
-        [ListedLicense("MIT", "MIT", ""), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "")]
+        [ListedLicense("MIT", "MIT", "blank"), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "blank")]
     )
 
 

tests/spdx3/bump/test_relationship_bump.py

@@ -19,9 +19,9 @@ def test_relationship_bump(creation_info):
 
     assert relationship == Relationship(
         f"{document_namespace}#SPDXRef-Relationship-1",
-        spdx2_relationship.spdx_element_id,
+        f"{document_namespace}#{spdx2_relationship.spdx_element_id}",
         RelationshipType.DESCRIBES,
-        [spdx2_relationship.related_spdx_element_id],
+        [f"{document_namespace}#{spdx2_relationship.related_spdx_element_id}"],
         creation_info=creation_info,
         comment=spdx2_relationship.comment,
     )
@@ -39,9 +39,12 @@ def test_relationships_bump(creation_info):
 
     assert payload.get_element(f"{document_namespace}#SPDXRef-Relationship-1") == Relationship(
         f"{document_namespace}#SPDXRef-Relationship-1",
-        relationships[0].spdx_element_id,
+        f"{document_namespace}#{relationships[0].spdx_element_id}",
         RelationshipType.DESCRIBES,
-        [relationships[0].related_spdx_element_id, relationships[1].related_spdx_element_id],
+        [
+            f"{document_namespace}#{relationships[0].related_spdx_element_id}",
+            f"{document_namespace}#{relationships[1].related_spdx_element_id}",
+        ],
         creation_info=creation_info,
     )
 
@@ -63,7 +66,7 @@ def test_relationships_bump_with_setting_completeness(creation_info):
 
     assert payload.get_element(f"{document_namespace}#SPDXRef-Relationship-0") == Relationship(
         f"{document_namespace}#SPDXRef-Relationship-0",
-        relationships[0].spdx_element_id,
+        f"{document_namespace}#{relationships[0].spdx_element_id}",
         RelationshipType.DESCRIBES,
         [],
         creation_info=creation_info,
@@ -72,15 +75,15 @@ def test_relationships_bump_with_setting_completeness(creation_info):
     )
     assert payload.get_element(f"{document_namespace}#SPDXRef-Relationship-1") == Relationship(
         f"{document_namespace}#SPDXRef-Relationship-1",
-        relationships[1].spdx_element_id,
+        f"{document_namespace}#{relationships[1].spdx_element_id}",
         RelationshipType.DESCRIBES,
-        [relationships[1].related_spdx_element_id],
+        [f"{document_namespace}#{relationships[1].related_spdx_element_id}"],
         creation_info=creation_info,
         comment=relationships[1].comment,
     )
     assert payload.get_element(f"{document_namespace}#SPDXRef-Relationship-2") == Relationship(
         f"{document_namespace}#SPDXRef-Relationship-2",
-        relationships[2].spdx_element_id,
+        f"{document_namespace}#{relationships[2].spdx_element_id}",
         RelationshipType.SPECIFICATION_FOR,
         [],
         creation_info=creation_info,

tests/spdx3/bump/test_snippet_bump.py

@@ -26,5 +26,5 @@ def test_bump_snippet(creation_info):
     assert snippet.copyright_text == spdx2_snippet.copyright_text
     assert snippet.attribution_text == spdx2_snippet.attribution_texts[0]
     assert snippet.concluded_license == ConjunctiveLicenseSet(
-        [ListedLicense("MIT", "MIT", ""), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "")]
+        [ListedLicense("MIT", "MIT", "blank"), ListedLicense("GPL-2.0-only", "GPL-2.0-only", "blank")]
     )

tests/spdx3/model/software/test_snippet.py

@@ -5,6 +5,7 @@
 
 import pytest
 
+from spdx_tools.spdx3.model.positive_integer_range import PositiveIntegerRange
 from spdx_tools.spdx3.model.software import Snippet, SoftwarePurpose
 
 
@@ -15,16 +16,16 @@ def test_correct_initialization(creation_info):
         creation_info=creation_info,
         content_identifier="https://content.identifier",
         purpose=[SoftwarePurpose.SOURCE],
-        byte_range=(3, 4),
-        line_range=(346, 456),
+        byte_range=PositiveIntegerRange(3, 4),
+        line_range=PositiveIntegerRange(346, 456),
     )
 
     assert snippet.spdx_id == "SPDXRef-Snippet"
     assert snippet.creation_info == creation_info
     assert snippet.content_identifier == "https://content.identifier"
     assert snippet.purpose == [SoftwarePurpose.SOURCE]
-    assert snippet.byte_range == (3, 4)
-    assert snippet.line_range == (346, 456)
+    assert snippet.byte_range == PositiveIntegerRange(3, 4)
+    assert snippet.line_range == PositiveIntegerRange(346, 456)
 
 
 @mock.patch("spdx_tools.spdx3.model.software.Snippet", autospec=True)

tests/spdx3/writer/json_ld/test_json_ld_writer.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023 spdx contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+import os
 
 from spdx_tools.spdx3.bump_from_spdx2.spdx_document import bump_spdx_document
 from spdx_tools.spdx3.payload import Payload
@@ -14,4 +15,4 @@ def test_json_writer():
     payload: Payload = bump_spdx_document(spdx2_document)
 
     # this currently generates an actual file to look at, this should be changed to a temp file later
-    write_payload(payload, "../../../SPDX3_jsonld_test")
+    write_payload(payload, os.path.join(os.path.dirname(__file__), "../../../SPDX3_jsonld_test"))