From 22e086194ff8ab75e5f1f224d7bc188c6e6fe302 Mon Sep 17 00:00:00 2001 From: Nicolas-Peiffer <102670102+Nicolas-Peiffer@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:41:56 +0200 Subject: [PATCH] Adding 1.6 valid and invalid test files in the Java tests Signed-off-by: Nicolas-Peiffer <102670102+Nicolas-Peiffer@users.noreply.github.com> --- .../java/org/cyclonedx/schema/BaseSchemaVerificationTest.java | 1 + .../java/org/cyclonedx/schema/JsonSchemaVerificationTest.java | 2 ++ .../java/org/cyclonedx/schema/XmlSchemaVerificationTest.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java index faae872b..a67565ed 100644 --- a/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java +++ b/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java @@ -29,6 +29,7 @@ List getAllResources() throws Exception { files.addAll(getResources("1.3/")); files.addAll(getResources("1.4/")); files.addAll(getResources("1.5/")); + files.addAll(getResources("1.6/")); return files; } diff --git a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java index c11b25ec..1598c0ae 100644 --- a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java +++ b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java @@ -43,6 +43,8 @@ Collection dynamicTestsWithCollection() throws Exception { schemaVersion = Version.VERSION_14; } else if (file.endsWith("-1.5.json")) { schemaVersion = Version.VERSION_15; + } else if (file.endsWith("-1.6.json")) { + schemaVersion = Version.VERSION_16; } else { schemaVersion = null; } diff --git a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java index a56e77e3..2d57dd8a 100644 --- a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java +++ b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java @@ -53,6 +53,8 @@ Collection dynamicTestsWithCollection() throws Exception { schemaVersion = Version.VERSION_14; } else if (file.endsWith("-1.5.xml")) { schemaVersion = Version.VERSION_15; + } else if (file.endsWith("-1.6.xml")) { + schemaVersion = Version.VERSION_16; } else { schemaVersion = null; }