Add $schema to 2019-09 and 2020-12, update README for draft configuration.

README.md

@@ -103,6 +103,8 @@ The precise steps described do not need to be followed exactly, but the results
 
 To test a specific version:
 
+* For 2019-09 and later published drafts, implementations that are able to detect the draft of each schema via `$schema` SHOULD be configured to do so
+* For draft-07 and earlier, draft-next, and implementations unable to detect via `$schema`, implementations MUST be configured to expect the draft matching the test directory name
 * Load any remote references [described below](additional-assumptions) and configure your implementation to retrieve them via their URIs
 * Walk the filesystem tree for that version's subdirectory and for each `.json` file found:
 

tests/draft2019-09/additionalItems.json

@@ -2,6 +2,7 @@
     {
         "description": "additionalItems as schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "items": [{}],
             "additionalItems": {"type": "integer"}
         },
@@ -21,6 +22,7 @@
     {
         "description": "when items is schema, additionalItems does nothing",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "items": {},
             "additionalItems": false
         },
@@ -35,6 +37,7 @@
     {
         "description": "array of items with no additionalItems permitted",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "items": [{}, {}, {}],
             "additionalItems": false
         },
@@ -68,7 +71,10 @@
     },
     {
         "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "additionalItems": false
+        },
         "tests": [
             {
                 "description":
@@ -85,7 +91,10 @@
     },
     {
         "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "items": [{"type": "integer"}]
+        },
         "tests": [
             {
                 "description": "only the first item is validated",
@@ -97,6 +106,7 @@
     {
         "description": "additionalItems does not look in applicators, valid case",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 { "items": [ { "type": "integer" } ] }
             ],
@@ -113,6 +123,7 @@
     {
         "description": "additionalItems does not look in applicators, invalid case",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 { "items": [ { "type": "integer" }, { "type": "string" } ] }
             ],
@@ -130,6 +141,7 @@
     {
         "description": "items validation adjusts the starting index for additionalItems",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "items": [ { "type": "string" } ],
             "additionalItems": { "type": "integer" }
         },
@@ -149,6 +161,7 @@
     {
         "description": "additionalItems with null instance elements",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "additionalItems": {
                 "type": "null"
             }

tests/draft2019-09/additionalProperties.json

@@ -3,6 +3,7 @@
         "description":
             "additionalProperties being false does not allow other properties",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "properties": {"foo": {}, "bar": {}},
             "patternProperties": { "^v": {} },
             "additionalProperties": false
@@ -43,6 +44,7 @@
     {
         "description": "non-ASCII pattern with additionalProperties",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "patternProperties": {"^á": {}},
             "additionalProperties": false
         },
@@ -62,6 +64,7 @@
     {
         "description": "additionalProperties with schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
         },
@@ -87,6 +90,7 @@
         "description":
             "additionalProperties can exist by itself",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "additionalProperties": {"type": "boolean"}
         },
         "tests": [
@@ -104,7 +108,10 @@
     },
     {
         "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "properties": {"foo": {}, "bar": {}}
+        },
         "tests": [
             {
                 "description": "additional properties are allowed",
@@ -116,6 +123,7 @@
     {
         "description": "additionalProperties does not look in applicators",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {"properties": {"foo": {}}}
             ],
@@ -132,6 +140,7 @@
     {
         "description": "additionalProperties with null valued instance properties",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "additionalProperties": {
                 "type": "null"
             }

tests/draft2019-09/allOf.json

@@ -2,6 +2,7 @@
     {
         "description": "allOf",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {
                     "properties": {
@@ -43,6 +44,7 @@
     {
         "description": "allOf with base schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "properties": {"bar": {"type": "integer"}},
             "required": ["bar"],
             "allOf" : [
@@ -91,6 +93,7 @@
     {
         "description": "allOf simple types",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {"maximum": 30},
                 {"minimum": 20}
@@ -111,7 +114,10 @@
     },
     {
         "description": "allOf with boolean schemas, all true",
-        "schema": {"allOf": [true, true]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "allOf": [true, true]
+        },
         "tests": [
             {
                 "description": "any value is valid",
@@ -122,7 +128,10 @@
     },
     {
         "description": "allOf with boolean schemas, some false",
-        "schema": {"allOf": [true, false]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "allOf": [true, false]
+        },
         "tests": [
             {
                 "description": "any value is invalid",
@@ -133,7 +142,10 @@
     },
     {
         "description": "allOf with boolean schemas, all false",
-        "schema": {"allOf": [false, false]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "allOf": [false, false]
+        },
         "tests": [
             {
                 "description": "any value is invalid",
@@ -145,6 +157,7 @@
     {
         "description": "allOf with one empty schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {}
             ]
@@ -160,6 +173,7 @@
     {
         "description": "allOf with two empty schemas",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {},
                 {}
@@ -176,6 +190,7 @@
     {
         "description": "allOf with the first empty schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {},
                 { "type": "number" }
@@ -197,6 +212,7 @@
     {
         "description": "allOf with the last empty schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 { "type": "number" },
                 {}
@@ -218,6 +234,7 @@
     {
         "description": "nested allOf, to check validation semantics",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [
                 {
                     "allOf": [
@@ -244,6 +261,7 @@
     {
         "description": "allOf combined with anyOf, oneOf",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "allOf": [ { "multipleOf": 2 } ],
             "anyOf": [ { "multipleOf": 3 } ],
             "oneOf": [ { "multipleOf": 5 } ]

tests/draft2019-09/anchor.json

@@ -2,6 +2,7 @@
     {
         "description": "Location-independent identifier",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "$ref": "#foo",
             "$defs": {
                 "A": {
@@ -26,6 +27,7 @@
     {
         "description": "Location-independent identifier with absolute URI",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "$ref": "http://localhost:1234/bar#foo",
             "$defs": {
                 "A": {
@@ -51,6 +53,7 @@
     {
         "description": "Location-independent identifier with base URI change in subschema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "$id": "http://localhost:1234/root",
             "$ref": "http://localhost:1234/nested.json#foo",
             "$defs": {
@@ -82,6 +85,7 @@
         "description": "$anchor inside an enum is not a real identifier",
         "comment": "the implementation must not be confused by an $anchor buried in the enum",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "$defs": {
                 "anchor_in_enum": {
                     "enum": [
@@ -138,6 +142,7 @@
     {
         "description": "same $anchor with different base uri",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "$id": "http://localhost:1234/foobar",
             "$defs": {
                 "A": {
@@ -173,6 +178,7 @@
     {
         "description": "non-schema object containing an $anchor property",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "$defs": {
                 "const_not_anchor": {
                     "const": {
@@ -204,7 +210,10 @@
     {
         "description": "invalid anchors",
         "comment": "Section 8.2.3",
-        "schema": { "$ref": "https://json-schema.org/draft/2019-09/schema" },
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "$ref": "https://json-schema.org/draft/2019-09/schema"
+        },
         "tests": [
             {
                 "description": "MUST start with a letter (and not #)",

tests/draft2019-09/anyOf.json

@@ -2,6 +2,7 @@
     {
         "description": "anyOf",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "anyOf": [
                 {
                     "type": "integer"
@@ -37,6 +38,7 @@
     {
         "description": "anyOf with base schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "type": "string",
             "anyOf" : [
                 {
@@ -67,7 +69,10 @@
     },
     {
         "description": "anyOf with boolean schemas, all true",
-        "schema": {"anyOf": [true, true]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "anyOf": [true, true]
+        },
         "tests": [
             {
                 "description": "any value is valid",
@@ -78,7 +83,10 @@
     },
     {
         "description": "anyOf with boolean schemas, some true",
-        "schema": {"anyOf": [true, false]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "anyOf": [true, false]
+        },
         "tests": [
             {
                 "description": "any value is valid",
@@ -89,7 +97,10 @@
     },
     {
         "description": "anyOf with boolean schemas, all false",
-        "schema": {"anyOf": [false, false]},
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "anyOf": [false, false]
+        },
         "tests": [
             {
                 "description": "any value is invalid",
@@ -101,6 +112,7 @@
     {
         "description": "anyOf complex types",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "anyOf": [
                 {
                     "properties": {
@@ -142,6 +154,7 @@
     {
         "description": "anyOf with one empty schema",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "anyOf": [
                 { "type": "number" },
                 {}
@@ -163,6 +176,7 @@
     {
         "description": "nested anyOf, to check validation semantics",
         "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
             "anyOf": [
                 {
                     "anyOf": [