Squashed 'json/' changes from 6b673312..2903943b

2903943b Merge pull request #277 from json-schema-org/non-string-formats
95425df4 Move tests for builtin formats ignoring non-strings upstream.
aa71850e Merge pull request #278 from gregsdennis/master
4b638034 updated 2019-09 references to correct schema uri
8656a718 moved 2019-08 tests to 2019-09; fixed a few 2019-06 $refs
0f888a8f Make ajv's tests not fail the build.
3922a3c2 Run the suite sanity checks on Py3.
9eda690f Minor style.

git-subtree-dir: json
git-subtree-split: 2903943b4c31a33a9dc8b017174deefdf46f5213

65 files changed, 2144 insertions, 17 deletions

diff --git a/.travis.yml b/.travis.yml
index 9c50823..f65e40b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: python
-python: "2.7"
+python: "3.7"
 node_js: "9"
 install:
   - pip install tox
-  - npm install
 script:
   - tox
-  - npm test
+  - npm install && npm test || true
diff --git a/bin/jsonschema_suite b/bin/jsonschema_suite
index 7c181f9..8c5bbc9 100755
--- a/bin/jsonschema_suite
+++ b/bin/jsonschema_suite
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 from __future__ import print_function
 from pprint import pformat
 import argparse
@@ -149,7 +149,7 @@ class SanityTests(unittest.TestCase):
 
         expected = {
             os.path.join(REMOTES_DIR, path): contents
-            for path, contents in REMOTES.iteritems()
+            for path, contents in REMOTES.items()
         }
 
         missing = set(files).symmetric_difference(expected)
diff --git a/tests/draft2019-08/additionalItems.json b/tests/draft2019-09/additionalItems.json
index abecc57..abecc57 100644
--- a/tests/draft2019-08/additionalItems.json
+++ b/tests/draft2019-09/additionalItems.json
diff --git a/tests/draft2019-08/additionalProperties.json b/tests/draft2019-09/additionalProperties.json
index ffeac6b..ffeac6b 100644
--- a/tests/draft2019-08/additionalProperties.json
+++ b/tests/draft2019-09/additionalProperties.json
diff --git a/tests/draft2019-08/allOf.json b/tests/draft2019-09/allOf.json
index eb61209..eb61209 100644
--- a/tests/draft2019-08/allOf.json
+++ b/tests/draft2019-09/allOf.json
diff --git a/tests/draft2019-08/anyOf.json b/tests/draft2019-09/anyOf.json
index ab5eb38..ab5eb38 100644
--- a/tests/draft2019-08/anyOf.json
+++ b/tests/draft2019-09/anyOf.json
diff --git a/tests/draft2019-08/boolean_schema.json b/tests/draft2019-09/boolean_schema.json
index 6d40f23..6d40f23 100644
--- a/tests/draft2019-08/boolean_schema.json
+++ b/tests/draft2019-09/boolean_schema.json
diff --git a/tests/draft2019-08/const.json b/tests/draft2019-09/const.json
index c089625..c089625 100644
--- a/tests/draft2019-08/const.json
+++ b/tests/draft2019-09/const.json
diff --git a/tests/draft2019-08/contains.json b/tests/draft2019-09/contains.json
index b7ae5a2..b7ae5a2 100644
--- a/tests/draft2019-08/contains.json
+++ b/tests/draft2019-09/contains.json
diff --git a/tests/draft2019-08/default.json b/tests/draft2019-09/default.json
index 1762977..1762977 100644
--- a/tests/draft2019-08/default.json
+++ b/tests/draft2019-09/default.json
diff --git a/tests/draft2019-08/defs.json b/tests/draft2019-09/defs.json
index e3c298d..f2fbec4 100644
--- a/tests/draft2019-08/defs.json
+++ b/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 b/tests/draft2019-09/dependencies.json
index 8dd78aa..8dd78aa 100644
--- a/tests/draft2019-08/dependencies.json
+++ b/tests/draft2019-09/dependencies.json
diff --git a/tests/draft2019-08/enum.json b/tests/draft2019-09/enum.json
index 32d7902..32d7902 100644
--- a/tests/draft2019-08/enum.json
+++ b/tests/draft2019-09/enum.json
diff --git a/tests/draft2019-08/exclusiveMaximum.json b/tests/draft2019-09/exclusiveMaximum.json
index dc3cd70..dc3cd70 100644
--- a/tests/draft2019-08/exclusiveMaximum.json
+++ b/tests/draft2019-09/exclusiveMaximum.json
diff --git a/tests/draft2019-08/exclusiveMinimum.json b/tests/draft2019-09/exclusiveMinimum.json
index b38d7ec..b38d7ec 100644
--- a/tests/draft2019-08/exclusiveMinimum.json
+++ b/tests/draft2019-09/exclusiveMinimum.json
diff --git a/tests/draft2019-09/format.json b/tests/draft2019-09/format.json
new file mode 100644
index 0000000..93305f5
--- /dev/null
+++ b/tests/draft2019-09/format.json
@@ -0,0 +1,614 @@
+[
+    {
+        "description": "validation of e-mail addresses",
+        "schema": {"format": "email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IDN e-mail addresses",
+        "schema": {"format": "idn-email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of regexes",
+        "schema": {"format": "regex"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IP addresses",
+        "schema": {"format": "ipv4"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IPv6 addresses",
+        "schema": {"format": "ipv6"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IDN hostnames",
+        "schema": {"format": "idn-hostname"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of hostnames",
+        "schema": {"format": "hostname"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date strings",
+        "schema": {"format": "date"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date-time strings",
+        "schema": {"format": "date-time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of time strings",
+        "schema": {"format": "time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of JSON pointers",
+        "schema": {"format": "json-pointer"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of relative JSON pointers",
+        "schema": {"format": "relative-json-pointer"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IRIs",
+        "schema": {"format": "iri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IRI references",
+        "schema": {"format": "iri-reference"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URIs",
+        "schema": {"format": "uri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URI references",
+        "schema": {"format": "uri-reference"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URI templates",
+        "schema": {"format": "uri-template"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft2019-08/if-then-else.json b/tests/draft2019-09/if-then-else.json
index be73281..be73281 100644
--- a/tests/draft2019-08/if-then-else.json
+++ b/tests/draft2019-09/if-then-else.json
diff --git a/tests/draft2019-08/items.json b/tests/draft2019-09/items.json
index 6e98ee8..6e98ee8 100644
--- a/tests/draft2019-08/items.json
+++ b/tests/draft2019-09/items.json
diff --git a/tests/draft2019-08/maxItems.json b/tests/draft2019-09/maxItems.json
index 3b53a6b..3b53a6b 100644
--- a/tests/draft2019-08/maxItems.json
+++ b/tests/draft2019-09/maxItems.json
diff --git a/tests/draft2019-08/maxLength.json b/tests/draft2019-09/maxLength.json
index 811d35b..811d35b 100644
--- a/tests/draft2019-08/maxLength.json
+++ b/tests/draft2019-09/maxLength.json
diff --git a/tests/draft2019-08/maxProperties.json b/tests/draft2019-09/maxProperties.json
index 513731e..513731e 100644
--- a/tests/draft2019-08/maxProperties.json
+++ b/tests/draft2019-09/maxProperties.json
diff --git a/tests/draft2019-08/maximum.json b/tests/draft2019-09/maximum.json
index 8150984..8150984 100644
--- a/tests/draft2019-08/maximum.json
+++ b/tests/draft2019-09/maximum.json
diff --git a/tests/draft2019-08/minItems.json b/tests/draft2019-09/minItems.json
index ed51188..ed51188 100644
--- a/tests/draft2019-08/minItems.json
+++ b/tests/draft2019-09/minItems.json
diff --git a/tests/draft2019-08/minLength.json b/tests/draft2019-09/minLength.json
index 3f09158..3f09158 100644
--- a/tests/draft2019-08/minLength.json
+++ b/tests/draft2019-09/minLength.json
diff --git a/tests/draft2019-08/minProperties.json b/tests/draft2019-09/minProperties.json
index 49a0726..49a0726 100644
--- a/tests/draft2019-08/minProperties.json
+++ b/tests/draft2019-09/minProperties.json
diff --git a/tests/draft2019-08/minimum.json b/tests/draft2019-09/minimum.json
index 2a9c42b..2a9c42b 100644
--- a/tests/draft2019-08/minimum.json
+++ b/tests/draft2019-09/minimum.json
diff --git a/tests/draft2019-08/multipleOf.json b/tests/draft2019-09/multipleOf.json
index ca3b761..ca3b761 100644
--- a/tests/draft2019-08/multipleOf.json
+++ b/tests/draft2019-09/multipleOf.json
diff --git a/tests/draft2019-08/not.json b/tests/draft2019-09/not.json
index 98de0ed..98de0ed 100644
--- a/tests/draft2019-08/not.json
+++ b/tests/draft2019-09/not.json
diff --git a/tests/draft2019-08/oneOf.json b/tests/draft2019-09/oneOf.json
index 57640b7..57640b7 100644
--- a/tests/draft2019-08/oneOf.json
+++ b/tests/draft2019-09/oneOf.json
diff --git a/tests/draft2019-08/optional/bignum.json b/tests/draft2019-09/optional/bignum.json
index fac275e..fac275e 100644
--- a/tests/draft2019-08/optional/bignum.json
+++ b/tests/draft2019-09/optional/bignum.json
diff --git a/tests/draft2019-08/optional/content.json b/tests/draft2019-09/optional/content.json
index 3f5a743..3f5a743 100644
--- a/tests/draft2019-08/optional/content.json
+++ b/tests/draft2019-09/optional/content.json
diff --git a/tests/draft2019-08/optional/ecmascript-regex.json b/tests/draft2019-09/optional/ecmascript-regex.json
index 08dc936..08dc936 100644
--- a/tests/draft2019-08/optional/ecmascript-regex.json
+++ b/tests/draft2019-09/optional/ecmascript-regex.json
diff --git a/tests/draft2019-08/optional/format/date-time.json b/tests/draft2019-09/optional/format/date-time.json
index dfccee6..dfccee6 100644
--- a/tests/draft2019-08/optional/format/date-time.json
+++ b/tests/draft2019-09/optional/format/date-time.json
diff --git a/tests/draft2019-08/optional/format/date.json b/tests/draft2019-09/optional/format/date.json
index cd23baa..cd23baa 100644
--- a/tests/draft2019-08/optional/format/date.json
+++ b/tests/draft2019-09/optional/format/date.json
diff --git a/tests/draft2019-08/optional/format/email.json b/tests/draft2019-09/optional/format/email.json
index c837c84..c837c84 100644
--- a/tests/draft2019-08/optional/format/email.json
+++ b/tests/draft2019-09/optional/format/email.json
diff --git a/tests/draft2019-08/optional/format/hostname.json b/tests/draft2019-09/optional/format/hostname.json
index d22e57d..d22e57d 100644
--- a/tests/draft2019-08/optional/format/hostname.json
+++ b/tests/draft2019-09/optional/format/hostname.json
diff --git a/tests/draft2019-08/optional/format/idn-email.json b/tests/draft2019-09/optional/format/idn-email.json
index 637409e..637409e 100644
--- a/tests/draft2019-08/optional/format/idn-email.json
+++ b/tests/draft2019-09/optional/format/idn-email.json
diff --git a/tests/draft2019-08/optional/format/idn-hostname.json b/tests/draft2019-09/optional/format/idn-hostname.json
index 3291820..3291820 100644
--- a/tests/draft2019-08/optional/format/idn-hostname.json
+++ b/tests/draft2019-09/optional/format/idn-hostname.json
diff --git a/tests/draft2019-08/optional/format/ipv4.json b/tests/draft2019-09/optional/format/ipv4.json
index 661148a..661148a 100644
--- a/tests/draft2019-08/optional/format/ipv4.json
+++ b/tests/draft2019-09/optional/format/ipv4.json
diff --git a/tests/draft2019-08/optional/format/ipv6.json b/tests/draft2019-09/optional/format/ipv6.json
index f67559b..f67559b 100644
--- a/tests/draft2019-08/optional/format/ipv6.json
+++ b/tests/draft2019-09/optional/format/ipv6.json
diff --git a/tests/draft2019-08/optional/format/iri-reference.json b/tests/draft2019-09/optional/format/iri-reference.json
index 1fd779c..1fd779c 100644
--- a/tests/draft2019-08/optional/format/iri-reference.json
+++ b/tests/draft2019-09/optional/format/iri-reference.json
diff --git a/tests/draft2019-08/optional/format/iri.json b/tests/draft2019-09/optional/format/iri.json
index ed54094..ed54094 100644
--- a/tests/draft2019-08/optional/format/iri.json
+++ b/tests/draft2019-09/optional/format/iri.json
diff --git a/tests/draft2019-08/optional/format/json-pointer.json b/tests/draft2019-09/optional/format/json-pointer.json
index 65c2f06..65c2f06 100644
--- a/tests/draft2019-08/optional/format/json-pointer.json
+++ b/tests/draft2019-09/optional/format/json-pointer.json
diff --git a/tests/draft2019-08/optional/format/regex.json b/tests/draft2019-09/optional/format/regex.json
index d99d021..d99d021 100644
--- a/tests/draft2019-08/optional/format/regex.json
+++ b/tests/draft2019-09/optional/format/regex.json
diff --git a/tests/draft2019-08/optional/format/relative-json-pointer.json b/tests/draft2019-09/optional/format/relative-json-pointer.json
index ceeb743..ceeb743 100644
--- a/tests/draft2019-08/optional/format/relative-json-pointer.json
+++ b/tests/draft2019-09/optional/format/relative-json-pointer.json
diff --git a/tests/draft2019-08/optional/format/time.json b/tests/draft2019-09/optional/format/time.json
index 4ec8a01..4ec8a01 100644
--- a/tests/draft2019-08/optional/format/time.json
+++ b/tests/draft2019-09/optional/format/time.json
diff --git a/tests/draft2019-08/optional/format/uri-reference.json b/tests/draft2019-09/optional/format/uri-reference.json
index e4c9eef..e4c9eef 100644
--- a/tests/draft2019-08/optional/format/uri-reference.json
+++ b/tests/draft2019-09/optional/format/uri-reference.json
diff --git a/tests/draft2019-08/optional/format/uri-template.json b/tests/draft2019-09/optional/format/uri-template.json
index d8396a5..33ab76e 100644
--- a/tests/draft2019-08/optional/format/uri-template.json
+++ b/tests/draft2019-09/optional/format/uri-template.json
@@ -1,9 +1,7 @@
 [
     {
         "description": "format: uri-template",
-        "schema": {
-            "format": "uri-template"
-        },
+        "schema": {"format": "uri-template"},
         "tests": [
             {
                 "description": "a valid uri-template",
diff --git a/tests/draft2019-08/optional/format/uri.json b/tests/draft2019-09/optional/format/uri.json
index 25cc40c..25cc40c 100644
--- a/tests/draft2019-08/optional/format/uri.json
+++ b/tests/draft2019-09/optional/format/uri.json
diff --git a/tests/draft2019-08/optional/zeroTerminatedFloats.json b/tests/draft2019-09/optional/zeroTerminatedFloats.json
index 1bcdf96..1bcdf96 100644
--- a/tests/draft2019-08/optional/zeroTerminatedFloats.json
+++ b/tests/draft2019-09/optional/zeroTerminatedFloats.json
diff --git a/tests/draft2019-08/pattern.json b/tests/draft2019-09/pattern.json
index 25e7299..25e7299 100644
--- a/tests/draft2019-08/pattern.json
+++ b/tests/draft2019-09/pattern.json
diff --git a/tests/draft2019-08/patternProperties.json b/tests/draft2019-09/patternProperties.json
index 1d04a16..1d04a16 100644
--- a/tests/draft2019-08/patternProperties.json
+++ b/tests/draft2019-09/patternProperties.json
diff --git a/tests/draft2019-08/properties.json b/tests/draft2019-09/properties.json
index b86c181..b86c181 100644
--- a/tests/draft2019-08/properties.json
+++ b/tests/draft2019-09/properties.json
diff --git a/tests/draft2019-08/propertyNames.json b/tests/draft2019-09/propertyNames.json
index 8423690..8423690 100644
--- a/tests/draft2019-08/propertyNames.json
+++ b/tests/draft2019-09/propertyNames.json
diff --git a/tests/draft2019-08/ref.json b/tests/draft2019-09/ref.json
index dbeb7d3..d872426 100644
--- a/tests/draft2019-08/ref.json
+++ b/tests/draft2019-09/ref.json
@@ -175,7 +175,7 @@
     },
     {
         "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft/2019-06/schema#"},
+        "schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
         "tests": [
             {
                 "description": "remote ref valid",
diff --git a/tests/draft2019-08/refRemote.json b/tests/draft2019-09/refRemote.json
index 9cadc92..9cadc92 100644
--- a/tests/draft2019-08/refRemote.json
+++ b/tests/draft2019-09/refRemote.json
diff --git a/tests/draft2019-08/required.json b/tests/draft2019-09/required.json
index abf18f3..abf18f3 100644
--- a/tests/draft2019-08/required.json
+++ b/tests/draft2019-09/required.json
diff --git a/tests/draft2019-08/type.json b/tests/draft2019-09/type.json
index ea33b18..ea33b18 100644
--- a/tests/draft2019-08/type.json
+++ b/tests/draft2019-09/type.json
diff --git a/tests/draft2019-08/uniqueItems.json b/tests/draft2019-09/uniqueItems.json
index 8885ed0..8885ed0 100644
--- a/tests/draft2019-08/uniqueItems.json
+++ b/tests/draft2019-09/uniqueItems.json
diff --git a/tests/draft3/format.json b/tests/draft3/format.json
new file mode 100644
index 0000000..8279336
--- /dev/null
+++ b/tests/draft3/format.json
@@ -0,0 +1,362 @@
+[
+    {
+        "description": "validation of e-mail addresses",
+        "schema": {"format": "email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IP addresses",
+        "schema": {"format": "ip-address"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IPv6 addresses",
+        "schema": {"format": "ipv6"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of hostnames",
+        "schema": {"format": "host-name"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date-time strings",
+        "schema": {"format": "date-time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of regular expressions",
+        "schema": {"format": "regex"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date strings",
+        "schema": {"format": "date"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of time strings",
+        "schema": {"format": "time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of CSS colors",
+        "schema": {"format": "color"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URIs",
+        "schema": {"format": "uri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft4/format.json b/tests/draft4/format.json
new file mode 100644
index 0000000..61e4b62
--- /dev/null
+++ b/tests/draft4/format.json
@@ -0,0 +1,218 @@
+[
+    {
+        "description": "validation of e-mail addresses",
+        "schema": {"format": "email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IP addresses",
+        "schema": {"format": "ipv4"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IPv6 addresses",
+        "schema": {"format": "ipv6"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of hostnames",
+        "schema": {"format": "hostname"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date-time strings",
+        "schema": {"format": "date-time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URIs",
+        "schema": {"format": "uri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft6/format.json b/tests/draft6/format.json
new file mode 100644
index 0000000..32e8152
--- /dev/null
+++ b/tests/draft6/format.json
@@ -0,0 +1,326 @@
+[
+    {
+        "description": "validation of e-mail addresses",
+        "schema": {"format": "email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IP addresses",
+        "schema": {"format": "ipv4"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IPv6 addresses",
+        "schema": {"format": "ipv6"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of hostnames",
+        "schema": {"format": "hostname"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date-time strings",
+        "schema": {"format": "date-time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of JSON pointers",
+        "schema": {"format": "json-pointer"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URIs",
+        "schema": {"format": "uri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URI references",
+        "schema": {"format": "uri-reference"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URI templates",
+        "schema": {"format": "uri-template"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft6/optional/format.json b/tests/draft6/optional/format.json
index 74743ff..3dd265f 100644
--- a/tests/draft6/optional/format.json
+++ b/tests/draft6/optional/format.json
@@ -199,9 +199,7 @@
     },
     {
         "description": "format: uri-template",
-        "schema": {
-            "format": "uri-template"
-        },
+        "schema": {"format": "uri-template"},
         "tests": [
             {
                 "description": "a valid uri-template",
diff --git a/tests/draft7/format.json b/tests/draft7/format.json
new file mode 100644
index 0000000..93305f5
--- /dev/null
+++ b/tests/draft7/format.json
@@ -0,0 +1,614 @@
+[
+    {
+        "description": "validation of e-mail addresses",
+        "schema": {"format": "email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IDN e-mail addresses",
+        "schema": {"format": "idn-email"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of regexes",
+        "schema": {"format": "regex"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IP addresses",
+        "schema": {"format": "ipv4"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IPv6 addresses",
+        "schema": {"format": "ipv6"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IDN hostnames",
+        "schema": {"format": "idn-hostname"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of hostnames",
+        "schema": {"format": "hostname"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date strings",
+        "schema": {"format": "date"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of date-time strings",
+        "schema": {"format": "date-time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of time strings",
+        "schema": {"format": "time"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of JSON pointers",
+        "schema": {"format": "json-pointer"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of relative JSON pointers",
+        "schema": {"format": "relative-json-pointer"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IRIs",
+        "schema": {"format": "iri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of IRI references",
+        "schema": {"format": "iri-reference"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URIs",
+        "schema": {"format": "uri"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URI references",
+        "schema": {"format": "uri-reference"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "validation of URI templates",
+        "schema": {"format": "uri-template"},
+        "tests": [
+            {
+                "description": "ignores integers",
+                "data": 12,
+                "valid": true
+            },
+            {
+                "description": "ignores floats",
+                "data": 13.7,
+                "valid": true
+            },
+            {
+                "description": "ignores objects",
+                "data": {},
+                "valid": true
+            },
+            {
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores booleans",
+                "data": false,
+                "valid": true
+            },
+            {
+                "description": "ignores null",
+                "data": null,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft7/optional/format/uri-template.json b/tests/draft7/optional/format/uri-template.json
index d8396a5..33ab76e 100644
--- a/tests/draft7/optional/format/uri-template.json
+++ b/tests/draft7/optional/format/uri-template.json
@@ -1,9 +1,7 @@
 [
     {
         "description": "format: uri-template",
-        "schema": {
-            "format": "uri-template"
-        },
+        "schema": {"format": "uri-template"},
         "tests": [
             {
                 "description": "a valid uri-template",