feat: prepare "contrib" area

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

tests/test_deserialize_json.py

@@ -43,7 +43,7 @@ class TestDeserializeJson(TestCase, SnapshotMixin, DeepCompareMixin):
 
     @named_data(*all_get_bom_funct_valid_immut,
                 *all_get_bom_funct_valid_reversible_migrate)
-    @patch('cyclonedx.builder.this.__ThisVersion', 'TESTING')
+    @patch('cyclonedx.contrib.this.builders.__ThisVersion', 'TESTING')
     def test_prepared(self, get_bom: Callable[[], Bom], *_: Any, **__: Any) -> None:
         # only latest schema will have all data populated in serialized form
         snapshot_name = mksname(get_bom, _LATEST_SCHEMA, OutputFormat.JSON)

tests/test_deserialize_xml.py

@@ -40,7 +40,7 @@ class TestDeserializeXml(TestCase, SnapshotMixin, DeepCompareMixin):
 
     @named_data(*all_get_bom_funct_valid_immut,
                 *all_get_bom_funct_valid_reversible_migrate)
-    @patch('cyclonedx.builder.this.__ThisVersion', 'TESTING')
+    @patch('cyclonedx.contrib.this.builders.__ThisVersion', 'TESTING')
     def test_prepared(self, get_bom: Callable[[], Bom], *_: Any, **__: Any) -> None:
         # only latest schema will have all data populated in serialized form
         snapshot_name = mksname(get_bom, _LATEST_SCHEMA, OutputFormat.XML)

tests/test_factory_license.py

@@ -32,8 +32,8 @@ def test_make_from_string_with_id(self) -> None:
         acknowledgement = unittest.mock.NonCallableMock(spec=LicenseAcknowledgement)
         expected = DisjunctiveLicense(id='bar', text=text, url=url, acknowledgement=acknowledgement)
 
-        with unittest.mock.patch('cyclonedx.factory.license.spdx_fixup', return_value='bar'), \
-                unittest.mock.patch('cyclonedx.factory.license.is_spdx_expression', return_value=True):
+        with unittest.mock.patch('cyclonedx.contrib.license.factories.spdx_fixup', return_value='bar'), \
+                unittest.mock.patch('cyclonedx.contrib.license.factories.is_spdx_expression', return_value=True):
             actual = LicenseFactory().make_from_string('foo',
                                                        license_text=text,
                                                        license_url=url,
@@ -47,8 +47,8 @@ def test_make_from_string_with_name(self) -> None:
         acknowledgement = unittest.mock.NonCallableMock(spec=LicenseAcknowledgement)
         expected = DisjunctiveLicense(name='foo', text=text, url=url, acknowledgement=acknowledgement)
 
-        with unittest.mock.patch('cyclonedx.factory.license.spdx_fixup', return_value=None), \
-                unittest.mock.patch('cyclonedx.factory.license.is_spdx_expression', return_value=False):
+        with unittest.mock.patch('cyclonedx.contrib.license.factories.spdx_fixup', return_value=None), \
+                unittest.mock.patch('cyclonedx.contrib.license.factories.is_spdx_expression', return_value=False):
             actual = LicenseFactory().make_from_string('foo',
                                                        license_text=text,
                                                        license_url=url,
@@ -60,8 +60,8 @@ def test_make_from_string_with_expression(self) -> None:
         acknowledgement = unittest.mock.NonCallableMock(spec=LicenseAcknowledgement)
         expected = LicenseExpression('foo', acknowledgement=acknowledgement)
 
-        with unittest.mock.patch('cyclonedx.factory.license.spdx_fixup', return_value=None), \
-                unittest.mock.patch('cyclonedx.factory.license.is_spdx_expression', return_value=True):
+        with unittest.mock.patch('cyclonedx.contrib.license.factories.spdx_fixup', return_value=None), \
+                unittest.mock.patch('cyclonedx.contrib.license.factories.is_spdx_expression', return_value=True):
             actual = LicenseFactory().make_from_string('foo',
                                                        license_acknowledgement=acknowledgement)
 
@@ -73,14 +73,14 @@ def test_make_with_id(self) -> None:
         acknowledgement = unittest.mock.NonCallableMock(spec=LicenseAcknowledgement)
         expected = DisjunctiveLicense(id='bar', text=text, url=url, acknowledgement=acknowledgement)
 
-        with unittest.mock.patch('cyclonedx.factory.license.spdx_fixup', return_value='bar'):
+        with unittest.mock.patch('cyclonedx.contrib.license.factories.spdx_fixup', return_value='bar'):
             actual = LicenseFactory().make_with_id(spdx_id='foo', text=text, url=url, acknowledgement=acknowledgement)
 
         self.assertEqual(expected, actual)
 
     def test_make_with_id_raises(self) -> None:
         with self.assertRaises(InvalidSpdxLicenseException, msg='foo'):
-            with unittest.mock.patch('cyclonedx.factory.license.spdx_fixup', return_value=None):
+            with unittest.mock.patch('cyclonedx.contrib.license.factories.spdx_fixup', return_value=None):
                 LicenseFactory().make_with_id(spdx_id='foo')
 
     def test_make_with_name(self) -> None:
@@ -94,11 +94,11 @@ def test_make_with_name(self) -> None:
     def test_make_with_expression(self) -> None:
         acknowledgement = unittest.mock.NonCallableMock(spec=LicenseAcknowledgement)
         expected = LicenseExpression('foo', acknowledgement=acknowledgement)
-        with unittest.mock.patch('cyclonedx.factory.license.is_spdx_expression', return_value=True):
+        with unittest.mock.patch('cyclonedx.contrib.license.factories.is_spdx_expression', return_value=True):
             actual = LicenseFactory().make_with_expression(expression='foo', acknowledgement=acknowledgement)
         self.assertEqual(expected, actual)
 
     def test_make_with_expression_raises(self) -> None:
         with self.assertRaises(InvalidLicenseExpressionException, msg='foo'):
-            with unittest.mock.patch('cyclonedx.factory.license.is_spdx_expression', return_value=False):
+            with unittest.mock.patch('cyclonedx.contrib.license.factories.is_spdx_expression', return_value=False):
                 LicenseFactory().make_with_expression('foo')

tests/test_output_json.py

@@ -62,7 +62,7 @@ def test_unsupported_schema_raises(self, sv: SchemaVersion) -> None:
         and is_valid_for_schema_version(gb, sv)
     ))
     @unpack
-    @patch('cyclonedx.builder.this.__ThisVersion', 'TESTING')
+    @patch('cyclonedx.contrib.this.builders.__ThisVersion', 'TESTING')
     def test_valid(self, get_bom: Callable[[], Bom], sv: SchemaVersion, *_: Any, **__: Any) -> None:
         snapshot_name = mksname(get_bom, sv, OutputFormat.JSON)
         bom = get_bom()

tests/test_output_xml.py

@@ -49,7 +49,7 @@ class TestOutputXml(TestCase, SnapshotMixin):
         if is_valid_for_schema_version(gb, sv)
     ))
     @unpack
-    @patch('cyclonedx.builder.this.__ThisVersion', 'TESTING')
+    @patch('cyclonedx.contrib.this.builders.__ThisVersion', 'TESTING')
     def test_valid(self, get_bom: Callable[[], Bom], sv: SchemaVersion, *_: Any, **__: Any) -> None:
         snapshot_name = mksname(get_bom, sv, OutputFormat.XML)
         if snapshot_name is None:

tests/test_real_world_examples.py

@@ -26,7 +26,7 @@
 from tests import OWN_DATA_DIRECTORY
 
 
-@patch('cyclonedx.builder.this.__ThisVersion', 'TESTING')
+@patch('cyclonedx.contrib.this.builders.__ThisVersion', 'TESTING')
 @patch('cyclonedx.model.bom._get_now_utc', return_value=datetime.fromisoformat('2023-01-07 13:44:32.312678+00:00'))
 class TestDeserializeRealWorldExamples(unittest.TestCase):