Squashed 'JSON-Schema-Test-Suite/' changes from 0f888a8..689d2f2

689d2f2 Add a 'latest' symlink. e26d9bc Move the anchor-related tests to an anchor file. 19e7dfe Change location-independent IDs to use $anchor. 4e6c78b Make the draft3 ECMA regex tests consistently named. 433ab2f Merge pull request #286 from Zac-HD/not-patterns dbaa3aa Fix data - escape unicode, not regex pattern 2d55450 Merge pull request #284 from Zac-HD/newlines c8f8789 Add trailine-newline tests for $ pattern 586515e Bump up the length of acceptable descriptions. 0518c65 Merge remote-tracking branch 'Zac-HD/ecma-regex' c0b2431 Tests for ECMA 262 regex dialect b6f79ee Merge pull request #281 from Zac-HD/unique-array-of-items 7c20615 Check uniqueItems with array items 2ebedeb Regenerate the remotes [just for trailing newlines essentially.] 98bb02a Output the trailing newline. 3f44bc7 Uh, this actually should be a native string. f7cc4cb Sanity check on a non-dying Python. 2903943 Merge pull request #277 from json-schema-org/non-string-formats 95425df Move tests for builtin formats ignoring non-strings upstream. aa71850 Merge pull request #278 from gregsdennis/master 4b63803 updated 2019-09 references to correct schema uri 8656a71 moved 2019-08 tests to 2019-09; fixed a few 2019-06 $refs git-subtree-dir: JSON-Schema-Test-Suite git-subtree-split: 689d2f28182720d3778ca91c149f725a6ce73f71
davishmcclurg · Oct 20, 2019 · 5519c42 · 5519c42
1 parent cc74ff6
commit 5519c42
Show file tree

Hide file tree

Showing 79 changed files with 3,485 additions and 115 deletions.
diff --git a/bin/jsonschema_suite b/bin/jsonschema_suite
@@ -99,11 +99,13 @@ class SanityTests(unittest.TestCase):
 
     def test_all_descriptions_have_reasonable_length(self):
         for case in cases(self.test_files):
-            descript = case["description"]
+            description = case["description"]
             self.assertLess(
-                len(descript),
-                60,
-                "%r is too long! (keep it to less than 60 chars)" % (descript,)
+                len(description),
+                70,
+                "%r is too long! (keep it to less than 70 chars)" % (
+                    description,
+                ),
             )
 
     def test_all_descriptions_are_unique(self):
@@ -217,8 +219,9 @@ def main(arguments):
                 if e.errno != errno.EEXIST:
                     raise
 
-            with open(filepath, "wb") as out_file:
+            with open(filepath, "w") as out_file:
                 json.dump(schema, out_file, indent=4, sort_keys=True)
+                out_file.write("\n")
     elif arguments.command == "serve":
         try:
             from flask import Flask, jsonify

diff --git a/remotes/folder/folderInteger.json b/remotes/folder/folderInteger.json
@@ -1,3 +1,3 @@
 {
     "type": "integer"
-}
+}
diff --git a/remotes/integer.json b/remotes/integer.json
@@ -1,3 +1,3 @@
 {
     "type": "integer"
-}
+}
diff --git a/remotes/name-defs.json b/remotes/name-defs.json
@@ -2,8 +2,12 @@
     "$defs": {
         "orNull": {
             "anyOf": [
-                {"type": "null"},
-                {"$ref": "#"}
+                {
+                    "type": "null"
+                },
+                {
+                    "$ref": "#"
+                }
             ]
         }
     },

diff --git a/remotes/name.json b/remotes/name.json
@@ -2,8 +2,12 @@
     "definitions": {
         "orNull": {
             "anyOf": [
-                {"type": "null"},
-                {"$ref": "#"}
+                {
+                    "type": "null"
+                },
+                {
+                    "$ref": "#"
+                }
             ]
         }
     },

diff --git a/remotes/subSchemas.json b/remotes/subSchemas.json
@@ -1,8 +1,8 @@
 {
     "integer": {
         "type": "integer"
-    }, 
+    },
     "refToInteger": {
         "$ref": "#/integer"
     }
-}
+}
diff --git a/tests/draft2019-08/optional/ecmascript-regex.json b/tests/draft2019-08/optional/ecmascript-regex.json
diff --git a/tests/draft2019-08/additionalItems.json → tests/draft2019-09/additionalItems.json b/tests/draft2019-08/additionalItems.json → tests/draft2019-09/additionalItems.json
diff --git a/tests/draft2019-08/additionalProperties.json → tests/draft2019-09/additionalProperties.json b/tests/draft2019-08/additionalProperties.json → tests/draft2019-09/additionalProperties.json
diff --git a/tests/draft2019-08/allOf.json → tests/draft2019-09/allOf.json b/tests/draft2019-08/allOf.json → tests/draft2019-09/allOf.json
diff --git a/tests/draft2019-09/anchor.json b/tests/draft2019-09/anchor.json
@@ -0,0 +1,87 @@
+[
+    {
+        "description": "Location-independent identifier",
+        "schema": {
+            "allOf": [{
+                "$ref": "#foo"
+            }],
+            "$defs": {
+                "A": {
+                    "$anchor": "foo",
+                    "type": "integer"
+                }
+            }
+        },
+        "tests": [
+            {
+                "data": 1,
+                "description": "match",
+                "valid": true
+            },
+            {
+                "data": "a",
+                "description": "mismatch",
+                "valid": false
+            }
+        ]
+    },
+    {
+        "description": "Location-independent identifier with absolute URI",
+        "schema": {
+            "allOf": [{
+                "$ref": "http://localhost:1234/bar#foo"
+            }],
+            "$defs": {
+                "A": {
+                    "$id": "http://localhost:1234/bar",
+                    "$anchor": "foo",
+                    "type": "integer"
+                }
+            }
+        },
+        "tests": [
+            {
+                "data": 1,
+                "description": "match",
+                "valid": true
+            },
+            {
+                "data": "a",
+                "description": "mismatch",
+                "valid": false
+            }
+        ]
+    },
+    {
+        "description": "Location-independent identifier with base URI change in subschema",
+        "schema": {
+            "$id": "http://localhost:1234/root",
+            "allOf": [{
+                "$ref": "http://localhost:1234/nested.json#foo"
+            }],
+            "$defs": {
+                "A": {
+                    "$id": "nested.json",
+                    "$defs": {
+                        "B": {
+                            "$anchor": "foo",
+                            "type": "integer"
+                        }
+                    }
+                }
+            }
+        },
+        "tests": [
+            {
+                "data": 1,
+                "description": "match",
+                "valid": true
+            },
+            {
+                "data": "a",
+                "description": "mismatch",
+                "valid": false
+            }
+        ]
+    }
+]
diff --git a/tests/draft2019-08/anyOf.json → tests/draft2019-09/anyOf.json b/tests/draft2019-08/anyOf.json → tests/draft2019-09/anyOf.json
diff --git a/tests/draft2019-08/boolean_schema.json → tests/draft2019-09/boolean_schema.json b/tests/draft2019-08/boolean_schema.json → tests/draft2019-09/boolean_schema.json
diff --git a/tests/draft2019-08/const.json → tests/draft2019-09/const.json b/tests/draft2019-08/const.json → tests/draft2019-09/const.json
diff --git a/tests/draft2019-08/contains.json → tests/draft2019-09/contains.json b/tests/draft2019-08/contains.json → tests/draft2019-09/contains.json
diff --git a/tests/draft2019-08/default.json → tests/draft2019-09/default.json b/tests/draft2019-08/default.json → tests/draft2019-09/default.json
diff --git a/tests/draft2019-08/defs.json → tests/draft2019-09/defs.json b/tests/draft2019-08/defs.json → tests/draft2019-09/defs.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "valid definition",
-        "schema": {"$ref": "http://json-schema.org/draft/2019-06/schema#"},
+        "schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
         "tests": [
             {
                 "description": "valid definition schema",
@@ -12,7 +12,7 @@
     },
     {
         "description": "invalid definition",
-        "schema": {"$ref": "http://json-schema.org/draft/2019-06/schema#"},
+        "schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
         "tests": [
             {
                 "description": "invalid definition schema",

diff --git a/tests/draft2019-08/dependencies.json → tests/draft2019-09/dependencies.json b/tests/draft2019-08/dependencies.json → tests/draft2019-09/dependencies.json
diff --git a/tests/draft2019-08/enum.json → tests/draft2019-09/enum.json b/tests/draft2019-08/enum.json → tests/draft2019-09/enum.json
diff --git a/tests/draft2019-08/exclusiveMaximum.json → tests/draft2019-09/exclusiveMaximum.json b/tests/draft2019-08/exclusiveMaximum.json → tests/draft2019-09/exclusiveMaximum.json
diff --git a/tests/draft2019-08/exclusiveMinimum.json → tests/draft2019-09/exclusiveMinimum.json b/tests/draft2019-08/exclusiveMinimum.json → tests/draft2019-09/exclusiveMinimum.json