summaryrefslogtreecommitdiff
path: root/tests/regressiontests/test_utils
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-08-23 02:32:37 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-08-23 02:32:37 +0000
commit2664fa189614a4dbbfed5cb683148707ab568f47 (patch)
tree31a4924654e21d30b6b9f8cbc026c6771f1a79e6 /tests/regressiontests/test_utils
parent46ef2983ba0434ee9c71385bc709b70a64b35060 (diff)
Fixed #15838 -- Promoted assertFieldOutput to a general test utility. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/test_utils')
-rw-r--r--tests/regressiontests/test_utils/tests.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/regressiontests/test_utils/tests.py b/tests/regressiontests/test_utils/tests.py
index 6d4ab02247..942aa85148 100644
--- a/tests/regressiontests/test_utils/tests.py
+++ b/tests/regressiontests/test_utils/tests.py
@@ -1,5 +1,6 @@
from __future__ import with_statement
+from django.forms import EmailField
from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
from django.utils.unittest import skip
@@ -139,6 +140,16 @@ class AssertRaisesMsgTest(SimpleTestCase):
self.assertRaisesMessage(ValueError, "[.*x+]y?", func1)
+class AssertFieldOutputTests(SimpleTestCase):
+
+ def test_assert_field_output(self):
+ error_invalid = [u'Enter a valid e-mail address.']
+ self.assertFieldOutput(EmailField, {'a@a.com': 'a@a.com'}, {'aaa': error_invalid})
+ self.assertRaises(AssertionError, self.assertFieldOutput, EmailField, {'a@a.com': 'a@a.com'}, {'aaa': error_invalid + [u'Another error']})
+ self.assertRaises(AssertionError, self.assertFieldOutput, EmailField, {'a@a.com': 'Wrong output'}, {'aaa': error_invalid})
+ self.assertRaises(AssertionError, self.assertFieldOutput, EmailField, {'a@a.com': 'a@a.com'}, {'aaa': [u'Come on, gimme some well formatted data, dude.']})
+
+
__test__ = {"API_TEST": r"""
# Some checks of the doctest output normalizer.
# Standard doctests do fairly