Merge commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02'

* commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02':
  Squashed 'json/' changes from 1326f36e..17fa9589

6 files changed, 90 insertions, 10 deletions

diff --git a/json/tests/draft2019-09/optional/format/duration.json b/json/tests/draft2019-09/optional/format/duration.json
index 4514738..b8124d7 100644
--- a/json/tests/draft2019-09/optional/format/duration.json
+++ b/json/tests/draft2019-09/optional/format/duration.json
@@ -87,6 +87,26 @@
               "description": "weeks cannot be combined with other units",
               "data": "P1Y2W",
               "valid": false
+          },
+          {
+              "description": "null value should be ignored",
+              "data": null,
+              "valid": true
+          },
+          {
+              "description": "number value should be ignored",
+              "data": 1,
+              "valid": true
+          },
+          {
+              "description": "list value should be ignored",
+              "data": [],
+              "valid": true
+          },
+          {
+              "description": "object value should be ignored",
+              "data": {},
+              "valid": true
           }
       ]
   }
diff --git a/json/tests/draft2019-09/optional/format/uuid.json b/json/tests/draft2019-09/optional/format/uuid.json
index 45bf349..3d0f0e7 100644
--- a/json/tests/draft2019-09/optional/format/uuid.json
+++ b/json/tests/draft2019-09/optional/format/uuid.json
@@ -64,6 +64,26 @@
                 "description": "hypothetical version 15",
                 "data": "99c17cbb-656f-f64a-940f-1a4568f03487",
                 "valid": true
+            },
+            {
+                "description": "null value should be ignored",
+                "data": null,
+                "valid": true
+            },
+            {
+                "description": "number value should be ignored",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "list value should be ignored",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "object value should be ignored",
+                "data": {},
+                "valid": true
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/duration.json b/json/tests/draft2020-12/optional/format/duration.json
index 4514738..b8124d7 100644
--- a/json/tests/draft2020-12/optional/format/duration.json
+++ b/json/tests/draft2020-12/optional/format/duration.json
@@ -87,6 +87,26 @@
               "description": "weeks cannot be combined with other units",
               "data": "P1Y2W",
               "valid": false
+          },
+          {
+              "description": "null value should be ignored",
+              "data": null,
+              "valid": true
+          },
+          {
+              "description": "number value should be ignored",
+              "data": 1,
+              "valid": true
+          },
+          {
+              "description": "list value should be ignored",
+              "data": [],
+              "valid": true
+          },
+          {
+              "description": "object value should be ignored",
+              "data": {},
+              "valid": true
           }
       ]
   }
diff --git a/json/tests/draft2020-12/optional/format/uuid.json b/json/tests/draft2020-12/optional/format/uuid.json
index 45bf349..3d0f0e7 100644
--- a/json/tests/draft2020-12/optional/format/uuid.json
+++ b/json/tests/draft2020-12/optional/format/uuid.json
@@ -64,6 +64,26 @@
                 "description": "hypothetical version 15",
                 "data": "99c17cbb-656f-f64a-940f-1a4568f03487",
                 "valid": true
+            },
+            {
+                "description": "null value should be ignored",
+                "data": null,
+                "valid": true
+            },
+            {
+                "description": "number value should be ignored",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "list value should be ignored",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "object value should be ignored",
+                "data": {},
+                "valid": true
             }
         ]
     }
diff --git a/json/tests/draft3/ref.json b/json/tests/draft3/ref.json
index 760b771..46dd82d 100644
--- a/json/tests/draft3/ref.json
+++ b/json/tests/draft3/ref.json
@@ -201,24 +201,24 @@
         ]
     },
     {
-        "description": "$ref prevents a sibling $id from changing the base uri",
+        "description": "$ref prevents a sibling id from changing the base uri",
         "schema": {
-            "$id": "http://localhost:1234/sibling_id/base/",
+            "id": "http://localhost:1234/sibling_id/base/",
             "definitions": {
                 "foo": {
-                    "$id": "http://localhost:1234/sibling_id/foo.json",
+                    "id": "http://localhost:1234/sibling_id/foo.json",
                     "minimum": 2
                 },
                 "base_foo": {
                     "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
-                    "$id": "foo.json",
+                    "id": "foo.json",
                     "minimum": 5
                 }
             },
             "allOf": [
                 {
                     "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not ttp://localhost:1234/sibling_id/foo.json",
-                    "$id": "http://localhost:1234/sibling_id/",
+                    "id": "http://localhost:1234/sibling_id/",
                     "$ref": "foo.json"
                 }
             ]
diff --git a/json/tests/draft4/ref.json b/json/tests/draft4/ref.json
index ae3770b..7f5a211 100644
--- a/json/tests/draft4/ref.json
+++ b/json/tests/draft4/ref.json
@@ -176,24 +176,24 @@
         ]
     },
     {
-        "description": "$ref prevents a sibling $id from changing the base uri",
+        "description": "$ref prevents a sibling id from changing the base uri",
         "schema": {
-            "$id": "http://localhost:1234/sibling_id/base/",
+            "id": "http://localhost:1234/sibling_id/base/",
             "definitions": {
                 "foo": {
-                    "$id": "http://localhost:1234/sibling_id/foo.json",
+                    "id": "http://localhost:1234/sibling_id/foo.json",
                     "minimum": 2
                 },
                 "base_foo": {
                     "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
-                    "$id": "foo.json",
+                    "id": "foo.json",
                     "minimum": 5
                 }
             },
             "allOf": [
                 {
                     "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not ttp://localhost:1234/sibling_id/foo.json",
-                    "$id": "http://localhost:1234/sibling_id/",
+                    "id": "http://localhost:1234/sibling_id/",
                     "$ref": "foo.json"
                 }
             ]