Merge branch 'main' into feat/draft2020-12-maxcontains-zero

Author: abhi-03-kh

README.md

@@ -86,7 +86,7 @@ These are:
 
 1. `optional/`: Contains tests that are considered optional. Note that this subdirectory currently conflates many reasons why a test may be optional -- it may be because tests within a particular file are indeed not required by the specification but still potentially useful to an implementer, or it may be because tests within it only apply to programming languages with particular functionality (in which case they are not truly optional in such a language). In the future this directory structure will be made richer to reflect these differences more clearly.
 
-2. `proposals/`: Contains a subfolder for each active proposal to the specification. If the proposal is a keyword (generally the case), then the subfolder will bear the name of that keyword. Inside the proposal subfolder is a series of test files that would contain amendments to the required test suite should the proposal be incorporated into the specification. These test should be considered volitile while the proposal is in development, however implementations claiming to support the proposal are expected to pass its tests.
+2. `proposals/`: Contains a subfolder for each active proposal to the specification. If the proposal is a keyword (generally the case), then the subfolder will bear the name of that keyword. Inside the proposal subfolder is a series of test files that would contain amendments to the required test suite should the proposal be incorporated into the specification. These tests should be considered volatile while the proposal is in development; however, implementations claiming to support the proposal are expected to pass its tests.
 
 ## Using the Suite to Test a Validator Implementation
 

annotations/README.md

@@ -5,7 +5,7 @@ on which values of an instance. These tests are agnostic of any output format.
 
 ## Supported Dialects
 
-Although the annotation terminology of didn't appear in the spec until 2019-09,
+Although annotation terminology didn't appear in the spec until 2019-09,
 the concept is compatible with every version of JSON Schema. Test Cases in this
 Test Suite are designed to be compatible with as many releases of JSON Schema as
 possible. They do not include `$schema` or `$id`/`id` keywords so
@@ -25,7 +25,7 @@ A short description of what behavior the Test Case is covering.
 
 The `compatibility` option allows you to set which dialects the Test Case is
 compatible with. Test Runners can use this value to filter out Test Cases that
-don't apply the to dialect currently under test. The terminology for annotations
+don't apply to the dialect currently under test. The terminology for annotations
 didn't appear in the spec until 2019-09, but the concept is compatible with
 older releases as well. When setting `compatibility`, test authors should take
 into account dialects before 2019-09 for implementations that chose to support
@@ -42,7 +42,7 @@ Case is compatible with draft-07 and up.
 **Example**: `"compatibility": "7"`
 
 You can use a `<=` operator to indicate that the Test Case is compatible with
-releases less then or equal to the given release. This example indicates that
+releases less than or equal to the given release. This example indicates that
 the Test Case is compatible with 2019-09 and under.
 
 **Example**: `"compatibility": "<=2019"`
@@ -111,6 +111,6 @@ could contribute annotations for a single keyword.
 An empty object is an assertion that the annotation must not appear at the
 `location` for the `keyword`.
 
-As a convention for this Test Suite, the `expected` array should be sorted such
+As a convention for this Test Suite, the `expected` object should be sorted such
 that the most recently encountered value for an annotation given top-down
 evaluation of the schema comes before previously encountered values.

annotations/test-case.schema.json

@@ -13,7 +13,7 @@
       "pattern": "^(<=|=)?([123467]|2019|2020)(,(<=|=)?([123467]|2019|2020))*$"
     },
     "schema": {
-      "markdownDescription": "This schema shouldn't include `$schema` or `id`/`$id` unless necesary for the test because Test Cases should be designed to work with as many releases as possible.",
+      "markdownDescription": "This schema shouldn't include `$schema` or `id`/`$id` unless necessary for the test because Test Cases should be designed to work with as many releases as possible.",
       "type": ["boolean", "object"]
     },
     "externalSchemas": {

annotations/tests/core.json

@@ -25,6 +25,108 @@
           ]
         }
       ]
+    },
+    {
+      "description": "`$dynamicRef` resolves to `$dynamicAnchor`",
+      "compatibility": "2020",
+      "schema": {
+        "$dynamicRef": "#foo",
+        "$defs": {
+          "foo": {
+            "$dynamicAnchor": "foo",
+            "title": "Foo"
+          }
+        }
+      },
+      "tests": [
+        {
+          "instance": "bar",
+          "assertions": [
+            {
+              "location": "",
+              "keyword": "title",
+              "expected": {
+                "#/$defs/foo": "Foo"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "`$dynamicRef` resolves to different `$dynamicAnchor`s depending on dynamic path",
+      "compatibility": "2020",
+      "schema": {
+        "$id": "https://test.json-schema.org/dynamic-ref-annotation/main",
+        "if": {
+          "properties": { "kindOfList": { "const": "numbers" } },
+          "required": ["kindOfList"]
+        },
+        "then": { "$ref": "numberList" },
+        "else": { "$ref": "stringList" },
+        "$defs": {
+          "genericList": {
+            "$id": "genericList",
+            "properties": {
+              "list": {
+                "items": { "$dynamicRef": "#itemType" }
+              }
+            },
+            "$defs": {
+              "defaultItemType": {
+                "$dynamicAnchor": "itemType"
+              }
+            }
+          },
+          "numberList": {
+            "$id": "numberList",
+            "$defs": {
+              "itemType": {
+                "$dynamicAnchor": "itemType",
+                "title": "Number Item"
+              }
+            },
+            "$ref": "genericList"
+          },
+          "stringList": {
+            "$id": "stringList",
+            "$defs": {
+              "itemType": {
+                "$dynamicAnchor": "itemType",
+                "title": "String Item"
+              }
+            },
+            "$ref": "genericList"
+          }
+        }
+      },
+      "tests": [
+        {
+          "instance": { "kindOfList": "numbers", "list": [1] },
+          "assertions": [
+            {
+              "location": "/list/0",
+              "keyword": "title",
+              "expected": {
+                "#/$defs/numberList/$defs/itemType": "Number Item"
+              }
+            }
+          ]
+        },
+        {
+          "instance": { "kindOfList": "strings", "list": ["foo"] },
+          "assertions": [
+            {
+              "location": "/list/0",
+              "keyword": "title",
+              "expected": {
+                "#/$defs/stringList/$defs/itemType": "String Item"
+              }
+            }
+          ]
+        }
+      ]
     }
+
   ]
-}
+} 

bin/jsonschema_suite

@@ -281,7 +281,6 @@ class SanityTests(unittest.TestCase):
                 "$vocabulary",
                 "additionalProperties",
                 "allOf",
-                "allOf",
                 "anyOf",
                 "const",
                 "contains",
@@ -301,7 +300,6 @@ class SanityTests(unittest.TestCase):
                 "items",
                 "maxContains",
                 "maxItems",
-                "maxItems",
                 "maxLength",
                 "maxProperties",
                 "maximum",

output-tests/README.md

@@ -8,7 +8,7 @@ _**NOTE** Although the formats didn't change much between 2019-09 and 2020-12, t
 
 The tests are organized by specification release and then into two categories: content and structure.
 
-Content tests verify that the keywords are producing the correct annotations and/or error messages.  Since there are no requirements on the content of error messages, there's not much that can be verified for them, but it is possible to identify when a error message _could_ be present.  Primarily, these tests need to extensively cover the annotation behaviors of each keyword.  The only output format needed for these tests is `basic` for 2019-09/2020-12 and `list` for later versions.
+Content tests verify that the keywords are producing the correct annotations and/or error messages.  Since there are no requirements on the content of error messages, there's not much that can be verified for them, but it is possible to identify when an error message _could_ be present.  Primarily, these tests need to extensively cover the annotation behaviors of each keyword.  The only output format needed for these tests is `basic` for 2019-09/2020-12 and `list` for later versions.
 
 Structure tests verify that the structures of the various formats (i.e. `flag`, `basic`, `detailed`, `verbose` for 2019-09/2020-12 and `flag`, `list`, `hierarchical` for later versions) are correct.  These tests don't need to cover each keyword; rather they need to sufficiently cover the various aspects of building the output structures by using whatever keywords are necessary to do so.
 
@@ -22,7 +22,7 @@ The `output` property itself has a property for each of the output formats where
 
 ## Other notes
 
-### Ambiguity around 2020-09/2020-12 `basic`
+### Ambiguity around 2019-09/2020-12 `basic`
 
 The 2019-09/2020-12 specs don't define the structure of `basic` very thoroughly.  Specifically there is a nuance where if the list contains a single output node, there are two possible structures, given the text:
 

tests/draft2019-09/enum.json

@@ -354,5 +354,44 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "empty enum",
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2019-09/schema",
+            "enum": []
+        },
+        "tests": [
+            {
+                "description": "string is invalid",
+                "data": "foo",
+                "valid": false
+            },
+            {
+                "description": "number is invalid",
+                "data": 42,
+                "valid": false
+            },
+            {
+                "description": "null is invalid",
+                "data": null,
+                "valid": false
+            },
+            {
+                "description": "object is invalid",
+                "data": {},
+                "valid": false
+            },
+            {
+                "description": "array is invalid",
+                "data": [],
+                "valid": false
+            },
+            {
+                "description": "boolean is invalid",
+                "data": false,
+                "valid": false
+            }
+        ]
     }
 ]

tests/draft2019-09/optional/format/duration.json

@@ -1,6 +1,7 @@
 [
     {
         "description": "validation of duration strings",
+        "comment": "RFC 3339 Appendix A defines the ABNF grammar for ISO-8601 durations used by JSON Schema format 'duration'. These tests enforce only the syntax defined by that grammar.",
         "schema": {
             "$schema": "https://json-schema.org/draft/2019-09/schema",
             "format": "duration"
@@ -135,6 +136,87 @@
                 "description": "element without unit",
                 "data": "P1",
                 "valid": false
+            },
+            {
+                "description": "all date and time components",
+                "data": "P1Y2M3DT4H5M6S",
+                "valid": true
+            },
+            {
+                "description": "date components only",
+                "data": "P1Y2M3D",
+                "valid": true
+            },
+            {
+                "description": "time components only",
+                "data": "PT1H2M3S",
+                "valid": true
+            },
+            {
+                "description": "month and day",
+                "data": "P1M2D",
+                "valid": true
+            },
+            {
+                "description": "hour and minute",
+                "data": "PT1H30M",
+                "valid": true
+            },
+            {
+                "description": "multi-digit values in all components",
+                "data": "P10Y10M10DT10H10M10S",
+                "valid": true
+            },
+            {
+                "description": "fractional duration is not allowed by RFC 3339 ABNF",
+                "comment": "numeric components use 1*DIGIT where DIGIT = %x30-39; '.' is not allowed",
+                "data": "PT0.5S",
+                "valid": false
+            },
+            {
+                "description": "leading whitespace is invalid",
+                "data": " P1D",
+                "valid": false
+            },
+            {
+                "description": "trailing whitespace is invalid",
+                "data": "P1D ",
+                "valid": false
+            },
+            {
+                "description": "empty string is invalid",
+                "data": "",
+                "valid": false
+            },
+            {
+                "description": "years and months can appear without days",
+                "data": "P1Y2M",
+                "valid": true
+            },
+            {
+                "description": "years and days cannot appear without months",
+                "data": "P1Y2D",
+                "valid": false
+            },
+            {
+                "description": "months and days can appear without years",
+                "data": "P1M2D",
+                "valid": true
+            },
+            {
+                "description": "hours and minutes can appear without seconds",
+                "data": "PT1H2M",
+                "valid": true
+            },
+            {
+                "description": "hours and seconds cannot appear without minutes",
+                "data": "PT1H2S",
+                "valid": false
+            },
+            {
+                "description": "minutes and seconds can appear without hour",
+                "data": "PT1M2S",
+                "valid": true
             }
         ]
     }

tests/draft2019-09/optional/format/email.json

@@ -90,6 +90,21 @@
                 "description": "full \"From\" header is invalid",
                 "data": "\"Winston Smith\" <winston.smith@recdep.minitrue> (Records Department)",
                 "valid": false
+            },
+            {
+                "description": "local part is required",
+                "data": "@example.com",
+                "valid": false
+            },
+            {
+                "description": "domain is required",
+                "data": "joe.bloggs@",
+                "valid": false
+            },
+            {
+                "description": "unquoted space in local part is invalid",
+                "data": "joe bloggs@example.com",
+                "valid": false
             }
         ]
     }