From cd9a4b9dc8fdfa66b4442428a46b5c31b600dd73 Mon Sep 17 00:00:00 2001 From: Ethan Date: Fri, 1 May 2020 05:33:45 -0700 Subject: [PATCH] change schemas with duplicate URIs http://localhost:1234/folder/ --- bin/jsonschema_suite | 4 +++- remotes/{folder => baseUriChange}/folderInteger.json | 0 remotes/baseUriChangeFolder/folderInteger.json | 3 +++ .../baseUriChangeFolderInSubschema/folderInteger.json | 3 +++ tests/draft2019-09/refRemote.json | 10 +++++----- tests/draft3/refRemote.json | 2 +- tests/draft4/refRemote.json | 6 +++--- tests/draft6/refRemote.json | 6 +++--- tests/draft7/refRemote.json | 6 +++--- 9 files changed, 24 insertions(+), 16 deletions(-) rename remotes/{folder => baseUriChange}/folderInteger.json (100%) create mode 100644 remotes/baseUriChangeFolder/folderInteger.json create mode 100644 remotes/baseUriChangeFolderInSubschema/folderInteger.json diff --git a/bin/jsonschema_suite b/bin/jsonschema_suite index c8bb7ba3..5f5d133f 100755 --- a/bin/jsonschema_suite +++ b/bin/jsonschema_suite @@ -51,7 +51,9 @@ REMOTES = { u"refToInteger": {u"$ref": u"#/$defs/integer"}, } }, - "folder/folderInteger.json": {u"type": u"integer"} + "baseUriChange/folderInteger.json": {u"type": u"integer"}, + "baseUriChangeFolder/folderInteger.json": {u"type": u"integer"}, + "baseUriChangeFolderInSubschema/folderInteger.json": {u"type": u"integer"}, } REMOTES_DIR = os.path.join(ROOT_DIR, "remotes") diff --git a/remotes/folder/folderInteger.json b/remotes/baseUriChange/folderInteger.json similarity index 100% rename from remotes/folder/folderInteger.json rename to remotes/baseUriChange/folderInteger.json diff --git a/remotes/baseUriChangeFolder/folderInteger.json b/remotes/baseUriChangeFolder/folderInteger.json new file mode 100644 index 00000000..8b50ea30 --- /dev/null +++ b/remotes/baseUriChangeFolder/folderInteger.json @@ -0,0 +1,3 @@ +{ + "type": "integer" +} diff --git a/remotes/baseUriChangeFolderInSubschema/folderInteger.json b/remotes/baseUriChangeFolderInSubschema/folderInteger.json new file mode 100644 index 00000000..8b50ea30 --- /dev/null +++ b/remotes/baseUriChangeFolderInSubschema/folderInteger.json @@ -0,0 +1,3 @@ +{ + "type": "integer" +} diff --git a/tests/draft2019-09/refRemote.json b/tests/draft2019-09/refRemote.json index 515263dd..b9c6a282 100644 --- a/tests/draft2019-09/refRemote.json +++ b/tests/draft2019-09/refRemote.json @@ -54,7 +54,7 @@ "schema": { "$id": "http://localhost:1234/", "items": { - "$id": "folder/", + "$id": "baseUriChange/", "items": {"$ref": "folderInteger.json"} } }, @@ -76,10 +76,10 @@ "schema": { "$id": "http://localhost:1234/scope_change_defs1.json", "type" : "object", - "properties": {"list": {"$ref": "folder/"}}, + "properties": {"list": {"$ref": "baseUriChangeFolder/"}}, "$defs": { "baz": { - "$id": "folder/", + "$id": "baseUriChangeFolder/", "type": "array", "items": {"$ref": "folderInteger.json"} } @@ -103,10 +103,10 @@ "schema": { "$id": "http://localhost:1234/scope_change_defs2.json", "type" : "object", - "properties": {"list": {"$ref": "folder/#/$defs/bar"}}, + "properties": {"list": {"$ref": "baseUriChangeFolderInSubschema/#/$defs/bar"}}, "$defs": { "baz": { - "$id": "folder/", + "$id": "baseUriChangeFolderInSubschema/", "$defs": { "bar": { "type": "array", diff --git a/tests/draft3/refRemote.json b/tests/draft3/refRemote.json index 4ca80473..de0cb43a 100644 --- a/tests/draft3/refRemote.json +++ b/tests/draft3/refRemote.json @@ -54,7 +54,7 @@ "schema": { "id": "http://localhost:1234/", "items": { - "id": "folder/", + "id": "baseUriChange/", "items": {"$ref": "folderInteger.json"} } }, diff --git a/tests/draft4/refRemote.json b/tests/draft4/refRemote.json index 8611fadc..ce5e99a3 100644 --- a/tests/draft4/refRemote.json +++ b/tests/draft4/refRemote.json @@ -54,7 +54,7 @@ "schema": { "id": "http://localhost:1234/", "items": { - "id": "folder/", + "id": "baseUriChange/", "items": {"$ref": "folderInteger.json"} } }, @@ -81,7 +81,7 @@ }, "definitions": { "baz": { - "id": "folder/", + "id": "baseUriChangeFolder/", "type": "array", "items": {"$ref": "folderInteger.json"} } @@ -110,7 +110,7 @@ }, "definitions": { "baz": { - "id": "folder/", + "id": "baseUriChangeFolderInSubschema/", "definitions": { "bar": { "type": "array", diff --git a/tests/draft6/refRemote.json b/tests/draft6/refRemote.json index 819d3267..74a78626 100644 --- a/tests/draft6/refRemote.json +++ b/tests/draft6/refRemote.json @@ -54,7 +54,7 @@ "schema": { "$id": "http://localhost:1234/", "items": { - "$id": "folder/", + "$id": "baseUriChange/", "items": {"$ref": "folderInteger.json"} } }, @@ -81,7 +81,7 @@ }, "definitions": { "baz": { - "$id": "folder/", + "$id": "baseUriChangeFolder/", "type": "array", "items": {"$ref": "folderInteger.json"} } @@ -110,7 +110,7 @@ }, "definitions": { "baz": { - "$id": "folder/", + "$id": "baseUriChangeFolderInSubschema/", "definitions": { "bar": { "type": "array", diff --git a/tests/draft7/refRemote.json b/tests/draft7/refRemote.json index 819d3267..74a78626 100644 --- a/tests/draft7/refRemote.json +++ b/tests/draft7/refRemote.json @@ -54,7 +54,7 @@ "schema": { "$id": "http://localhost:1234/", "items": { - "$id": "folder/", + "$id": "baseUriChange/", "items": {"$ref": "folderInteger.json"} } }, @@ -81,7 +81,7 @@ }, "definitions": { "baz": { - "$id": "folder/", + "$id": "baseUriChangeFolder/", "type": "array", "items": {"$ref": "folderInteger.json"} } @@ -110,7 +110,7 @@ }, "definitions": { "baz": { - "$id": "folder/", + "$id": "baseUriChangeFolderInSubschema/", "definitions": { "bar": { "type": "array",