Merge commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2'

* commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2':
  Squashed 'json/' changes from f82764080..91ecacf60

8 files changed, 21 insertions, 22 deletions

diff --git a/json/tests/draft6/additionalItems.json b/json/tests/draft6/additionalItems.json
index 454142b..deb44fd 100644
--- a/json/tests/draft6/additionalItems.json
+++ b/json/tests/draft6/additionalItems.json
@@ -95,7 +95,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, valid case",
+        "description": "additionalItems does not look in applicators, valid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" } ] }
@@ -111,7 +111,7 @@
         ]
     },
     {
-        "description": "additionalItems should not look in applicators, invalid case",
+        "description": "additionalItems does not look in applicators, invalid case",
         "schema": {
             "allOf": [
                 { "items": [ { "type": "integer" }, { "type": "string" } ] }
@@ -147,7 +147,7 @@
         ]
     },
     {
-        "description": "additionalItems should properly handle null data",
+        "description": "additionalItems with null instance elements",
         "schema": {
             "additionalItems": {
                 "type": "null"
@@ -155,7 +155,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft6/additionalProperties.json b/json/tests/draft6/additionalProperties.json
index 98b8842..0f8e162 100644
--- a/json/tests/draft6/additionalProperties.json
+++ b/json/tests/draft6/additionalProperties.json
@@ -60,8 +60,7 @@
         ]
     },
     {
-        "description":
-            "additionalProperties allows a schema which should validate",
+        "description": "additionalProperties with schema",
         "schema": {
             "properties": {"foo": {}, "bar": {}},
             "additionalProperties": {"type": "boolean"}
@@ -115,7 +114,7 @@
         ]
     },
     {
-        "description": "additionalProperties should not look in applicators",
+        "description": "additionalProperties does not look in applicators",
         "schema": {
             "allOf": [
                 {"properties": {"foo": {}}}
@@ -131,7 +130,7 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
@@ -139,7 +138,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }
diff --git a/json/tests/draft6/contains.json b/json/tests/draft6/contains.json
index be87c97..bd93654 100644
--- a/json/tests/draft6/contains.json
+++ b/json/tests/draft6/contains.json
@@ -127,7 +127,7 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
@@ -135,7 +135,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft6/items.json b/json/tests/draft6/items.json
index dc56e7c..7ed6781 100644
--- a/json/tests/draft6/items.json
+++ b/json/tests/draft6/items.json
@@ -248,7 +248,7 @@
         ]
     },
     {
-        "description": "single-form items should properly handle null data",
+        "description": "single-form items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"
@@ -256,14 +256,14 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
         ]
     },
     {
-        "description": "array-form items should properly handle null data",
+        "description": "array-form items with null instance elements",
         "schema": {
             "items": [
                 {
@@ -273,7 +273,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }
diff --git a/json/tests/draft6/multipleOf.json b/json/tests/draft6/multipleOf.json
index faa87cf..25c25a9 100644
--- a/json/tests/draft6/multipleOf.json
+++ b/json/tests/draft6/multipleOf.json
@@ -58,7 +58,7 @@
         ]
     },
     {
-        "description": "invalid instance should not raise error when float division = inf",
+        "description": "float division = inf",
         "schema": {"type": "integer", "multipleOf": 0.123456789},
         "tests": [
             {
diff --git a/json/tests/draft6/optional/ecmascript-regex.json b/json/tests/draft6/optional/ecmascript-regex.json
index 764248f..c4886aa 100644
--- a/json/tests/draft6/optional/ecmascript-regex.json
+++ b/json/tests/draft6/optional/ecmascript-regex.json
@@ -290,7 +290,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all pattern matching",
+        "description": "patterns always use unicode semantics with pattern",
         "schema": { "pattern": "\\p{Letter}cole" },
         "tests": [
             {
@@ -405,7 +405,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {
diff --git a/json/tests/draft6/patternProperties.json b/json/tests/draft6/patternProperties.json
index 34b2e85..c276e64 100644
--- a/json/tests/draft6/patternProperties.json
+++ b/json/tests/draft6/patternProperties.json
@@ -154,7 +154,7 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
@@ -162,7 +162,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }
diff --git a/json/tests/draft6/properties.json b/json/tests/draft6/properties.json
index 8c3ed35..21a2e09 100644
--- a/json/tests/draft6/properties.json
+++ b/json/tests/draft6/properties.json
@@ -165,7 +165,7 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
@@ -173,7 +173,7 @@
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }