style: split joined path segments (#331)

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Author: jkowalleck

tests/base.py

@@ -45,7 +45,7 @@
 cyclonedx_lib_name: str = 'cyclonedx-python-lib'
 cyclonedx_lib_version: str = version(cyclonedx_lib_name)
 single_uuid: str = 'urn:uuid:{}'.format(uuid4())
-schema_directory = os.path.join(os.path.dirname(__file__), '../cyclonedx/schema')
+schema_directory = os.path.join(os.path.dirname(__file__), '..', 'cyclonedx', 'schema')
 
 
 class BaseJsonTestCase(TestCase):

tests/test_component.py

@@ -27,7 +27,7 @@
 from cyclonedx.model.component import Component
 from data import get_component_setuptools_simple
 
-FIXTURES_DIRECTORY = 'fixtures/xml/1.4'
+FIXTURES_DIRECTORY = join('fixtures', 'xml', '1.4')
 
 
 class TestComponent(TestCase):

tests/test_output_json.py

@@ -371,17 +371,25 @@ def test_bom_v1_2_issue_275_components(self) -> None:
             fixture='bom_issue_275_components.json'
         )
 
-    # Helper methods
+    # region Helper methods
+
     def _validate_json_bom(self, bom: Bom, schema_version: SchemaVersion, fixture: str) -> None:
         outputter = get_instance(bom=bom, output_format=OutputFormat.JSON, schema_version=schema_version)
         self.assertEqual(outputter.schema_version, schema_version)
-        with open(
-                join(dirname(__file__), f'fixtures/json/{schema_version.to_version()}/{fixture}')) as expected_json:
-            self.assertValidAgainstSchema(bom_json=outputter.output_as_string(), schema_version=schema_version)
-            self.assertEqualJsonBom(expected_json.read(), outputter.output_as_string())
-            expected_json.close()
+        output = outputter.output_as_string()
+        self.assertValidAgainstSchema(bom_json=output, schema_version=schema_version)
+        with open(join(
+            dirname(__file__),
+            'fixtures',
+            'json',
+            schema_version.to_version(),
+            fixture
+        )) as expected_json:
+            self.assertEqualJsonBom(expected_json.read(), output)
 
     def _validate_json_bom_not_supported(self, bom: Bom, schema_version: SchemaVersion) -> None:
         with self.assertRaises(FormatNotSupportedException):
             outputter = get_instance(bom=bom, output_format=OutputFormat.JSON, schema_version=schema_version)
             outputter.output_as_string()
+
+    # endregion Helper methods

tests/test_output_xml.py

@@ -515,14 +515,20 @@ def test_bom_v1_0_issue_275_components(self) -> None:
             fixture='bom_issue_275_components.xml'
         )
 
-    # Helper methods
+    # region Helper methods
+
     def _validate_xml_bom(self, bom: Bom, schema_version: SchemaVersion, fixture: str) -> None:
         outputter = get_instance(bom=bom, schema_version=schema_version)
         self.assertEqual(outputter.schema_version, schema_version)
-        with open(
-                join(dirname(__file__), f'fixtures/xml/{schema_version.to_version()}/{fixture}')) as expected_xml:
-            self.assertValidAgainstSchema(bom_xml=outputter.output_as_string(), schema_version=schema_version)
-            self.assertEqualXmlBom(
-                expected_xml.read(), outputter.output_as_string(), namespace=outputter.get_target_namespace()
-            )
-            expected_xml.close()
+        output = outputter.output_as_string()
+        self.assertValidAgainstSchema(bom_xml=output, schema_version=schema_version)
+        with open(join(
+            dirname(__file__),
+            'fixtures',
+            'xml',
+            schema_version.to_version(),
+            fixture
+        )) as expected_xml:
+            self.assertEqualXmlBom(expected_xml.read(), output, namespace=outputter.get_target_namespace())
+
+    # endregion Helper methods