Merge pull request #232 from harrel56/chore/update-test-suite-2024092…

…4-151402 chore(test-suite): incremental test suite update from upstream
harrel56 · Sep 29, 2024 · 9fc5cbd · 9fc5cbd
2 parents 4a92a6a + ad4f38e
commit 9fc5cbd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/src/test/java/dev/harrel/jsonschema/SpecificationSuiteTest.java b/src/test/java/dev/harrel/jsonschema/SpecificationSuiteTest.java
@@ -166,6 +166,12 @@ private static Map<String, Map<String, Set<String>>> skippedDraft7Tests() {
 
     private static Map<String, Map<String, Set<String>>> skippedFormatTests() {
         return Map.of(
+                "ecmascript-regex", Map.of(
+                        "\\a is not an ECMA 262 control escape", Set.of(
+                                /* this is no good for java regex */
+                                "when used as a pattern"
+                        )
+                ),
                 "date-time", Map.of(
                         "validation of date-time strings", Set.of(
                                 /* leap seconds not supported */

diff --git a/src/test/resources/suite-yaml/tests/draft2020-12/optional/ecmascript-regex.yml b/src/test/resources/suite-yaml/tests/draft2020-12/optional/ecmascript-regex.yml
@@ -240,14 +240,6 @@
     - description: non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)
       data: ৪২
       valid: false
-- description: \a is not an ECMA 262 control escape
-  schema:
-    $schema: https://json-schema.org/draft/2020-12/schema
-    format: regex
-  tests:
-    - description: when used as a pattern
-      data: \a
-      valid: false
 - description: pattern with non-ASCII digits
   schema:
     $schema: https://json-schema.org/draft/2020-12/schema

diff --git a/src/test/resources/suite-yaml/tests/draft2020-12/optional/format/ecmascript-regex.yml b/src/test/resources/suite-yaml/tests/draft2020-12/optional/format/ecmascript-regex.yml
@@ -0,0 +1,8 @@
+- description: \a is not an ECMA 262 control escape
+  schema:
+    $schema: https://json-schema.org/draft/2020-12/schema
+    format: regex
+  tests:
+    - description: when used as a pattern
+      data: \a
+      valid: false
diff --git a/src/test/resources/suite/tests/draft2020-12/optional/ecmascript-regex.json b/src/test/resources/suite/tests/draft2020-12/optional/ecmascript-regex.json
@@ -405,20 +405,6 @@
             }
         ]
     },
-    {
-        "description": "\\a is not an ECMA 262 control escape",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "format": "regex"
-        },
-        "tests": [
-            {
-                "description": "when used as a pattern",
-                "data": "\\a",
-                "valid": false
-            }
-        ]
-    },
     {
         "description": "pattern with non-ASCII digits",
         "schema": {

diff --git a/src/test/resources/suite/tests/draft2020-12/optional/format/ecmascript-regex.json b/src/test/resources/suite/tests/draft2020-12/optional/format/ecmascript-regex.json
@@ -0,0 +1,16 @@
+[
+  {
+    "description": "\\a is not an ECMA 262 control escape",
+    "schema": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "format": "regex"
+    },
+    "tests": [
+      {
+        "description": "when used as a pattern",
+        "data": "\\a",
+        "valid": false
+      }
+    ]
+  }
+]