mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-07 11:19:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/model-validation] Added tests for ComplexValidators

Browse Source 
Also the tests for validators can now verify other exceptions and not
just ValidationError

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Honza Král 2009-06-08 00:56:01 +00:00
parent 8a5e9f6939
commit 9dee3b26e5
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,13 @@
from unittest import TestCase
from django.core.exceptions import ValidationError
from django.core.validators import validate_integer, validate_email
from django.core.validators import validate_integer, validate_email, RequiredIfOtherFieldBlank
class TestSimpleValidators(TestCase):
pass
SIMPLE_VALIDATORS_VALUES = (
# (validator, value, expected),
(validate_integer, '42', None),
(validate_integer, '-42', None),
(validate_integer, -42, None),
@ -23,7 +24,7 @@ SIMPLE_VALIDATORS_VALUES = (
)
def get_simple_test_func(validator, expected, value, num):
if isinstance(expected, type) and issubclass(expected, ValidationError):
if isinstance(expected, type) and issubclass(expected, Exception):
test_mask = 'test_%s_raises_error_%d'
def test_func(self):
self.assertRaises(expected, validator, value)
@ -38,3 +39,33 @@ test_counter = {}
for validator, value, expected in SIMPLE_VALIDATORS_VALUES:
num = test_counter[validator] = test_counter.setdefault(validator, 0) + 1
setattr(TestSimpleValidators, *get_simple_test_func(validator, expected, value, num))
class TestComplexValidators(TestCase):
pass
COMPLEX_VALIDATORS_VALUES = (
#(validator, value, all_values, obj, expected),
(RequiredIfOtherFieldBlank('other'), 'given', {'other': 'given'}, None, None),
(RequiredIfOtherFieldBlank('other'), '', {'other': 'given'}, None, None),
(RequiredIfOtherFieldBlank('other'), 'given', {}, None, AssertionError),
(RequiredIfOtherFieldBlank('other'), '', {}, None, AssertionError),
(RequiredIfOtherFieldBlank('other'), '', {'other': ''}, None, ValidationError),
)
def get_complex_test_func(validator, expected, value, all_values, obj, num):
if isinstance(expected, type) and issubclass(expected, Exception):
test_mask = 'test_%s_raises_error_%d'
def test_func(self):
self.assertRaises(expected, validator, value, all_values=all_values, obj=obj)
else:
test_mask = 'test_%s_%d'
def test_func(self):
self.assertEqual(expected, validator(value, all_values=all_values, obj=obj))
test_name = test_mask % (validator.__class__.__name__, num)
return test_name, test_func
test_counter = {}
for validator, value, all_values, obj, expected in COMPLEX_VALIDATORS_VALUES:
num = test_counter[validator.__class__.__name__] = test_counter.setdefault(validator.__class__.__name__, 0) + 1
setattr(TestComplexValidators, *get_complex_test_func(validator, expected, value, all_values, obj, num))