tests: use internal json strict validation

Signed-off-by: Jan Kowalleck <[email protected]>
CycloneDX · Sep 23, 2023 · 7186b52 · 7186b52
1 parent 839fe11
commit 7186b52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/tests/base.py b/tests/base.py
@@ -30,7 +30,7 @@
 
 from cyclonedx.exception import MissingOptionalDependencyException
 from cyclonedx.output import SchemaVersion
-from cyclonedx.validation.json import JsonValidator
+from cyclonedx.validation.json import JsonStrictValidator
 from cyclonedx.validation.xml import XmlValidator
 
 single_uuid: str = 'urn:uuid:{}'.format(uuid4())
@@ -40,7 +40,7 @@ class BaseJsonTestCase(TestCase):
 
     def assertValidAgainstSchema(self, bom_json: str, schema_version: SchemaVersion) -> None:
         try:
-            validation_error = JsonValidator(schema_version).validate_str(bom_json)
+            validation_error = JsonStrictValidator(schema_version).validate_str(bom_json)
         except MissingOptionalDependencyException:
             return  # some deps are missing - skip the validation
         self.assertIsNone(validation_error,

diff --git a/tests/test_output.py b/tests/test_output.py
@@ -49,5 +49,5 @@ def test_as_expected(self, of: OutputFormat, sv: SchemaVersion) -> None:
     @unpack
     def test_fails_on_wrong_args(self, of: OutputFormat, sv: SchemaVersion, raisesRegex: Tuple) -> None:
         bom = Mock(spec=Bom)
-        with self.assertRaisesRegexp(*raisesRegex):
+        with self.assertRaisesRegex(*raisesRegex):
             get_outputter(bom, of, sv)
diff --git a/tests/test_validation.py b/tests/test_validation.py
@@ -27,7 +27,10 @@
 from cyclonedx.schema import OutputFormat, SchemaVersion
 from cyclonedx.validation import get_instance as get_validator
 
-UndefinedFormatVersion = {(OutputFormat.JSON, SchemaVersion.V1_1), (OutputFormat.JSON, SchemaVersion.V1_0), }
+UNDEFINED_FORMAT_VERSION = {
+    (OutputFormat.JSON, SchemaVersion.V1_1),
+    (OutputFormat.JSON, SchemaVersion.V1_0),
+}
 
 
 @ddt
@@ -36,7 +39,7 @@ class TestGetInstance(TestCase):
     @named_data(*([f'{f.name} {v.name}', f, v]
                   for f, v
                   in product(OutputFormat, SchemaVersion)
-                  if (f, v) not in UndefinedFormatVersion))
+                  if (f, v) not in UNDEFINED_FORMAT_VERSION))
     @unpack
     def test_as_expected(self, of: OutputFormat, sv: SchemaVersion) -> None:
         validator = get_validator(of, sv)
@@ -45,7 +48,7 @@ def test_as_expected(self, of: OutputFormat, sv: SchemaVersion) -> None:
 
     @data(
         *(('foo', sv, (TypeError, "unexpected output_format: 'foo'")) for sv in SchemaVersion),
-        *((f, v, (ValueError, f'unsupported schema_version: {v}')) for f, v in UndefinedFormatVersion)
+        *((f, v, (ValueError, f'unsupported schema_version: {v}')) for f, v in UNDEFINED_FORMAT_VERSION)
     )
     @unpack
     def test_fails_on_wrong_args(self, of: OutputFormat, sv: SchemaVersion, raisesRegex: Tuple) -> None: