Only validate unevaluated props/items on applicable types

Author: EpicWink

jsonschema/_validators.py

@@ -418,6 +418,8 @@ def if_(validator, if_schema, instance, schema):
 
 
 def unevaluatedItems(validator, unevaluatedItems, instance, schema):
+    if not validator.is_type(instance, "array"):
+        return
     evaluated_item_indexes = find_evaluated_item_indexes_by_schema(
         validator, instance, schema,
     )
@@ -431,6 +433,8 @@ def unevaluatedItems(validator, unevaluatedItems, instance, schema):
 
 
 def unevaluatedProperties(validator, unevaluatedProperties, instance, schema):
+    if not validator.is_type(instance, "object"):
+        return
     evaluated_property_keys = find_evaluated_property_keys_by_schema(
         validator, instance, schema,
     )

jsonschema/tests/test_validators.py

@@ -597,6 +597,11 @@ def test_unevaluated_items(self):
             "Unevaluated items are not allowed ('bar', 'foo' were unexpected)",
         )
 
+    def test_unevaluated_items_on_invalid_type(self):
+        schema = {"type": "array", "unevaluatedItems": False}
+        message = self.message_for(instance="foo", schema=schema)
+        self.assertEqual(message, "'foo' is not of type 'array'")
+
     def test_unevaluated_properties(self):
         schema = {"type": "object", "unevaluatedProperties": False}
         message = self.message_for(
@@ -612,6 +617,11 @@ def test_unevaluated_properties(self):
             "('bar', 'foo' were unexpected)",
         )
 
+    def test_unevaluated_properties_on_invalid_type(self):
+        schema = {"type": "object", "unevaluatedProperties": False}
+        message = self.message_for(instance="foo", schema=schema)
+        self.assertEqual(message, "'foo' is not of type 'object'")
+
 
 class TestValidationErrorDetails(TestCase):
     # TODO: These really need unit tests for each individual validator, rather