fix tests

Author: sydney-runkle

tests/test_errors.py

@@ -257,6 +257,11 @@ def f(input_value, info):
     ('no_such_attribute', "Object has no attribute 'wrong_name'", {'attribute': 'wrong_name'}),
     ('json_invalid', 'Invalid JSON: foobar', {'error': 'foobar'}),
     ('json_type', 'JSON input should be string, bytes or bytearray', None),
+    (
+        'cannot_validate_from_json',
+        'Cannot check `isinstance` when validating from json, use a JsonOrPython validator instead',
+        {'method_name': 'isinstance'},
+    ),
     ('recursion_loop', 'Recursion error - cyclic reference detected', None),
     ('model_type', 'Input should be a valid dictionary or instance of Foobar', {'class_name': 'Foobar'}),
     ('model_attributes_type', 'Input should be a valid dictionary or object to extract fields from', None),
@@ -506,10 +511,10 @@ def test_all_errors():
             'example_context': None,
         },
         {
-            'type': 'recursion_loop',
-            'message_template_python': 'Recursion error - cyclic reference detected',
-            'example_message_python': 'Recursion error - cyclic reference detected',
-            'example_context': None,
+            'type': 'cannot_validate_from_json',
+            'message_template_python': 'Cannot check `{method_name}` when validating from json, use a JsonOrPython validator instead',
+            'example_message_python': 'Cannot check `` when validating from json, use a JsonOrPython validator instead',
+            'example_context': {'method_name': ''},
         },
     ]
 

tests/validators/test_is_instance.py

@@ -19,8 +19,9 @@ class Spam:
 
 def test_validate_json() -> None:
     v = SchemaValidator({'type': 'is-instance', 'cls': Foo})
-    with pytest.raises(NotImplementedError, match='use a JsonOrPython validator instead'):
+    with pytest.raises(ValidationError) as exc_info:
         v.validate_json('"foo"')
+        assert exc_info.value.errors()[0]['type'] == 'cannot_validate_from_json'
 
 
 def test_is_instance():
@@ -175,11 +176,9 @@ def test_is_instance_json_type_before_validator():
     schema = core_schema.is_instance_schema(type)
     v = SchemaValidator(schema)
 
-    with pytest.raises(
-        NotImplementedError,
-        match='Cannot check isinstance when validating from json, use a JsonOrPython validator instead.',
-    ):
+    with pytest.raises(ValidationError) as exc_info:
         v.validate_json('null')
+        assert exc_info.value.errors()[0]['type'] == 'cannot_validate_from_json'
 
     # now wrap in a before validator
     def set_type_to_int(input: None) -> type:

tests/validators/test_is_subclass.py

@@ -77,3 +77,10 @@ def test_custom_repr():
             'ctx': {'class': 'Spam'},
         }
     ]
+
+
+def test_is_subclass_json() -> None:
+    v = SchemaValidator(core_schema.is_subclass_schema(Foo))
+    with pytest.raises(ValidationError) as exc_info:
+        v.validate_json("'Foo'")
+        assert exc_info.value.errors()[0]['type'] == 'cannot_validate_from_json'