further unit test fixes/alignments

Signed-off-by: Paul Horton <[email protected]>

Author: madpah

cyclonedx/model/service.py

@@ -16,10 +16,10 @@
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
 from typing import Any, Iterable, Optional, Union
+from uuid import uuid4
 
 import serializable
 from sortedcontainers import SortedSet
-from uuid import uuid4
 
 from cyclonedx.serialization import BomRefHelper
 

tests/test_model_component.py

@@ -44,8 +44,8 @@
     Pedigree,
 )
 from cyclonedx.model.issue import IssueClassification, IssueType
-
 from tests.data import (
+    MOCK_UUID_7,
     get_component_setuptools_simple,
     get_component_setuptools_simple_no_version,
     get_component_toml_with_hashes_with_references,
@@ -54,7 +54,7 @@
     get_pedigree_1,
     get_swid_1,
     get_swid_2,
-    reorder, MOCK_UUID_7,
+    reorder,
 )
 
 

tests/test_model_service.py

@@ -21,8 +21,7 @@
 from unittest.mock import Mock, patch
 
 from cyclonedx.model.service import Service
-
-from tests.data import reorder, MOCK_UUID_8, MOCK_UUID_9
+from tests.data import MOCK_UUID_8, MOCK_UUID_9, reorder
 
 
 class TestModelService(TestCase):

tests/test_model_vulnerability.py

@@ -36,8 +36,7 @@
     VulnerabilitySeverity,
     VulnerabilitySource,
 )
-
-from tests.data import reorder, MOCK_UUID_10
+from tests.data import MOCK_UUID_10, reorder
 
 
 class TestModelVulnerability(TestCase):

tests/test_output_json.py

@@ -31,6 +31,8 @@
     MOCK_UUID_1,
     MOCK_UUID_2,
     MOCK_UUID_3,
+    MOCK_UUID_4,
+    MOCK_UUID_5,
     MOCK_UUID_6,
     TEST_UUIDS,
     get_bom_for_issue_275_components,
@@ -48,7 +50,7 @@
     get_bom_with_metadata_component_and_dependencies,
     get_bom_with_nested_services,
     get_bom_with_services_complex,
-    get_bom_with_services_simple, MOCK_UUID_5, MOCK_UUID_4,
+    get_bom_with_services_simple,
 )
 
 
@@ -374,14 +376,6 @@ def test_bom_v1_2_dependencies_for_bom_component(self) -> None:
             fixture='bom_dependencies_component.json'
         )
 
-    @unittest.skip
-    def test_bom_v1_4_dependencies_invalid(self) -> None:
-        with self.assertRaises(UnknownComponentDependencyException):
-            self._validate_json_bom(
-                bom=get_bom_with_dependencies_invalid(), schema_version=SchemaVersion.V1_4,
-                fixture='bom_dependencies.json'
-            )
-
     @unittest.skip('See https://github.com/CycloneDX/specification/issues/146')
     def test_bom_v1_4_issue_275_components(self) -> None:
         self._validate_json_bom(