Merge pull request #681 from json-schema-org/gregsdennis/ref-to-ref-to-non-local-target

Julian · web-flow · commit 5cc9214e82f1 · 2023-08-03T09:44:23.000+02:00
update previous test set to consistently use file extensions; add to draft-next
diff --git a/remotes/draft-next/detached-dynamicref.json b/remotes/draft-next/detached-dynamicref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft-next/detached-dynamicref.json",
+  "$schema": "https://json-schema.org/draft/next/schema",
+  "$defs": {
+    "foo": {
+      "$dynamicRef": "#detached"
+    },
+    "detached": {
+      "$dynamicAnchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/remotes/draft-next/detached-ref.json b/remotes/draft-next/detached-ref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft-next/detached-ref.json",
+  "$schema": "https://json-schema.org/draft/next/schema",
+  "$defs": {
+    "foo": {
+      "$ref": "#detached"
+    },
+    "detached": {
+      "$anchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/remotes/draft2019-09/detached-ref.json b/remotes/draft2019-09/detached-ref.json
@@ -1,5 +1,5 @@
 {
-  "$id": "http://localhost:1234/draft2019-09/detached-ref",
+  "$id": "http://localhost:1234/draft2019-09/detached-ref.json",
   "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$defs": {
     "foo": {
diff --git a/remotes/draft2020-12/detached-dynamicref.json b/remotes/draft2020-12/detached-dynamicref.json
@@ -1,5 +1,5 @@
 {
-  "$id": "http://localhost:1234/draft2020-12/detached-dynamicref",
+  "$id": "http://localhost:1234/draft2020-12/detached-dynamicref.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$defs": {
     "foo": {
diff --git a/remotes/draft2020-12/detached-ref.json b/remotes/draft2020-12/detached-ref.json
@@ -1,5 +1,5 @@
 {
-  "$id": "http://localhost:1234/draft2020-12/detached-ref",
+  "$id": "http://localhost:1234/draft2020-12/detached-ref.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$defs": {
     "foo": {
diff --git a/remotes/draft6/detached-ref.json b/remotes/draft6/detached-ref.json
@@ -1,5 +1,5 @@
 {
-  "$id": "http://localhost:1234/draft6/detached-ref",
+  "$id": "http://localhost:1234/draft6/detached-ref.json",
   "$schema": "http://json-schema.org/draft-06/schema#",
   "definitions": {
     "foo": {
diff --git a/remotes/draft7/detached-ref.json b/remotes/draft7/detached-ref.json
@@ -1,5 +1,5 @@
 {
-  "$id": "http://localhost:1234/draft7/detached-ref",
+  "$id": "http://localhost:1234/draft7/detached-ref.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "foo": {
diff --git a/tests/draft-next/dynamicRef.json b/tests/draft-next/dynamicRef.json
@@ -594,5 +594,23 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "$ref to $dynamicRef finds detached $dynamicAnchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft-next/detached-dynamicref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft-next/refRemote.json b/tests/draft-next/refRemote.json
@@ -310,5 +310,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+       "description": "$ref to $ref finds detached $anchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft-next/detached-ref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2019-09/ref.json b/tests/draft2019-09/ref.json
@@ -1055,23 +1055,5 @@
                  "valid": false
              }
          ]
-     },
-     {
-        "description": "$ref to $ref finds detached $anchor",
-         "schema": {
-             "$ref": "http://localhost:1234/draft2019-09/detached-ref#/$defs/foo"
-         },
-         "tests": [
-             {
-                 "description": "number is valid",
-                 "data": 1,
-                 "valid": true
-             },
-             {
-                 "description": "non-number is invalid",
-                 "data": "a",
-                 "valid": false
-             }
-         ]
      }
 ]
diff --git a/tests/draft2019-09/refRemote.json b/tests/draft2019-09/refRemote.json
@@ -310,5 +310,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+       "description": "$ref to $ref finds detached $anchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft2019-09/detached-ref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2020-12/dynamicRef.json b/tests/draft2020-12/dynamicRef.json
@@ -712,7 +712,7 @@
     {
         "description": "$ref to $dynamicRef finds detached $dynamicAnchor",
         "schema": {
-            "$ref": "http://localhost:1234/draft2020-12/detached-dynamicref#/$defs/foo"
+            "$ref": "http://localhost:1234/draft2020-12/detached-dynamicref.json#/$defs/foo"
         },
         "tests": [
             {
diff --git a/tests/draft2020-12/ref.json b/tests/draft2020-12/ref.json
@@ -1055,23 +1055,5 @@
                 "valid": false
             }
         ]
-    },
-    {
-        "description": "$ref to $ref finds detached $anchor",
-        "schema": {
-            "$ref": "http://localhost:1234/draft2020-12/detached-ref#/$defs/foo"
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
     }
 ]
diff --git a/tests/draft2020-12/refRemote.json b/tests/draft2020-12/refRemote.json
@@ -310,5 +310,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "$ref to $ref finds detached $anchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft2020-12/detached-ref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft6/ref.json b/tests/draft6/ref.json
@@ -925,23 +925,5 @@
                  "valid": false
              }
          ]
-     },
-     {
-         "description": "$ref to $ref finds location-independent $id",
-         "schema": {
-             "$ref": "http://localhost:1234/draft6/detached-ref#/definitions/foo"
-         },
-         "tests": [
-             {
-                 "description": "number is valid",
-                 "data": 1,
-                 "valid": true
-             },
-             {
-                 "description": "non-number is invalid",
-                 "data": "a",
-                 "valid": false
-             }
-         ]
      }
 ]
diff --git a/tests/draft6/refRemote.json b/tests/draft6/refRemote.json
@@ -235,5 +235,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "$ref to $ref finds location-independent $id",
+        "schema": {
+            "$ref": "http://localhost:1234/draft6/detached-ref.json#/definitions/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft7/ref.json b/tests/draft7/ref.json
@@ -1039,23 +1039,5 @@
                 "valid": false
             }
         ]
-    },
-    {
-        "description": "$ref to $ref finds location-independent $id",
-        "schema": {
-            "$ref": "http://localhost:1234/draft7/detached-ref#/definitions/foo"
-        },
-        "tests": [
-            {
-                "description": "number is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "non-number is invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
     }
 ]
diff --git a/tests/draft7/refRemote.json b/tests/draft7/refRemote.json
@@ -235,5 +235,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "$ref to $ref finds location-independent $id",
+        "schema": {
+            "$ref": "http://localhost:1234/draft7/detached-ref.json#/definitions/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$id": "http://localhost:1234/draft2019-09/detached-ref",`
	`2`	`+ "$id": "http://localhost:1234/draft2019-09/detached-ref.json",`
`3`	`3`	`"$schema": "https://json-schema.org/draft/2019-09/schema",`
`4`	`4`	`"$defs": {`
`5`	`5`	`"foo": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$id": "http://localhost:1234/draft6/detached-ref",`
	`2`	`+ "$id": "http://localhost:1234/draft6/detached-ref.json",`
`3`	`3`	`"$schema": "http://json-schema.org/draft-06/schema#",`
`4`	`4`	`"definitions": {`
`5`	`5`	`"foo": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$id": "http://localhost:1234/draft7/detached-ref",`
	`2`	`+ "$id": "http://localhost:1234/draft7/detached-ref.json",`
`3`	`3`	`"$schema": "http://json-schema.org/draft-07/schema#",`
`4`	`4`	`"definitions": {`
`5`	`5`	`"foo": {`
Original file line number	Diff line number	Diff line change
`@@ -594,5 +594,23 @@`
`594`	`594`	`"valid": false`
`595`	`595`	`}`
`596`	`596`	`]`
	`597`	`+ },`
	`598`	`+ {`
	`599`	`+ "description": "$ref to $dynamicRef finds detached $dynamicAnchor",`
	`600`	`+ "schema": {`
	`601`	`+ "$ref": "http://localhost:1234/draft-next/detached-dynamicref.json#/$defs/foo"`
	`602`	`+ },`
	`603`	`+ "tests": [`
	`604`	`+ {`
	`605`	`+ "description": "number is valid",`
	`606`	`+ "data": 1,`
	`607`	`+ "valid": true`
	`608`	`+ },`
	`609`	`+ {`
	`610`	`+ "description": "non-number is invalid",`
	`611`	`+ "data": "a",`
	`612`	`+ "valid": false`
	`613`	`+ }`
	`614`	`+ ]`
`597`	`615`	`}`
`598`	`616`	`]`
Original file line number	Diff line number	Diff line change
`@@ -310,5 +310,23 @@`
`310`	`310`	`"valid": true`
`311`	`311`	`}`
`312`	`312`	`]`
	`313`	`+ },`
	`314`	`+ {`
	`315`	`+ "description": "$ref to $ref finds detached $anchor",`
	`316`	`+ "schema": {`
	`317`	`+ "$ref": "http://localhost:1234/draft-next/detached-ref.json#/$defs/foo"`
	`318`	`+ },`
	`319`	`+ "tests": [`
	`320`	`+ {`
	`321`	`+ "description": "number is valid",`
	`322`	`+ "data": 1,`
	`323`	`+ "valid": true`
	`324`	`+ },`
	`325`	`+ {`
	`326`	`+ "description": "non-number is invalid",`
	`327`	`+ "data": "a",`
	`328`	`+ "valid": false`
	`329`	`+ }`
	`330`	`+ ]`
`313`	`331`	`}`
`314`	`332`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1055,23 +1055,5 @@`
`1055`	`1055`	`"valid": false`
`1056`	`1056`	`}`
`1057`	`1057`	`]`
`1058`		`- },`
`1059`		`- {`
`1060`		`- "description": "$ref to $ref finds detached $anchor",`
`1061`		`- "schema": {`
`1062`		`- "$ref": "http://localhost:1234/draft2019-09/detached-ref#/$defs/foo"`
`1063`		`- },`
`1064`		`- "tests": [`
`1065`		`- {`
`1066`		`- "description": "number is valid",`
`1067`		`- "data": 1,`
`1068`		`- "valid": true`
`1069`		`- },`
`1070`		`- {`
`1071`		`- "description": "non-number is invalid",`
`1072`		`- "data": "a",`
`1073`		`- "valid": false`
`1074`		`- }`
`1075`		`- ]`
`1076`	`1058`	`}`
`1077`	`1059`	`]`