move tests to model bom file

Signed-off-by: gruebel <[email protected]>

Author: gruebel

tests/test_component.py

@@ -24,9 +24,8 @@
 from packageurl import PackageURL  # type: ignore
 
 from cyclonedx.model import sha1sum
-from cyclonedx.model.bom import Bom
 from cyclonedx.model.component import Component
-from data import get_component_setuptools_simple, get_component_setuptools_simple_no_version
+from data import get_component_setuptools_simple
 
 FIXTURES_DIRECTORY = 'fixtures/xml/1.4'
 
@@ -78,20 +77,3 @@ def test_from_file_with_path_for_bom(self) -> None:
         )
         self.assertEqual(c.purl, purl)
         self.assertEqual(len(c.hashes), 1)
-
-    def test_has_component_1(self) -> None:
-        bom = Bom()
-        bom.components.update([get_component_setuptools_simple(), get_component_setuptools_simple_no_version()])
-        self.assertEqual(len(bom.components), 2)
-        self.assertTrue(bom.has_component(component=get_component_setuptools_simple_no_version()))
-        self.assertIsNot(get_component_setuptools_simple(), get_component_setuptools_simple_no_version())
-
-    def test_get_component_by_purl(self) -> None:
-        bom = Bom()
-        setuptools_simple = get_component_setuptools_simple()
-        bom.components.add(get_component_setuptools_simple())
-
-        result = bom.get_component_by_purl(get_component_setuptools_simple().purl)
-
-        self.assertEqual(result, setuptools_simple)
-        self.assertIsNone(bom.get_component_by_purl(get_component_setuptools_simple_no_version().purl))

tests/test_model_bom.py

@@ -22,7 +22,12 @@
 from cyclonedx.model import License, LicenseChoice, OrganizationalContact, OrganizationalEntity, Property
 from cyclonedx.model.bom import Bom, BomMetaData, ThisTool, Tool
 from cyclonedx.model.component import Component, ComponentType
-from data import get_bom_for_issue_275_components, get_bom_with_component_setuptools_with_vulnerability
+from data import (
+    get_bom_for_issue_275_components,
+    get_bom_with_component_setuptools_with_vulnerability,
+    get_component_setuptools_simple,
+    get_component_setuptools_simple_no_version,
+)
 
 
 class TestBomMetaData(TestCase):
@@ -127,3 +132,20 @@ def test_bom_nested_components_issue_275(self) -> None:
     #     self.assertIsInstance(bom.metadata.component, Component)
     #     self.assertEqual(2, len(bom.services))
     #     bom.validate()
+
+    def test_has_component_1(self) -> None:
+        bom = Bom()
+        bom.components.update([get_component_setuptools_simple(), get_component_setuptools_simple_no_version()])
+        self.assertEqual(len(bom.components), 2)
+        self.assertTrue(bom.has_component(component=get_component_setuptools_simple_no_version()))
+        self.assertIsNot(get_component_setuptools_simple(), get_component_setuptools_simple_no_version())
+
+    def test_get_component_by_purl(self) -> None:
+        bom = Bom()
+        setuptools_simple = get_component_setuptools_simple()
+        bom.components.add(setuptools_simple)
+
+        result = bom.get_component_by_purl(get_component_setuptools_simple().purl)
+
+        self.assertIs(result, setuptools_simple)
+        self.assertIsNone(bom.get_component_by_purl(get_component_setuptools_simple_no_version().purl))