Merge commit 'd1a643b5fced470dfa44cdd60648ea678ddc29b2'

* commit 'd1a643b5fced470dfa44cdd60648ea678ddc29b2':
  Squashed 'json/' changes from 2576db4df..71f55b36b

7 files changed, 19 insertions, 47 deletions

diff --git a/json/test-schema.json b/json/test-schema.json
index 8393720..d5fe538 100644
--- a/json/test-schema.json
+++ b/json/test-schema.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "Schema for tests",
     "type": "array",
     "items": {
@@ -12,7 +12,9 @@
                 "format": "uri"
             },
             "description": { "type": "string" },
-            "schema": {},
+            "schema": {
+                "description": "This should be a valid schema. This should be a ref to a meta-schema if schema keywords need testing."
+            },
             "tests": {
                 "description": "A set of related tests all using the same schema",
                 "type": "array",
diff --git a/json/tests/draft2019-09/optional/zeroTerminatedFloats.json b/json/tests/draft2019-09/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 1bcdf96..0000000
--- a/json/tests/draft2019-09/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float without fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft2019-09/type.json b/json/tests/draft2019-09/type.json
index ea33b18..05e0808 100644
--- a/json/tests/draft2019-09/type.json
+++ b/json/tests/draft2019-09/type.json
@@ -9,6 +9,11 @@
                 "valid": true
             },
             {
+                "description": "a float with zero fractional part is an integer",
+                "data": 1.0,
+                "valid": true
+            },
+            {
                 "description": "a float is not an integer",
                 "data": 1.1,
                 "valid": false
diff --git a/json/tests/draft6/optional/zeroTerminatedFloats.json b/json/tests/draft6/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 1bcdf96..0000000
--- a/json/tests/draft6/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float without fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft6/type.json b/json/tests/draft6/type.json
index ea33b18..05e0808 100644
--- a/json/tests/draft6/type.json
+++ b/json/tests/draft6/type.json
@@ -9,6 +9,11 @@
                 "valid": true
             },
             {
+                "description": "a float with zero fractional part is an integer",
+                "data": 1.0,
+                "valid": true
+            },
+            {
                 "description": "a float is not an integer",
                 "data": 1.1,
                 "valid": false
diff --git a/json/tests/draft7/optional/zeroTerminatedFloats.json b/json/tests/draft7/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 1bcdf96..0000000
--- a/json/tests/draft7/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float without fractional part is an integer",
-                "data": 1.0,
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/json/tests/draft7/type.json b/json/tests/draft7/type.json
index ea33b18..05e0808 100644
--- a/json/tests/draft7/type.json
+++ b/json/tests/draft7/type.json
@@ -9,6 +9,11 @@
                 "valid": true
             },
             {
+                "description": "a float with zero fractional part is an integer",
+                "data": 1.0,
+                "valid": true
+            },
+            {
                 "description": "a float is not an integer",
                 "data": 1.1,
                 "valid": false