Squashed 'json/' changes from 54440eab4..ba3a90534

ba3a90534 Merge pull request #523 from olegshtch/extendible-schema-test-suite 458e7ac1e Add test suite to test dynamic reference and anchor link and their independency of order fe405a119 draft/future -> draft/next in $refs also 3d9d35a2a Merge pull request #522 from json-schema-org/ether/draft-next 11b5076f0 rename draft-future to draft-next 0245dcc94 Merge pull request #521 from olegshtch/add-recursive-ref-test-suite e9fb9cf45 Merge pull request #517 from ChALkeR/chalker/date-time-leap f1b230c69 Add test from Appendix C. Example of recursive schema extension of the draft. bb2e37317 Test date-time with leap second on a wrong hour/minute 8b797cfe6 Merge pull request #520 from json-schema-org/ether/custom-dialect 5d23f3112 Add tests for invalid date-time past leap second 63f8e93c1 Improve leap seconds test in optional/format/date-time 3d00f593d test the use of the $vocabulary keyword in a custom metaschema git-subtree-dir: json git-subtree-split: ba3a9053400dd6237aef9cc63601758b1d266818
python-jsonschema · Oct 19, 2021 · 4ecbea5 · 4ecbea5
1 parent cf88638
commit 4ecbea5
Show file tree

Hide file tree

Showing 85 changed files with 680 additions and 22 deletions.
diff --git a/remotes/draft2019-09/metaschema-no-validation.json b/remotes/draft2019-09/metaschema-no-validation.json
@@ -0,0 +1,11 @@
+{
+    "$id": "http://localhost:1234/draft2019-09/metaschema-no-validation.json",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2019-09/vocab/applicator": true,
+        "https://json-schema.org/draft/2019-09/vocab/core": true
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/2019-09/meta/applicator" },
+        { "$ref": "https://json-schema.org/draft/2019-09/meta/core" }
+    ]
+}
diff --git a/remotes/draft2020-12/metaschema-no-validation.json b/remotes/draft2020-12/metaschema-no-validation.json
@@ -0,0 +1,11 @@
+{
+    "$id": "http://localhost:1234/draft2020-12/metaschema-no-validation.json",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2020-12/vocab/applicator": true,
+        "https://json-schema.org/draft/2020-12/vocab/core": true
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/2020-12/meta/applicator" },
+        { "$ref": "https://json-schema.org/draft/2020-12/meta/core" }
+    ]
+}
diff --git a/remotes/extendible-dynamic-ref.json b/remotes/extendible-dynamic-ref.json
@@ -0,0 +1,20 @@
+{
+    "description": "extendible array",
+    "$id": "http://localhost:1234/extendible-dynamic-ref.json",
+    "type": "object",
+    "properties": {
+        "elements": {
+            "type": "array",
+            "items": {
+                "$dynamicRef": "#elements"
+            }
+        }
+    },
+    "required": ["elements"],
+    "additionalProperties": false,
+    "$defs": {
+        "elements": {
+            "$dynamicAnchor": "elements"
+        }
+    }
+}
diff --git a/remotes/tree.json b/remotes/tree.json
@@ -0,0 +1,16 @@
+{
+    "description": "tree schema, extensible",
+    "$id": "http://localhost:1234/tree.json",
+    "$dynamicAnchor": "node",
+
+    "type": "object",
+    "properties": {
+        "data": true,
+        "children": {
+            "type": "array",
+            "items": {
+                "$dynamicRef": "#node"
+            }
+        }
+    }
+}
diff --git a/tests/draft-future/additionalProperties.json → tests/draft-next/additionalProperties.json b/tests/draft-future/additionalProperties.json → tests/draft-next/additionalProperties.json
diff --git a/tests/draft-future/allOf.json → tests/draft-next/allOf.json b/tests/draft-future/allOf.json → tests/draft-next/allOf.json
diff --git a/tests/draft-future/anchor.json → tests/draft-next/anchor.json b/tests/draft-future/anchor.json → tests/draft-next/anchor.json
diff --git a/tests/draft-future/anyOf.json → tests/draft-next/anyOf.json b/tests/draft-future/anyOf.json → tests/draft-next/anyOf.json
diff --git a/tests/draft-future/boolean_schema.json → tests/draft-next/boolean_schema.json b/tests/draft-future/boolean_schema.json → tests/draft-next/boolean_schema.json
diff --git a/tests/draft-future/const.json → tests/draft-next/const.json b/tests/draft-future/const.json → tests/draft-next/const.json
diff --git a/tests/draft-future/contains.json → tests/draft-next/contains.json b/tests/draft-future/contains.json → tests/draft-next/contains.json
diff --git a/tests/draft-future/content.json → tests/draft-next/content.json b/tests/draft-future/content.json → tests/draft-next/content.json
diff --git a/tests/draft-future/default.json → tests/draft-next/default.json b/tests/draft-future/default.json → tests/draft-next/default.json
diff --git a/tests/draft-future/defs.json → tests/draft-next/defs.json b/tests/draft-future/defs.json → tests/draft-next/defs.json
diff --git a/tests/draft-future/dependentRequired.json → tests/draft-next/dependentRequired.json b/tests/draft-future/dependentRequired.json → tests/draft-next/dependentRequired.json
diff --git a/tests/draft-future/dependentSchemas.json → tests/draft-next/dependentSchemas.json b/tests/draft-future/dependentSchemas.json → tests/draft-next/dependentSchemas.json
diff --git a/tests/draft-future/dynamicRef.json → tests/draft-next/dynamicRef.json b/tests/draft-future/dynamicRef.json → tests/draft-next/dynamicRef.json
@@ -441,5 +441,179 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "strict-tree schema, guards against misspelled properties",
+        "schema": {
+            "$id": "http://localhost:1234/strict-tree.json",
+            "$dynamicAnchor": "node",
+
+            "$ref": "tree.json",
+            "unevaluatedProperties": false
+        },
+        "tests": [
+            {
+                "description": "instance with misspelled field",
+                "data": {
+                    "children": [{
+                            "daat": 1
+                        }]
+                },
+                "valid": false
+            },
+            {
+                "description": "instance with correct field",
+                "data": {
+                    "children": [{
+                            "data": 1
+                        }]
+                },
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "tests for implementation dynamic anchor and reference link",
+        "schema": {
+            "$id": "http://localhost:1234/strict-extendible.json",
+            "$ref": "extendible-dynamic-ref.json",
+            "$defs": {
+                "elements": {
+                    "$dynamicAnchor": "elements",
+                    "properties": {
+                        "a": true
+                    },
+                    "required": ["a"],
+                    "additionalProperties": false
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "incorrect parent schema",
+                "data": {
+                    "a": true
+                },
+                "valid": false
+            },
+            {
+                "description": "incorrect extended schema",
+                "data": {
+                    "elements": [
+                        { "b": 1 }
+                    ]
+                },
+                "valid": false
+            },
+            {
+                "description": "correct extended schema",
+                "data": {
+                    "elements": [
+                        { "a": 1 }
+                    ]
+                },
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "Tests for implementation dynamic anchor and reference link. Reference should be independent of any possible ordering.",
+        "schema": {
+            "$id": "http://localhost:1234/strict-extendible-allof-defs-first.json",
+            "allOf": [
+                {
+                    "$ref": "extendible-dynamic-ref.json"
+                },
+                {
+                    "$defs": {
+                        "elements": {
+                            "$dynamicAnchor": "elements",
+                            "properties": {
+                                "a": true
+                            },
+                            "required": ["a"],
+                            "additionalProperties": false
+                        }
+                    }
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "incorrect parent schema",
+                "data": {
+                    "a": true
+                },
+                "valid": false
+            },
+            {
+                "description": "incorrect extended schema",
+                "data": {
+                    "elements": [
+                        { "b": 1 }
+                    ]
+                },
+                "valid": false
+            },
+            {
+                "description": "correct extended schema",
+                "data": {
+                    "elements": [
+                        { "a": 1 }
+                    ]
+                },
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "Tests for implementation dynamic anchor and reference link. Reference should be independent of any possible ordering.",
+        "schema": {
+            "$id": "http://localhost:1234/strict-extendible-allof-ref-first.json",
+            "allOf": [
+                {
+                    "$defs": {
+                        "elements": {
+                            "$dynamicAnchor": "elements",
+                            "properties": {
+                                "a": true
+                            },
+                            "required": ["a"],
+                            "additionalProperties": false
+                        }
+                    }
+                },
+                {
+                    "$ref": "extendible-dynamic-ref.json"
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "incorrect parent schema",
+                "data": {
+                    "a": true
+                },
+                "valid": false
+            },
+            {
+                "description": "incorrect extended schema",
+                "data": {
+                    "elements": [
+                        { "b": 1 }
+                    ]
+                },
+                "valid": false
+            },
+            {
+                "description": "correct extended schema",
+                "data": {
+                    "elements": [
+                        { "a": 1 }
+                    ]
+                },
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/tests/draft-future/enum.json → tests/draft-next/enum.json b/tests/draft-future/enum.json → tests/draft-next/enum.json
diff --git a/tests/draft-future/exclusiveMaximum.json → tests/draft-next/exclusiveMaximum.json b/tests/draft-future/exclusiveMaximum.json → tests/draft-next/exclusiveMaximum.json
diff --git a/tests/draft-future/exclusiveMinimum.json → tests/draft-next/exclusiveMinimum.json b/tests/draft-future/exclusiveMinimum.json → tests/draft-next/exclusiveMinimum.json
diff --git a/tests/draft-future/format.json → tests/draft-next/format.json b/tests/draft-future/format.json → tests/draft-next/format.json
diff --git a/tests/draft-future/id.json → tests/draft-next/id.json b/tests/draft-future/id.json → tests/draft-next/id.json
@@ -2,7 +2,7 @@
     {
         "description": "Invalid use of fragments in location-independent $id",
         "schema": {
-            "$ref": "https://json-schema.org/draft/future/schema"
+            "$ref": "https://json-schema.org/draft/next/schema"
         },
         "tests": [
             {
@@ -110,7 +110,7 @@
         "description": "Valid use of empty fragments in location-independent $id",
         "comment": "These are allowed but discouraged",
         "schema": {
-            "$ref": "https://json-schema.org/draft/future/schema"
+            "$ref": "https://json-schema.org/draft/next/schema"
         },
         "tests": [
             {
@@ -150,7 +150,7 @@
     {
         "description": "Unnormalized $ids are allowed but discouraged",
         "schema": {
-            "$ref": "https://json-schema.org/draft/future/schema"
+            "$ref": "https://json-schema.org/draft/next/schema"
         },
         "tests": [
             {

diff --git a/tests/draft-future/if-then-else.json → tests/draft-next/if-then-else.json b/tests/draft-future/if-then-else.json → tests/draft-next/if-then-else.json
diff --git a/...draft-future/infinite-loop-detection.json → ...s/draft-next/infinite-loop-detection.json b/...draft-future/infinite-loop-detection.json → ...s/draft-next/infinite-loop-detection.json
diff --git a/tests/draft-future/items.json → tests/draft-next/items.json b/tests/draft-future/items.json → tests/draft-next/items.json
diff --git a/tests/draft-future/maxContains.json → tests/draft-next/maxContains.json b/tests/draft-future/maxContains.json → tests/draft-next/maxContains.json
diff --git a/tests/draft-future/maxItems.json → tests/draft-next/maxItems.json b/tests/draft-future/maxItems.json → tests/draft-next/maxItems.json
diff --git a/tests/draft-future/maxLength.json → tests/draft-next/maxLength.json b/tests/draft-future/maxLength.json → tests/draft-next/maxLength.json
diff --git a/tests/draft-future/maxProperties.json → tests/draft-next/maxProperties.json b/tests/draft-future/maxProperties.json → tests/draft-next/maxProperties.json
diff --git a/tests/draft-future/maximum.json → tests/draft-next/maximum.json b/tests/draft-future/maximum.json → tests/draft-next/maximum.json
diff --git a/tests/draft-future/minContains.json → tests/draft-next/minContains.json b/tests/draft-future/minContains.json → tests/draft-next/minContains.json
diff --git a/tests/draft-future/minItems.json → tests/draft-next/minItems.json b/tests/draft-future/minItems.json → tests/draft-next/minItems.json
diff --git a/tests/draft-future/minLength.json → tests/draft-next/minLength.json b/tests/draft-future/minLength.json → tests/draft-next/minLength.json
diff --git a/tests/draft-future/minProperties.json → tests/draft-next/minProperties.json b/tests/draft-future/minProperties.json → tests/draft-next/minProperties.json
diff --git a/tests/draft-future/minimum.json → tests/draft-next/minimum.json b/tests/draft-future/minimum.json → tests/draft-next/minimum.json
diff --git a/tests/draft-future/multipleOf.json → tests/draft-next/multipleOf.json b/tests/draft-future/multipleOf.json → tests/draft-next/multipleOf.json
diff --git a/tests/draft-future/not.json → tests/draft-next/not.json b/tests/draft-future/not.json → tests/draft-next/not.json
diff --git a/tests/draft-future/oneOf.json → tests/draft-next/oneOf.json b/tests/draft-future/oneOf.json → tests/draft-next/oneOf.json
diff --git a/tests/draft-future/optional/bignum.json → tests/draft-next/optional/bignum.json b/tests/draft-future/optional/bignum.json → tests/draft-next/optional/bignum.json
diff --git a/...aft-future/optional/ecmascript-regex.json → ...draft-next/optional/ecmascript-regex.json b/...aft-future/optional/ecmascript-regex.json → ...draft-next/optional/ecmascript-regex.json
diff --git a/...draft-future/optional/float-overflow.json → ...s/draft-next/optional/float-overflow.json b/...draft-future/optional/float-overflow.json → ...s/draft-next/optional/float-overflow.json
diff --git a/...aft-future/optional/format-assertion.json → ...draft-next/optional/format-assertion.json b/...aft-future/optional/format-assertion.json → ...draft-next/optional/format-assertion.json
diff --git a/...aft-future/optional/format/date-time.json → ...draft-next/optional/format/date-time.json b/...aft-future/optional/format/date-time.json → ...draft-next/optional/format/date-time.json
@@ -54,13 +54,38 @@
                 "valid": true
             },
             {
-                "description": "a invalid day in date-time string",
-                "data": "1990-02-31T15:59:60.123-08:00",
+                "description": "a valid date-time with a leap second, UTC",
+                "data": "1998-12-31T23:59:60Z",
+                "valid": true
+            },
+            {
+                "description": "a valid date-time with a leap second, with minus offset",
+                "data": "1998-12-31T15:59:60.123-08:00",
+                "valid": true
+            },
+            {
+                "description": "an invalid date-time past leap second, UTC",
+                "data": "1998-12-31T23:59:61Z",
+                "valid": false
+            },
+            {
+                "description": "an invalid date-time with leap second on a wrong minute, UTC",
+                "data": "1998-12-31T23:58:60Z",
+                "valid": false
+            },
+            {
+                "description": "an invalid date-time with leap second on a wrong hour, UTC",
+                "data": "1998-12-31T22:59:60Z",
+                "valid": false
+            },
+            {
+                "description": "an invalid day in date-time string",
+                "data": "1990-02-31T15:59:59.123-08:00",
                 "valid": false
             },
             {
                 "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:60-24:00",
+                "data": "1990-12-31T15:59:59-24:00",
                 "valid": false
             },
             {

diff --git a/tests/draft-future/optional/format/date.json → tests/draft-next/optional/format/date.json b/tests/draft-future/optional/format/date.json → tests/draft-next/optional/format/date.json
diff --git a/...raft-future/optional/format/duration.json → .../draft-next/optional/format/duration.json b/...raft-future/optional/format/duration.json → .../draft-next/optional/format/duration.json
diff --git a/...s/draft-future/optional/format/email.json → tests/draft-next/optional/format/email.json b/...s/draft-future/optional/format/email.json → tests/draft-next/optional/format/email.json
diff --git a/...raft-future/optional/format/hostname.json → .../draft-next/optional/format/hostname.json b/...raft-future/optional/format/hostname.json → .../draft-next/optional/format/hostname.json
diff --git a/...aft-future/optional/format/idn-email.json → ...draft-next/optional/format/idn-email.json b/...aft-future/optional/format/idn-email.json → ...draft-next/optional/format/idn-email.json
diff --git a/...-future/optional/format/idn-hostname.json → ...ft-next/optional/format/idn-hostname.json b/...-future/optional/format/idn-hostname.json → ...ft-next/optional/format/idn-hostname.json
diff --git a/tests/draft-future/optional/format/ipv4.json → tests/draft-next/optional/format/ipv4.json b/tests/draft-future/optional/format/ipv4.json → tests/draft-next/optional/format/ipv4.json
diff --git a/tests/draft-future/optional/format/ipv6.json → tests/draft-next/optional/format/ipv6.json b/tests/draft-future/optional/format/ipv6.json → tests/draft-next/optional/format/ipv6.json
diff --git a/...future/optional/format/iri-reference.json → ...t-next/optional/format/iri-reference.json b/...future/optional/format/iri-reference.json → ...t-next/optional/format/iri-reference.json
diff --git a/tests/draft-future/optional/format/iri.json → tests/draft-next/optional/format/iri.json b/tests/draft-future/optional/format/iri.json → tests/draft-next/optional/format/iri.json
diff --git a/...-future/optional/format/json-pointer.json → ...ft-next/optional/format/json-pointer.json b/...-future/optional/format/json-pointer.json → ...ft-next/optional/format/json-pointer.json
diff --git a/...s/draft-future/optional/format/regex.json → tests/draft-next/optional/format/regex.json b/...s/draft-future/optional/format/regex.json → tests/draft-next/optional/format/regex.json
diff --git a/...ptional/format/relative-json-pointer.json → ...ptional/format/relative-json-pointer.json b/...ptional/format/relative-json-pointer.json → ...ptional/format/relative-json-pointer.json
diff --git a/tests/draft-future/optional/format/time.json → tests/draft-next/optional/format/time.json b/tests/draft-future/optional/format/time.json → tests/draft-next/optional/format/time.json
diff --git a/...future/optional/format/uri-reference.json → ...t-next/optional/format/uri-reference.json b/...future/optional/format/uri-reference.json → ...t-next/optional/format/uri-reference.json
diff --git a/...-future/optional/format/uri-template.json → ...ft-next/optional/format/uri-template.json b/...-future/optional/format/uri-template.json → ...ft-next/optional/format/uri-template.json
diff --git a/tests/draft-future/optional/format/uri.json → tests/draft-next/optional/format/uri.json b/tests/draft-future/optional/format/uri.json → tests/draft-next/optional/format/uri.json
diff --git a/tests/draft-future/optional/format/uuid.json → tests/draft-next/optional/format/uuid.json b/tests/draft-future/optional/format/uuid.json → tests/draft-next/optional/format/uuid.json
diff --git a/.../draft-future/optional/non-bmp-regex.json → tests/draft-next/optional/non-bmp-regex.json b/.../draft-future/optional/non-bmp-regex.json → tests/draft-next/optional/non-bmp-regex.json
diff --git a/...-future/optional/refOfUnknownKeyword.json → ...ft-next/optional/refOfUnknownKeyword.json b/...-future/optional/refOfUnknownKeyword.json → ...ft-next/optional/refOfUnknownKeyword.json
diff --git a/tests/draft-future/pattern.json → tests/draft-next/pattern.json b/tests/draft-future/pattern.json → tests/draft-next/pattern.json
diff --git a/tests/draft-future/patternProperties.json → tests/draft-next/patternProperties.json b/tests/draft-future/patternProperties.json → tests/draft-next/patternProperties.json
diff --git a/tests/draft-future/prefixItems.json → tests/draft-next/prefixItems.json b/tests/draft-future/prefixItems.json → tests/draft-next/prefixItems.json
diff --git a/tests/draft-future/properties.json → tests/draft-next/properties.json b/tests/draft-future/properties.json → tests/draft-next/properties.json
diff --git a/tests/draft-future/propertyNames.json → tests/draft-next/propertyNames.json b/tests/draft-future/propertyNames.json → tests/draft-next/propertyNames.json
diff --git a/tests/draft-future/ref.json → tests/draft-next/ref.json b/tests/draft-future/ref.json → tests/draft-next/ref.json
@@ -178,7 +178,7 @@
     {
         "description": "remote ref, containing refs itself",
         "schema": {
-            "$ref": "https://json-schema.org/draft/future/schema"
+            "$ref": "https://json-schema.org/draft/next/schema"
         },
         "tests": [
             {

diff --git a/tests/draft-future/refRemote.json → tests/draft-next/refRemote.json b/tests/draft-future/refRemote.json → tests/draft-next/refRemote.json
diff --git a/tests/draft-future/required.json → tests/draft-next/required.json b/tests/draft-future/required.json → tests/draft-next/required.json
diff --git a/tests/draft-future/type.json → tests/draft-next/type.json b/tests/draft-future/type.json → tests/draft-next/type.json
diff --git a/tests/draft-future/unevaluatedItems.json → tests/draft-next/unevaluatedItems.json b/tests/draft-future/unevaluatedItems.json → tests/draft-next/unevaluatedItems.json
diff --git a/...s/draft-future/unevaluatedProperties.json → tests/draft-next/unevaluatedProperties.json b/...s/draft-future/unevaluatedProperties.json → tests/draft-next/unevaluatedProperties.json
diff --git a/tests/draft-future/uniqueItems.json → tests/draft-next/uniqueItems.json b/tests/draft-future/uniqueItems.json → tests/draft-next/uniqueItems.json
diff --git a/tests/draft-future/unknownKeyword.json → tests/draft-next/unknownKeyword.json b/tests/draft-future/unknownKeyword.json → tests/draft-next/unknownKeyword.json
diff --git a/tests/draft-next/vocabulary.json b/tests/draft-next/vocabulary.json
@@ -0,0 +1,34 @@
+[
+    {
+        "description": "schema that uses custom metaschema with with no validation vocabulary",
+        "schema": {
+            "$id": "https://schema/using/no/validation",
+            "$schema": "http://localhost:1234/draft2020-12/metaschema-no-validation.json",
+            "properties": {
+                "badProperty": false,
+                "numberProperty": {
+                    "minimum": 10
+                }
+            }
+        },
+        "tests": [
+            {
+                "description": "applicator vocabulary still works",
+                "data": {
+                    "badProperty": "this property should not exist"
+                },
+                "valid": false
+            },
+            {
+                "description": "no validation: valid number",
+                "data": 20,
+                "valid": true
+            },
+            {
+                "description": "no validation: invalid number, but it still validates",
+                "data": 1,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft2019-09/optional/format/date-time.json b/tests/draft2019-09/optional/format/date-time.json
@@ -54,13 +54,38 @@
                 "valid": true
             },
             {
-                "description": "a invalid day in date-time string",
-                "data": "1990-02-31T15:59:60.123-08:00",
+                "description": "a valid date-time with a leap second, UTC",
+                "data": "1998-12-31T23:59:60Z",
+                "valid": true
+            },
+            {
+                "description": "a valid date-time with a leap second, with minus offset",
+                "data": "1998-12-31T15:59:60.123-08:00",
+                "valid": true
+            },
+            {
+                "description": "an invalid date-time past leap second, UTC",
+                "data": "1998-12-31T23:59:61Z",
+                "valid": false
+            },
+            {
+                "description": "an invalid date-time with leap second on a wrong minute, UTC",
+                "data": "1998-12-31T23:58:60Z",
+                "valid": false
+            },
+            {
+                "description": "an invalid date-time with leap second on a wrong hour, UTC",
+                "data": "1998-12-31T22:59:60Z",
+                "valid": false
+            },
+            {
+                "description": "an invalid day in date-time string",
+                "data": "1990-02-31T15:59:59.123-08:00",
                 "valid": false
             },
             {
                 "description": "an invalid offset in date-time string",
-                "data": "1990-12-31T15:59:60-24:00",
+                "data": "1990-12-31T15:59:59-24:00",
                 "valid": false
             },
             {