[issue-673] adapt tests after replacing typeguard with beartype in SPDX3 prototype

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

Author: armintaenzertng

tests/spdx3/__init__.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 spdx contributors
 #
 # SPDX-License-Identifier: Apache-2.0
-from unittest import TestCase, mock
+from unittest import TestCase
 
 import pytest
 
@@ -13,6 +13,7 @@
 from spdx_tools.spdx.model import SpdxNoAssertion
 from spdx_tools.spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory
 from spdx_tools.spdx.model.package import Package as Spdx2_Package
+from tests.spdx3.fixtures import creation_info_fixture
 from tests.spdx.fixtures import actor_fixture, package_fixture
 
 
@@ -29,8 +30,7 @@
         (SpdxNoAssertion(), [], SpdxNoAssertion(), []),
     ],
 )
-@mock.patch("spdx_tools.spdx3.model.CreationInfo")
-def test_bump_package(creation_info, originator, expected_originator, supplier, expected_supplier):
+def test_bump_package(originator, expected_originator, supplier, expected_supplier):
     payload = Payload()
     document_namespace = "https://doc.namespace"
     spdx2_package: Spdx2_Package = package_fixture(
@@ -45,7 +45,7 @@ def test_bump_package(creation_info, originator, expected_originator, supplier,
     )
     expected_new_package_id = f"{document_namespace}#{spdx2_package.spdx_id}"
 
-    bump_package(spdx2_package, payload, creation_info, document_namespace, [], [], [])
+    bump_package(spdx2_package, payload, creation_info_fixture(), document_namespace, [], [], [])
     package = payload.get_element(expected_new_package_id)
 
     assert isinstance(package, Package)
@@ -76,8 +76,7 @@ def test_bump_package(creation_info, originator, expected_originator, supplier,
     )
 
 
-@mock.patch("spdx_tools.spdx3.model.CreationInfo")
-def test_bump_of_single_purl_without_comment(creation_info):
+def test_bump_of_single_purl_without_comment():
     payload = Payload()
     document_namespace = "https://doc.namespace"
     spdx2_package: Spdx2_Package = package_fixture(
@@ -87,16 +86,15 @@ def test_bump_of_single_purl_without_comment(creation_info):
     )
     expected_new_package_id = f"{document_namespace}#{spdx2_package.spdx_id}"
 
-    bump_package(spdx2_package, payload, creation_info, document_namespace, [], [], [])
+    bump_package(spdx2_package, payload, creation_info_fixture(), document_namespace, [], [], [])
     package = payload.get_element(expected_new_package_id)
 
     assert package.package_url == "purl_locator"
     assert package.external_references == []
     assert package.external_identifier == []
 
 
-@mock.patch("spdx_tools.spdx3.model.CreationInfo")
-def test_bump_of_single_purl_with_comment(creation_info):
+def test_bump_of_single_purl_with_comment():
     payload = Payload()
     document_namespace = "https://doc.namespace"
     spdx2_package: Spdx2_Package = package_fixture(
@@ -106,7 +104,7 @@ def test_bump_of_single_purl_with_comment(creation_info):
     )
     expected_new_package_id = f"{document_namespace}#{spdx2_package.spdx_id}"
 
-    bump_package(spdx2_package, payload, creation_info, document_namespace, [], [], [])
+    bump_package(spdx2_package, payload, creation_info_fixture(), document_namespace, [], [], [])
     package = payload.get_element(expected_new_package_id)
 
     assert package.package_url is None
@@ -116,8 +114,7 @@ def test_bump_of_single_purl_with_comment(creation_info):
     ]
 
 
-@mock.patch("spdx_tools.spdx3.model.CreationInfo")
-def test_bump_of_multiple_purls(creation_info):
+def test_bump_of_multiple_purls():
     payload = Payload()
     document_namespace = "https://doc.namespace"
     spdx2_package: Spdx2_Package = package_fixture(
@@ -128,7 +125,7 @@ def test_bump_of_multiple_purls(creation_info):
     )
     expected_new_package_id = f"{document_namespace}#{spdx2_package.spdx_id}"
 
-    bump_package(spdx2_package, payload, creation_info, document_namespace, [], [], [])
+    bump_package(spdx2_package, payload, creation_info_fixture(), document_namespace, [], [], [])
     package = payload.get_element(expected_new_package_id)
 
     assert package.package_url is None

tests/spdx3/bump/__init__.py

@@ -4,8 +4,6 @@
 from datetime import datetime
 from unittest import mock
 
-import pytest
-
 from spdx_tools.spdx3.model.ai import AIPackage
 from spdx_tools.spdx3.model.ai.ai_package import SafetyRiskAssessmentType
 from spdx_tools.spdx3.model.software import SoftwarePurpose
@@ -59,23 +57,3 @@ def test_correct_initialization(creation_info):
     assert ai_package.domain == ["domain"]
     assert ai_package.autonomy_type
     assert ai_package.safety_risk_assessment == SafetyRiskAssessmentType.HIGH
-
-
-@mock.patch("spdx_tools.spdx3.model.CreationInfo", autospec=True)
-def test_invalid_initialization(creation_info):
-    with pytest.raises(TypeError) as err:
-        AIPackage(
-            "some_spdx_id",
-            "AI Package name",
-            ["https://namespace.test#supplier"],
-            "https://download.test",
-            "1.2:rc2",
-            [SoftwarePurpose.SOURCE],
-            datetime(12, 5, 23, 11),
-            creation_info,
-            metric={"metric1": "value", "metric2": 250},
-        )
-
-    assert len(err.value.args[0]) == 1
-    for error in err.value.args[0]:
-        assert error.startswith("SetterError AIPackage:")

tests/spdx3/bump/test_package_bump.py

@@ -4,8 +4,6 @@
 from datetime import datetime
 from unittest import mock
 
-import pytest
-
 from spdx_tools.spdx3.model.dataset import ConfidentialityLevelType, Dataset, DatasetAvailabilityType
 from spdx_tools.spdx3.model.software import SoftwarePurpose
 
@@ -54,24 +52,3 @@ def test_correct_initialization(creation_info):
     assert dataset.confidentiality_level == ConfidentialityLevelType.RED
     assert dataset.dataset_update_mechanism == "update mechanism"
     assert dataset.dataset_availability == DatasetAvailabilityType.QUERY
-
-
-@mock.patch("spdx_tools.spdx3.model.CreationInfo", autospec=True)
-def test_invalid_initialization(creation_info):
-    with pytest.raises(TypeError) as err:
-        Dataset(
-            "some_spdx_id",
-            "Dataset name",
-            ["https://namespace.test#originator"],
-            "https://download.test",
-            [SoftwarePurpose.DATA],
-            datetime(10, 5, 23, 11),
-            datetime(11, 5, 24, 12),
-            "training data",
-            creation_info=creation_info,
-            sensor={"sensor1": "value", "sensor2": 250},
-        )
-
-    assert len(err.value.args[0]) == 1
-    for error in err.value.args[0]:
-        assert error.startswith("SetterError Dataset:")

tests/spdx3/model/ai/test_ai_package.py

@@ -9,7 +9,7 @@
 from spdx_tools.spdx3.model.software import Snippet, SoftwarePurpose
 
 
-@mock.patch("spdx_tools.spdx3.model.software.Snippet", autospec=True)
+@mock.patch("spdx_tools.spdx3.model.CreationInfo", autospec=True)
 def test_correct_initialization(creation_info):
     snippet = Snippet(
         "SPDXRef-Snippet",
@@ -21,14 +21,13 @@ def test_correct_initialization(creation_info):
     )
 
     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 == PositiveIntegerRange(3, 4)
     assert snippet.line_range == PositiveIntegerRange(346, 456)
 
 
-@mock.patch("spdx_tools.spdx3.model.software.Snippet", autospec=True)
+@mock.patch("spdx_tools.spdx3.model.CreationInfo", autospec=True)
 def test_invalid_initialization(creation_info):
     with pytest.raises(TypeError) as err:
         Snippet(2, creation_info=creation_info, originated_by=34, byte_range="34:45")