change schemas with duplicate URIs http://localhost:1234/folder/

notEthan · notEthan · commit cd9a4b9dc8fd · 2020-08-12T00:42:12.000-07:00
diff --git 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/baseUriChange/folderInteger.json b/remotes/baseUriChange/folderInteger.json
diff --git a/remotes/baseUriChangeFolder/folderInteger.json b/remotes/baseUriChangeFolder/folderInteger.json
@@ -0,0 +1,3 @@
+{
+    "type": "integer"
+}
diff --git a/remotes/baseUriChangeFolderInSubschema/folderInteger.json 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ REMOTES = {`
`51`	`51`	`u"refToInteger": {u"$ref": u"#/$defs/integer"},`
`52`	`52`	`}`
`53`	`53`	`},`
`54`		`- "folder/folderInteger.json": {u"type": u"integer"}`
	`54`	`+ "baseUriChange/folderInteger.json": {u"type": u"integer"},`
	`55`	`+ "baseUriChangeFolder/folderInteger.json": {u"type": u"integer"},`
	`56`	`+ "baseUriChangeFolderInSubschema/folderInteger.json": {u"type": u"integer"},`
`55`	`57`	`}`
`56`	`58`	`REMOTES_DIR = os.path.join(ROOT_DIR, "remotes")`
`57`	`59`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"schema": {`
`55`	`55`	`"id": "http://localhost:1234/",`
`56`	`56`	`"items": {`
`57`		`- "id": "folder/",`
	`57`	`+ "id": "baseUriChange/",`
`58`	`58`	`"items": {"$ref": "folderInteger.json"}`
`59`	`59`	`}`
`60`	`60`	`},`