Squashed 'json/' changes from f57d3e0cc..19947eaa1

19947eaa1 test: unevaluatedProperties not affected by propertyNames
829270631 Check that large integers are multiples of small multipleOf
b59543f6e Merge pull request #647 from santhosh-tekuri/ref-start-slash
6e5d45d71 Merge pull request #646 from santhosh-tekuri/vocab-optional
0311dfda0 Merge pull request #651 from santhosh-tekuri/dynamicref-without-anchor
4503eeaf4 test: A $dynamicRef without anchor in fragment behaves identical to $ref
39af4c1ba test: $ref with absolute-path-reference
880c9933b test/vocabulary: ignore unrecognized optional vocabulary
fd80307ff Merge pull request #642 from santhosh-tekuri/time-2digit
a76ae650d Merge pull request #645 from json-schema-org/gregsdennis/add-vocab-tests-link
0e2b4eefd Merge pull request #643 from 0xSudarshan/main
2b78ccfc4 slight tweaking to wording
8716c4054 add link for vocab test suite to readme
c49ba5445 Fix an incorrect $schema identifier.
f0e5ce71e Added  test for schema-items alongside "ignored" additionalItems
76dae88ab Merge pull request #640 from santhosh-tekuri/refRemote-anchor
cb82e237c Merge pull request #641 from json-schema-org/gregsdennis/unevaluated-not-draft-next
e4afd233a test/format: hour, min, sec must be two digits
7efd51313 fix unevaluatedProperties/not tests for draft-next
e39c6ea6a test/refRemote: anchor within remote ref
bf51b32fb Merge pull request #639 from json-schema-org/additionalItems-unevaluatedItems
52160b368 Add a test for 2019's interaction between additional/unevaluatedItems
69a09a339 Fixed tests for annotation collection inside not.
e4e1a220b Draft7 if/then/else ref tests need to be wrapped in an allOf.
f5bd2f6c3 Merge pull request #632 from json-schema-org/ether/annotations-inside-not
626b433e5 test that annations are collected inside a "not"

git-subtree-dir: json
git-subtree-split: 19947eaa1289168a49edd21bb7a8aa2098069ae0

README.md

@@ -20,6 +20,8 @@ Drafts 04 and 03 are considered "frozen" in that less effort is put in to backpo
 Additional coverage is always welcome, particularly for bugs encountered in real-world implementations.
 If you see anything missing or incorrect, please feel free to [file an issue](https://github.com/json-schema-org/JSON-Schema-Test-Suite/issues) or [submit a PR](https://github.com/json-schema-org/JSON-Schema-Test-Suite).
 
+@gregsdennis has also started a separate [test suite](https://github.com/gregsdennis/json-schema-vocab-test-suites) that is modelled after this suite to cover third-party vocabularies.
+
 ## Introduction to the Test Suite Structure
 
 The tests in this suite are contained in the `tests` directory at the root of this repository.

remotes/draft-next/metaschema-optional-vocabulary.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$id": "http://localhost:1234/draft-next/metaschema-optional-vocabulary.json",
+    "$vocabulary": {
+        "https://json-schema.org/draft/next/vocab/validation": true,
+        "https://json-schema.org/draft/next/vocab/core": true,
+        "http://localhost:1234/draft/next/vocab/custom": false
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/next/meta/validation" },
+        { "$ref": "https://json-schema.org/draft/next/meta/core" }
+    ]
+}

remotes/draft2019-09/metaschema-optional-vocabulary.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$id": "http://localhost:1234/draft2019-09/metaschema-optional-vocabulary.json",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2019-09/vocab/validation": true,
+        "https://json-schema.org/draft/2019-09/vocab/core": true,
+        "http://localhost:1234/draft/2019-09/vocab/custom": false
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/2019-09/meta/validation" },
+        { "$ref": "https://json-schema.org/draft/2019-09/meta/core" }
+    ]
+}

remotes/draft2020-12/metaschema-optional-vocabulary.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "http://localhost:1234/draft2020-12/metaschema-optional-vocabulary.json",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2020-12/vocab/validation": true,
+        "https://json-schema.org/draft/2020-12/vocab/core": true,
+        "http://localhost:1234/draft/2020-12/vocab/custom": false
+    },
+    "allOf": [
+        { "$ref": "https://json-schema.org/draft/2020-12/meta/validation" },
+        { "$ref": "https://json-schema.org/draft/2020-12/meta/core" }
+    ]
+}

tests/draft-next/multipleOf.json

@@ -80,5 +80,19 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "small multiple of large integer",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "type": "integer", "multipleOf": 1e-8
+        },
+        "tests": [
+            {
+                "description": "any integer is a multiple of 1e-8",
+                "data": 12391239123,
+                "valid": true
+            }
+        ]
     }
 ]

tests/draft-next/not.json

@@ -123,5 +123,31 @@
                 "valid": true
             }
         ]
-    }
+    },
+    {
+        "description": "collect annotations inside a 'not', even if collection is disabled",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "not": {
+                "$comment": "this subschema must still produce annotations internally, even though the 'not' will ultimately discard them",
+                "anyOf": [
+                    true,
+                    { "properties": { "foo": true } }
+                ],
+                "unevaluatedProperties": false
+            }
+        },
+        "tests": [
+            {
+                "description": "unevaluated property",
+                "data": { "bar": 1 },
+                "valid": true
+            },
+            {
+                "description": "annotations are still collected inside a 'not'",
+                "data": { "foo": 1 },
+                "valid": false
+            }
+        ]
+     }
 ]

tests/draft-next/optional/format/time.json

@@ -41,6 +41,21 @@
                 "data": "08:30:06Z",
                 "valid": true
             },
+            {
+                "description": "invalid time string with extra leading zeros",
+                "data": "008:030:006Z",
+                "valid": false
+            },
+            {
+                "description": "invalid time string with no leading zero for single digit",
+                "data": "8:3:6Z",
+                "valid": false
+            },
+            {
+                "description": "hour, minute, second must be two digits",
+                "data": "8:0030:6Z",
+                "valid": false
+            },
             {
                 "description": "a valid time string with leap second, Zulu",
                 "data": "23:59:60Z",
@@ -131,6 +146,11 @@
                 "data": "08:30:06-08:00",
                 "valid": true
             },
+            {
+                "description": "hour, minute in time-offset must be two digits",
+                "data": "08:30:06-8:000",
+                "valid": false
+            },
             {
                 "description": "a valid time string with case-insensitive Z",
                 "data": "08:30:06z",

tests/draft-next/ref.json

@@ -949,5 +949,34 @@
                 "valid": true
             }
         ]
-    }
+    },
+    {
+         "description": "ref with absolute-path-reference",
+         "schema": {
+             "$id": "http://example.com/ref/absref.json",
+             "$defs": {
+                 "a": {
+                     "$id": "http://example.com/ref/absref/foobar.json",
+                     "type": "number"
+                 },
+                 "b": {
+                     "$id": "http://example.com/absref/foobar.json",
+                     "type": "string"
+                 }
+             },
+             "$ref": "/absref/foobar.json"
+         },
+         "tests": [
+             {
+                 "description": "a string is valid",
+                 "data": "foo",
+                 "valid": true
+             },
+             {
+                 "description": "an integer is invalid",
+                 "data": 12,
+                 "valid": false
+             }
+         ]
+     }
 ]

tests/draft-next/refRemote.json

@@ -37,6 +37,25 @@
             }
         ]
     },
+    {
+         "description": "anchor within remote ref",
+         "schema": {
+             "$schema": "https://json-schema.org/draft/next/schema",
+             "$ref": "http://localhost:1234/draft-next/locationIndependentIdentifier.json#foo"
+         },
+         "tests": [
+             {
+                 "description": "remote anchor valid",
+                 "data": 1,
+                 "valid": true
+             },
+             {
+                 "description": "remote anchor invalid",
+                 "data": "a",
+                 "valid": false
+             }
+         ]
+    },
     {
         "description": "ref within remote ref",
         "schema": {

tests/draft-next/unevaluatedItems.json

@@ -99,7 +99,7 @@
         ]
     },
     {
-        "description": "unevaluatedItems with items",
+        "description": "unevaluatedItems with items and prefixItems",
         "schema": {
             "$schema": "https://json-schema.org/draft/next/schema",
             "prefixItems": [
@@ -116,6 +116,27 @@
             }
         ]
     },
+    {
+        "description": "unevaluatedItems with items",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "items": {"type": "number"},
+            "unevaluatedItems": {"type": "string"}
+        },
+        "tests": [
+            {
+                "description": "valid under items",
+                "comment": "no elements are considered by unevaluatedItems",
+                "data": [5, 6, 7, 8],
+                "valid": true
+            },
+            {
+                "description": "invalid under items",
+                "data": ["foo", "bar", "baz"],
+                "valid": false
+            }
+        ]
+    },
     {
         "description": "unevaluatedItems with nested tuple",
         "schema": {

tests/draft-next/unevaluatedProperties.json

@@ -1516,5 +1516,27 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "unevaluatedProperties not affected by propertyNames",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/next/schema",
+            "propertyNames": {"maxLength": 1},
+            "unevaluatedProperties": {
+                "type": "number"
+            }
+        },
+        "tests": [
+            {
+                "description": "allows only number properties",
+                "data": {"a": 1},
+                "valid": true
+            },
+            {
+                "description": "string property is invalid",
+                "data": {"a": "b"},
+                "valid": false
+            }
+        ]
     }
 ]

tests/draft-next/vocabulary.json

@@ -34,5 +34,24 @@
                 "valid": true
             }
         ]
-    }
+    },
+    {
+         "description": "ignore unrecognized optional vocabulary",
+         "schema": {
+             "$schema": "http://localhost:1234/draft-next/metaschema-optional-vocabulary.json",
+             "type": "number"
+         },
+         "tests": [
+             {
+                 "description": "string value",
+                 "data": "foobar",
+                 "valid": false
+             },
+             {
+                 "description": "number value",
+                 "data": 20,
+                 "valid": true
+             }
+         ]
+     }
 ]

tests/draft2019-09/additionalItems.json

@@ -21,6 +21,30 @@
     },
     {
         "description": "when items is schema, additionalItems does nothing",
+        "schema": {
+            "$schema":"https://json-schema.org/draft/2019-09/schema",
+            "items": {
+                "type": "integer"
+            },
+            "additionalItems": {
+                "type": "string"
+            }
+        },
+        "tests": [
+            {
+                "description": "valid with a array of type integers",
+                "data": [1,2,3],
+                "valid": true
+            },
+            {
+                "description": "invalid with a array of mixed types",
+                "data": [1,"2","3"],
+                "valid": false
+            }
+        ]
+    },
+    {
+        "description": "when items is schema, boolean additionalItems does nothing",
         "schema": {
             "$schema": "https://json-schema.org/draft/2019-09/schema",
             "items": {},

tests/draft2019-09/multipleOf.json

@@ -79,5 +79,19 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "small multiple of large integer",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "type": "integer", "multipleOf": 1e-8
+        },
+        "tests": [
+            {
+                "description": "any integer is a multiple of 1e-8",
+                "data": 12391239123,
+                "valid": true
+            }
+        ]
     }
 ]

tests/draft2019-09/not.json

@@ -123,5 +123,31 @@
                 "valid": true
             }
         ]
-    }
+    },
+    {
+        "description": "collect annotations inside a 'not', even if collection is disabled",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "not": {
+                "$comment": "this subschema must still produce annotations internally, even though the 'not' will ultimately discard them",
+                "anyOf": [
+                    true,
+                    { "properties": { "foo": true } }
+                ],
+                "unevaluatedProperties": false
+            }
+        },
+        "tests": [
+            {
+                "description": "unevaluated property",
+                "data": { "bar": 1 },
+                "valid": true
+            },
+            {
+                "description": "annotations are still collected inside a 'not'",
+                "data": { "foo": 1 },
+                "valid": false
+            }
+        ]
+     }
 ]