fix: make identifiers unique across tests

karenetheridge · karenetheridge · commit bf383b4cf2a0 · 2021-05-14T18:30:57.000-07:00
diff --git a/tests/draft2019-09/id.json b/tests/draft2019-09/id.json
@@ -211,32 +211,32 @@
                 "id_in_enum": {
                     "enum": [
                         {
-                          "$id": "https://localhost:1234/my_identifier.json",
+                          "$id": "https://localhost:1234/id/my_identifier.json",
                           "type": "null"
                         }
                     ]
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "string"
                 },
                 "zzz_id_in_const": {
                     "const": {
-                        "$id": "https://localhost:1234/my_identifier.json",
+                        "$id": "https://localhost:1234/id/my_identifier.json",
                         "type": "null"
                     }
                 }
             },
             "anyOf": [
                 { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/id/my_identifier.json" }
             ]
         },
         "tests": [
             {
                 "description": "exact match to enum, and type matches",
                 "data": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "null"
                 },
                 "valid": true
diff --git a/tests/draft2019-09/unknownKeyword.json b/tests/draft2019-09/unknownKeyword.json
@@ -8,21 +8,21 @@
                     "not": {
                         "array_of_schemas": [
                             {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "null"
                             }
                         ]
                     }
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                     "type": "string"
                 },
                 "id_in_unknown1": {
                     "not": {
                         "object_of_schemas": {
                             "foo": {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "integer"
                             }
                         }
@@ -32,7 +32,7 @@
             "anyOf": [
                 { "$ref": "#/$defs/id_in_unknown0" },
                 { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }
             ]
         },
         "tests": [
diff --git a/tests/draft2020-12/id.json b/tests/draft2020-12/id.json
@@ -213,32 +213,32 @@
                 "id_in_enum": {
                     "enum": [
                         {
-                          "$id": "https://localhost:1234/my_identifier.json",
+                          "$id": "https://localhost:1234/id/my_identifier.json",
                           "type": "null"
                         }
                     ]
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "string"
                 },
                 "zzz_id_in_const": {
                     "const": {
-                        "$id": "https://localhost:1234/my_identifier.json",
+                        "$id": "https://localhost:1234/id/my_identifier.json",
                         "type": "null"
                     }
                 }
             },
             "anyOf": [
                 { "$ref": "#/$defs/id_in_enum" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/id/my_identifier.json" }
             ]
         },
         "tests": [
             {
                 "description": "exact match to enum, and type matches",
                 "data": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "null"
                 },
                 "valid": true
diff --git a/tests/draft2020-12/unknownKeyword.json b/tests/draft2020-12/unknownKeyword.json
@@ -8,21 +8,21 @@
                     "not": {
                         "array_of_schemas": [
                             {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "null"
                             }
                         ]
                     }
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                     "type": "string"
                 },
                 "id_in_unknown1": {
                     "not": {
                         "object_of_schemas": {
                             "foo": {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "integer"
                             }
                         }
@@ -32,7 +32,7 @@
             "anyOf": [
                 { "$ref": "#/$defs/id_in_unknown0" },
                 { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }
             ]
         },
         "tests": [
diff --git a/tests/draft6/id.json b/tests/draft6/id.json
@@ -7,32 +7,32 @@
                 "id_in_enum": {
                     "enum": [
                         {
-                          "$id": "https://localhost:1234/my_identifier.json",
+                          "$id": "https://localhost:1234/id/my_identifier.json",
                           "type": "null"
                         }
                     ]
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "string"
                 },
                 "zzz_id_in_const": {
                     "const": {
-                        "$id": "https://localhost:1234/my_identifier.json",
+                        "$id": "https://localhost:1234/id/my_identifier.json",
                         "type": "null"
                     }
                 }
             },
             "anyOf": [
                 { "$ref": "#/definitions/id_in_enum" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/id/my_identifier.json" }
             ]
         },
         "tests": [
             {
                 "description": "exact match to enum, and type matches",
                 "data": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "null"
                 },
                 "valid": true
diff --git a/tests/draft6/unknownKeyword.json b/tests/draft6/unknownKeyword.json
@@ -8,21 +8,21 @@
                     "not": {
                         "array_of_schemas": [
                             {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "null"
                             }
                         ]
                     }
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                     "type": "string"
                 },
                 "id_in_unknown1": {
                     "not": {
                         "object_of_schemas": {
                             "foo": {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "integer"
                             }
                         }
@@ -32,7 +32,7 @@
             "anyOf": [
                 { "$ref": "#/$defs/id_in_unknown0" },
                 { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }
             ]
         },
         "tests": [
diff --git a/tests/draft7/id.json b/tests/draft7/id.json
@@ -7,32 +7,32 @@
                 "id_in_enum": {
                     "enum": [
                         {
-                          "$id": "https://localhost:1234/my_identifier.json",
+                          "$id": "https://localhost:1234/id/my_identifier.json",
                           "type": "null"
                         }
                     ]
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "string"
                 },
                 "zzz_id_in_const": {
                     "const": {
-                        "$id": "https://localhost:1234/my_identifier.json",
+                        "$id": "https://localhost:1234/id/my_identifier.json",
                         "type": "null"
                     }
                 }
             },
             "anyOf": [
                 { "$ref": "#/definitions/id_in_enum" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/id/my_identifier.json" }
             ]
         },
         "tests": [
             {
                 "description": "exact match to enum, and type matches",
                 "data": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/id/my_identifier.json",
                     "type": "null"
                 },
                 "valid": true
diff --git a/tests/draft7/unknownKeyword.json b/tests/draft7/unknownKeyword.json
@@ -8,21 +8,21 @@
                     "not": {
                         "array_of_schemas": [
                             {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "null"
                             }
                         ]
                     }
                 },
                 "real_id_in_schema": {
-                    "$id": "https://localhost:1234/my_identifier.json",
+                    "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                     "type": "string"
                 },
                 "id_in_unknown1": {
                     "not": {
                         "object_of_schemas": {
                             "foo": {
-                              "$id": "https://localhost:1234/my_identifier.json",
+                              "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",
                               "type": "integer"
                             }
                         }
@@ -32,7 +32,7 @@
             "anyOf": [
                 { "$ref": "#/$defs/id_in_unknown0" },
                 { "$ref": "#/$defs/id_in_unknown1" },
-                { "$ref": "https://localhost:1234/my_identifier.json" }
+                { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }
             ]
         },
         "tests": [

Original file line number	Diff line number	Diff line change
`@@ -211,32 +211,32 @@`
`211`	`211`	`"id_in_enum": {`
`212`	`212`	`"enum": [`
`213`	`213`	`{`
`214`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`214`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`215`	`215`	`"type": "null"`
`216`	`216`	`}`
`217`	`217`	`]`
`218`	`218`	`},`
`219`	`219`	`"real_id_in_schema": {`
`220`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`220`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`221`	`221`	`"type": "string"`
`222`	`222`	`},`
`223`	`223`	`"zzz_id_in_const": {`
`224`	`224`	`"const": {`
`225`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`225`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`226`	`226`	`"type": "null"`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`},`
`230`	`230`	`"anyOf": [`
`231`	`231`	`{ "$ref": "#/$defs/id_in_enum" },`
`232`		`- { "$ref": "https://localhost:1234/my_identifier.json" }`
	`232`	`+ { "$ref": "https://localhost:1234/id/my_identifier.json" }`
`233`	`233`	`]`
`234`	`234`	`},`
`235`	`235`	`"tests": [`
`236`	`236`	`{`
`237`	`237`	`"description": "exact match to enum, and type matches",`
`238`	`238`	`"data": {`
`239`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`239`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`240`	`240`	`"type": "null"`
`241`	`241`	`},`
`242`	`242`	`"valid": true`
Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,21 @@`
`8`	`8`	`"not": {`
`9`	`9`	`"array_of_schemas": [`
`10`	`10`	`{`
`11`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`11`	`+ "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",`
`12`	`12`	`"type": "null"`
`13`	`13`	`}`
`14`	`14`	`]`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`"real_id_in_schema": {`
`18`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`18`	`+ "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",`
`19`	`19`	`"type": "string"`
`20`	`20`	`},`
`21`	`21`	`"id_in_unknown1": {`
`22`	`22`	`"not": {`
`23`	`23`	`"object_of_schemas": {`
`24`	`24`	`"foo": {`
`25`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`25`	`+ "$id": "https://localhost:1234/unknownKeyword/my_identifier.json",`
`26`	`26`	`"type": "integer"`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -32,7 +32,7 @@`
`32`	`32`	`"anyOf": [`
`33`	`33`	`{ "$ref": "#/$defs/id_in_unknown0" },`
`34`	`34`	`{ "$ref": "#/$defs/id_in_unknown1" },`
`35`		`- { "$ref": "https://localhost:1234/my_identifier.json" }`
	`35`	`+ { "$ref": "https://localhost:1234/unknownKeyword/my_identifier.json" }`
`36`	`36`	`]`
`37`	`37`	`},`
`38`	`38`	`"tests": [`
Original file line number	Diff line number	Diff line change
`@@ -213,32 +213,32 @@`
`213`	`213`	`"id_in_enum": {`
`214`	`214`	`"enum": [`
`215`	`215`	`{`
`216`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`216`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`217`	`217`	`"type": "null"`
`218`	`218`	`}`
`219`	`219`	`]`
`220`	`220`	`},`
`221`	`221`	`"real_id_in_schema": {`
`222`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`222`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`223`	`223`	`"type": "string"`
`224`	`224`	`},`
`225`	`225`	`"zzz_id_in_const": {`
`226`	`226`	`"const": {`
`227`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`227`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`228`	`228`	`"type": "null"`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`	`},`
`232`	`232`	`"anyOf": [`
`233`	`233`	`{ "$ref": "#/$defs/id_in_enum" },`
`234`		`- { "$ref": "https://localhost:1234/my_identifier.json" }`
	`234`	`+ { "$ref": "https://localhost:1234/id/my_identifier.json" }`
`235`	`235`	`]`
`236`	`236`	`},`
`237`	`237`	`"tests": [`
`238`	`238`	`{`
`239`	`239`	`"description": "exact match to enum, and type matches",`
`240`	`240`	`"data": {`
`241`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`241`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`242`	`242`	`"type": "null"`
`243`	`243`	`},`
`244`	`244`	`"valid": true`
Original file line number	Diff line number	Diff line change
`@@ -7,32 +7,32 @@`
`7`	`7`	`"id_in_enum": {`
`8`	`8`	`"enum": [`
`9`	`9`	`{`
`10`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`10`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`11`	`11`	`"type": "null"`
`12`	`12`	`}`
`13`	`13`	`]`
`14`	`14`	`},`
`15`	`15`	`"real_id_in_schema": {`
`16`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`16`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`17`	`17`	`"type": "string"`
`18`	`18`	`},`
`19`	`19`	`"zzz_id_in_const": {`
`20`	`20`	`"const": {`
`21`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`21`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`22`	`22`	`"type": "null"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`},`
`26`	`26`	`"anyOf": [`
`27`	`27`	`{ "$ref": "#/definitions/id_in_enum" },`
`28`		`- { "$ref": "https://localhost:1234/my_identifier.json" }`
	`28`	`+ { "$ref": "https://localhost:1234/id/my_identifier.json" }`
`29`	`29`	`]`
`30`	`30`	`},`
`31`	`31`	`"tests": [`
`32`	`32`	`{`
`33`	`33`	`"description": "exact match to enum, and type matches",`
`34`	`34`	`"data": {`
`35`		`- "$id": "https://localhost:1234/my_identifier.json",`
	`35`	`+ "$id": "https://localhost:1234/id/my_identifier.json",`
`36`	`36`	`"type": "null"`
`37`	`37`	`},`
`38`	`38`	`"valid": true`