Squashed 'json/' changes from f82764080..91ecacf60

91ecacf60 Forward port a missing null instance property test.
fe3eda228 Apply #579 to case descriptions as well.

git-subtree-dir: json
git-subtree-split: 91ecacf6093692d0fc0082f7a08ed74f74a5f715

Author: Julian

bin/jsonschema_suite

@@ -94,6 +94,27 @@ class SanityTests(unittest.TestCase):
             seen.add(each)
         self.assertFalse(duplicated, "Elements are not unique.")
 
+    def assertFollowsDescriptionStyle(self, description):
+        """
+        Instead of saying "test that X frobs" or "X should frob" use "X frobs".
+
+        See e.g. https://jml.io/pages/test-docstrings.html
+
+        This test isn't comprehensive (it doesn't catch all the extra
+        verbiage there), but it's just to catch whatever it manages to
+        cover.
+        """
+
+        message = (
+            "In descriptions, don't say 'Test that X frobs' or 'X should "
+            "frob' or 'X should be valid'. Just say 'X frobs' or 'X is "
+            "valid'. It's shorter, and the test suite is entirely about "
+            "what *should* be already. "
+            "See https://jml.io/pages/test-docstrings.html for help."
+        )
+        self.assertNotRegex(description, r"\bshould\b", message)
+        self.assertNotRegex(description, r"(?i)\btest(s)? that\b", message)
+
     def test_all_test_files_are_valid_json(self):
         """
         All test files contain valid JSON.
@@ -160,36 +181,15 @@ class SanityTests(unittest.TestCase):
                 )
         print(f"Found {count} test cases.")
 
-    def test_descriptions_do_not_use_modal_verbs(self):
-        """
-        Instead of saying "test that X frobs" or "X should frob" use "X frobs".
-
-        See e.g. https://jml.io/pages/test-docstrings.html
-
-        This test isn't comprehensive (it doesn't catch all the extra
-        verbiage there), but it's just to catch whatever it manages to
-        cover.
-        """
+    def test_case_descriptions_do_not_use_modal_verbs(self):
+        for case in cases(self.test_files):
+            with self.subTest(description=case["description"]):
+                self.assertFollowsDescriptionStyle(case["description"])
 
-        message = (
-            "In descriptions, don't say 'Test that X frobs' or 'X should "
-            "frob' or 'X should be valid'. Just say 'X frobs' or 'X is "
-            "valid'. It's shorter, and the test suite is entirely about "
-            "what *should* be already. "
-            "See https://jml.io/pages/test-docstrings.html for help."
-        )
+    def test_test_descriptions_do_not_use_modal_verbs(self):
         for test in tests(self.test_files):
             with self.subTest(description=test["description"]):
-                self.assertNotRegex(
-                    test["description"],
-                    r"\bshould\b",
-                    message,
-                )
-                self.assertNotRegex(
-                    test["description"],
-                    r"(?i)\btest(s)? that\b",
-                    message,
-                )
+                self.assertFollowsDescriptionStyle(test["description"])
 
     @unittest.skipIf(jsonschema is None, "Validation library not present!")
     def test_all_schemas_are_valid(self):

tests/draft-next/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,15 +130,15 @@
         ]
     },
     {
-        "description": "additionalProperties should properly handle null data",
+        "description": "additionalProperties with null valued instance properties",
         "schema": {
             "additionalProperties": {
                 "type": "null"
             }
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }

tests/draft-next/contains.json

@@ -239,15 +239,15 @@
         ]
     },
     {
-        "description": "contains should properly handle null data",
+        "description": "contains with null instance elements",
         "schema": {
             "contains": {
                 "type": "null"
             }
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null items",
                 "data": [ null ],
                 "valid": true
             }

tests/draft-next/dynamicRef.json

@@ -1,6 +1,6 @@
 [
     {
-        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $dynamicRef to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/dynamicRef-dynamicAnchor-same-schema/root",
             "type": "array",
@@ -26,7 +26,7 @@
         ]
     },
     {
-        "description": "A $ref to a $dynamicAnchor in the same schema resource should behave like a normal $ref to an $anchor",
+        "description": "A $ref to a $dynamicAnchor in the same schema resource behaves like a normal $ref to an $anchor",
         "schema": {
             "$id": "https://test.json-schema.org/ref-dynamicAnchor-same-schema/root",
             "type": "array",
@@ -52,7 +52,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef should resolve to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
+        "description": "A $dynamicRef resolves to the first $dynamicAnchor still in scope that is encountered when the schema is evaluated",
         "schema": {
             "$id": "https://test.json-schema.org/typical-dynamic-resolution/root",
             "$ref": "list",
@@ -82,7 +82,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor should not affect dynamic scope resolution",
+        "description": "A $dynamicRef with intermediate scopes that don't include a matching $dynamicAnchor does not affect dynamic scope resolution",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-with-intermediate-scopes/root",
             "$ref": "intermediate-scope",
@@ -116,7 +116,7 @@
         ]
     },
     {
-        "description": "An $anchor with the same name as a $dynamicAnchor should not be used for dynamic scope resolution",
+        "description": "An $anchor with the same name as a $dynamicAnchor is not used for dynamic scope resolution",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-resolution-ignores-anchors/root",
             "$ref": "list",
@@ -146,7 +146,7 @@
         ]
     },
     {
-        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor should resolve to the first $dynamicAnchor in the dynamic scope",
+        "description": "A $dynamicRef that initially resolves to a schema with a matching $dynamicAnchor resolves to the first $dynamicAnchor in the dynamic scope",
         "schema": {
             "$id": "https://test.json-schema.org/relative-dynamic-reference/root",
             "$dynamicAnchor": "meta",
@@ -243,7 +243,7 @@
         ]
     },
     {
-        "description": "after leaving a dynamic scope, it should not be used by a $dynamicRef",
+        "description": "after leaving a dynamic scope, it is not used by a $dynamicRef",
         "schema": {
             "$id": "https://test.json-schema.org/dynamic-ref-leaving-dynamic-scope/main",
             "if": {

tests/draft-next/items.json

@@ -254,7 +254,7 @@
         ]
     },
     {
-        "description": "items with null",
+        "description": "items with null instance elements",
         "schema": {
             "items": {
                 "type": "null"

tests/draft-next/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": [
             {

tests/draft-next/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": [
             {
@@ -416,7 +416,7 @@
         ]
     },
     {
-        "description": "unicode semantics should be used for all patternProperties matching",
+        "description": "patterns always use unicode semantics with patternProperties",
         "schema": {
             "type": "object",
             "patternProperties": {

tests/draft-next/patternProperties.json

@@ -154,15 +154,15 @@
         ]
     },
     {
-        "description": "patternProperties should properly handle null data",
+        "description": "patternProperties with null valued instance properties",
         "schema": {
             "patternProperties": {
                 "^.*bar$": {"type": "null"}
             }
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foobar": null},
                 "valid": true
             }

tests/draft-next/prefixItems.json

@@ -79,7 +79,7 @@
         ]
     },
     {
-        "description": "prefixItems properly handles null data",
+        "description": "prefixItems with null instance elements",
         "schema": {
             "prefixItems": [
                 {
@@ -89,7 +89,7 @@
         },
         "tests": [
             {
-                "description": "null items allowed",
+                "description": "allows null elements",
                 "data": [ null ],
                 "valid": true
             }

tests/draft-next/properties.json

@@ -165,15 +165,15 @@
         ]
     },
     {
-        "description": "properties should properly handle null data",
+        "description": "properties with null valued instance properties",
         "schema": {
             "properties": {
                 "foo": {"type": "null"}
             }
         },
         "tests": [
             {
-                "description": "null properties allowed",
+                "description": "allows null values",
                 "data": {"foo": null},
                 "valid": true
             }