Merge commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca'

* commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca': Squashed 'json/' changes from 20c1bb1d9..54440eab4
python-jsonschema · Oct 7, 2021 · b59060c · b59060c
2 parents 08f88a6 + cf88638
commit b59060c
Show file tree

Hide file tree

Showing 129 changed files with 5,355 additions and 1,289 deletions.
diff --git a/json/remotes/draft2020-12/format-assertion-false.json b/json/remotes/draft2020-12/format-assertion-false.json
@@ -0,0 +1,12 @@
+{
+    "$id": "http://localhost:1234/draft2020-12/format-assertion-false.json",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2020-12/vocab/core": true,
+        "https://json-schema.org/draft/2020-12/vocab/format-assertion": false
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/2020-12/schema/meta/core" },
+        { "$ref": "https://json-schema.org/draft/2020-12/schema/meta/format-assertion" }
+    ]
+}
diff --git a/json/remotes/draft2020-12/format-assertion-true.json b/json/remotes/draft2020-12/format-assertion-true.json
@@ -0,0 +1,12 @@
+{
+    "$id": "http://localhost:1234/draft2020-12/format-assertion-true.json",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2020-12/vocab/core": true,
+        "https://json-schema.org/draft/2020-12/vocab/format-assertion": true
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/2020-12/schema/meta/core" },
+        { "$ref": "https://json-schema.org/draft/2020-12/schema/meta/format-assertion" }
+    ]
+}
diff --git a/json/tests/draft-future/anchor.json b/json/tests/draft-future/anchor.json
@@ -134,5 +134,40 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "same $anchor with different base uri",
+        "schema": {
+            "$id": "http://localhost:1234/foobar",
+            "$defs": {
+                "A": {
+                    "$id": "child1",
+                    "allOf": [
+                        {
+                            "$id": "child2",
+                            "$anchor": "my_anchor",
+                            "type": "number"
+                        },
+                        {
+                            "$anchor": "my_anchor",
+                            "type": "string"
+                        }
+                    ]
+                }
+            },
+            "$ref": "child1#my_anchor"
+        },
+        "tests": [
+            {
+                "description": "$ref should resolve to /$defs/A/allOf/1",
+                "data": "a",
+                "valid": true
+            },
+            {
+                "description": "$ref should not resolve to /$defs/A/allOf/0",
+                "data": 1,
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/json/tests/draft-future/format.json b/json/tests/draft-future/format.json
@@ -32,11 +32,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid email string is only an annotation by default",
-                "data": "2962",
-                "valid": true
             }
         ]
     },
@@ -73,11 +68,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid idn-email string is only an annotation by default",
-                "data": "2962",
-                "valid": true
             }
         ]
     },
@@ -114,11 +104,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid regex string is only an annotation by default",
-                "data": "^(abc]",
-                "valid": true
             }
         ]
     },
@@ -155,11 +140,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid ipv4 string is only an annotation by default",
-                "data": "127.0.0.0.1",
-                "valid": true
             }
         ]
     },
@@ -196,11 +176,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid ipv6 string is only an annotation by default",
-                "data": "12345::",
-                "valid": true
             }
         ]
     },
@@ -237,11 +212,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid idn-hostname string is only an annotation by default",
-                "data": "〮실례.테스트",
-                "valid": true
             }
         ]
     },
@@ -278,11 +248,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid hostname string is only an annotation by default",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": true
             }
         ]
     },
@@ -319,11 +284,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid date string is only an annotation by default",
-                "data": "06/19/1963",
-                "valid": true
             }
         ]
     },
@@ -360,11 +320,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid date-time string is only an annotation by default",
-                "data": "1990-02-31T15:59:60.123-08:00",
-                "valid": true
             }
         ]
     },
@@ -401,11 +356,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid time string is only an annotation by default",
-                "data": "08:30:06 PST",
-                "valid": true
             }
         ]
     },
@@ -442,11 +392,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid json-pointer string is only an annotation by default",
-                "data": "/foo/bar~",
-                "valid": true
             }
         ]
     },
@@ -483,11 +428,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid relative-json-pointer string is only an annotation by default",
-                "data": "/foo/bar",
-                "valid": true
             }
         ]
     },
@@ -524,11 +464,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid iri string is only an annotation by default",
-                "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-                "valid": true
             }
         ]
     },
@@ -565,11 +500,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid iri-reference string is only an annotation by default",
-                "data": "\\\\WINDOWS\\filëßåré",
-                "valid": true
             }
         ]
     },
@@ -606,11 +536,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid uri string is only an annotation by default",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
             }
         ]
     },
@@ -647,11 +572,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid uri-reference string is only an annotation by default",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": true
             }
         ]
     },
@@ -688,11 +608,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid uri-template string is only an annotation by default",
-                "data": "http://example.com/dictionary/{term:1}/{term",
-                "valid": true
             }
         ]
     },
@@ -729,11 +644,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid uuid string is only an annotation by default",
-                "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638",
-                "valid": true
             }
         ]
     },
@@ -770,11 +680,6 @@
                 "description": "all string formats ignore nulls",
                 "data": null,
                 "valid": true
-            },
-            {
-                "description": "invalid duration string is only an annotation by default",
-                "data": "PT1D",
-                "valid": true
             }
         ]
     }