p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved assertion error messages in validators tests

This commit is contained in:
Claude Paroz 2012-10-09 13:34:03 +02:00
parent 9a2bceed1a
commit a8f888feb4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/modeltests/validators/tests.py
View File

@ -162,11 +162,23 @@ def create_simple_test_method(validator, expected, value, num):
if expected is not None and issubclass(expected, Exception): if expected is not None and issubclass(expected, Exception):
test_mask = 'test_%s_raises_error_%d' test_mask = 'test_%s_raises_error_%d'
def test_func(self): def test_func(self):
self.assertRaises(expected, validator, value) # assertRaises not used, so as to be able to produce an error message
# containing the tested value
try:
validator(value)
except expected:
pass
else:
self.fail("%s not raised when validating '%s'" % (
expected.__name__, value))
else: else:
test_mask = 'test_%s_%d' test_mask = 'test_%s_%d'
def test_func(self): def test_func(self):
self.assertEqual(expected, validator(value)) try:
self.assertEqual(expected, validator(value))
except ValidationError as e:
self.fail("Validation of '%s' failed. Error message was: %s" % (
value, str(e)))
if isinstance(validator, types.FunctionType): if isinstance(validator, types.FunctionType):
val_name = validator.__name__ val_name = validator.__name__
else: else: