Fix tests

openapi/data/fields.py

@@ -325,7 +325,7 @@ def __init__(self, choices):
 
     def __call__(self, field: Field, value: Any, data=None):
         if value not in self.choices:
-            raise ValidationError(name, "%s not valid" % value)
+            raise ValidationError(field.name, "%s not valid" % value)
         return value
 
 
@@ -383,9 +383,13 @@ def __init__(self, min_value=None, max_value=None):
 
     def __call__(self, field: Field, value: Any, data=None):
         if self.min_value is not None and value < self.min_value:
-            raise ValidationError(field.name, "%s less than %s" % (value, self.min_value))
+            raise ValidationError(
+                field.name, "%s less than %s" % (value, self.min_value)
+            )
         if self.max_value is not None and value > self.max_value:
-            raise ValidationError(field.name, "%s greater than %s" % (value, self.max_value))
+            raise ValidationError(
+                field.name, "%s greater than %s" % (value, self.max_value)
+            )
         return value
 
     def dump(self, value):

openapi/data/validate.py

@@ -11,7 +11,7 @@
     VALIDATOR,
     ValidationError,
     as_field,
-    field_ops
+    field_ops,
 )
 
 NOT_VALID_TYPE = "not valid type"

tests/data/test_fields.py

@@ -100,16 +100,16 @@ def test_UUIDValidator_dump():
 def test_EnumValidator_call_valid():
     field = enum_field(FakeEnum)
     validator = field.metadata.get(VALIDATOR)
-    assert validator(field.name, "VALUE_A") == FakeEnum.VALUE_A.name
+    assert validator(field, "VALUE_A") == FakeEnum.VALUE_A.name
 
 
 def test_EnumValidator_call_invalid():
     field = enum_field(FakeEnum)
     validator = field.metadata.get(VALIDATOR)
     with pytest.raises(ValidationError):
-        validator(field.name, "VALUE_D")
+        validator(field, "VALUE_D")
     with pytest.raises(ValidationError):
-        validator(field.name, 1)
+        validator(field, 1)
 
 
 def test_enum_validator_dump():
@@ -121,14 +121,14 @@ def test_enum_validator_dump():
 def test_Choice_call_valid():
     field = data_field()
     validator = Choice(["a", "b", "c"])
-    assert validator(field.name, "a") == "a"
+    assert validator(field, "a") == "a"
 
 
 def test_Choice_call_invalid():
     field = data_field()
     validator = Choice(["a", "b", "c"])
     with pytest.raises(ValidationError):
-        validator(field.name, "d")
+        validator(field, "d")
 
 
 def test_DateTimeValidator_call_valid():

tests/example/models.py

@@ -115,10 +115,11 @@ class Foo:
 @dataclass
 class SourcePrice:
     """An object containing prices for a single contract"""
+
     id: int = fields.integer_field(description="ID", required=True)
     prices: Dict[str, Decimal] = fields.data_field(
         description="source-price mapping",
         items=fields.decimal_field(
             min_value=0, max_value=100, precision=4, description="price",
-        )
+        ),
     )