From b734e3514e41af3e227db3fbef677fd77868f4ec Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 12 Dec 2010 04:37:01 +0000 Subject: [1.2.X] Fixed #14499 -- ATSocialSecurityNumberField now responds to all EMPTY_VALUES correctly. Also converted Austrian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch. Backport of [14873]. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14875 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/forms/localflavor/at.py | 125 +++++++++--------------- tests/regressiontests/forms/localflavortests.py | 6 +- tests/regressiontests/forms/tests/__init__.py | 7 +- 3 files changed, 52 insertions(+), 86 deletions(-) (limited to 'tests') diff --git a/tests/regressiontests/forms/localflavor/at.py b/tests/regressiontests/forms/localflavor/at.py index 54ca46898e..3fa50ac4df 100644 --- a/tests/regressiontests/forms/localflavor/at.py +++ b/tests/regressiontests/forms/localflavor/at.py @@ -1,80 +1,45 @@ -# -*- coding: utf-8 -*- -# Tests for the contrib/localflavor/ AT form fields. - -tests = r""" -# ATZipCodeField ########################################################### - ->>> from django.contrib.localflavor.at.forms import ATZipCodeField ->>> f = ATZipCodeField() ->>> f.clean('1150') -u'1150' ->>> f.clean('4020') -u'4020' ->>> f.clean('8020') -u'8020' ->>> f.clean('111222') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXX.'] ->>> f.clean('eeffee') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXX.'] ->>> f.clean(u'') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - - ->>> f = ATZipCodeField(required=False) ->>> f.clean('1150') -u'1150' ->>> f.clean('4020') -u'4020' ->>> f.clean('8020') -u'8020' ->>> f.clean('111222') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXX.'] ->>> f.clean('eeffee') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXX.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' ->>> f.clean(u'') -u'' - -# ATStateSelect ################################################################## - ->>> from django.contrib.localflavor.at.forms import ATStateSelect ->>> f = ATStateSelect() ->>> f.render('bundesland', 'WI') -u'' - -# ATSocialSecurityNumberField ################################################ - ->>> from django.contrib.localflavor.at.forms import ATSocialSecurityNumberField ->>> f = ATSocialSecurityNumberField() ->>> f.clean('1237 010180') -u'1237 010180' ->>> f.clean('1237 010181') -Traceback (most recent call last): -... -ValidationError: [u'Enter a valid Austrian Social Security Number in XXXX XXXXXX format.'] ->>> f.clean('12370 010180') -Traceback (most recent call last): -... -ValidationError: [u'Enter a valid Austrian Social Security Number in XXXX XXXXXX format.'] -""" +from django.contrib.localflavor.at.forms import (ATZipCodeField, ATStateSelect, + ATSocialSecurityNumberField) + +from utils import LocalFlavorTestCase + + +class ATLocalFlavorTests(LocalFlavorTestCase): + def test_ATStateSelect(self): + f = ATStateSelect() + out = u'''''' + self.assertEqual(f.render('bundesland', 'WI'), out) + + def test_ATZipCodeField(self): + error_format = [u'Enter a zip code in the format XXXX.'] + valid = { + '1150': '1150', + '4020': '4020', + '8020': '8020', + } + invalid = { + '111222': error_format, + 'eeffee': error_format, + } + self.assertFieldOutput(ATZipCodeField, valid, invalid) + + def test_ATSocialSecurityNumberField(self): + error_format = [u'Enter a valid Austrian Social Security Number in XXXX XXXXXX format.'] + valid = { + '1237 010180': '1237 010180', + } + invalid = { + '1237 010181': error_format, + '12370 010180': error_format, + } + self.assertFieldOutput(ATSocialSecurityNumberField, valid, invalid) diff --git a/tests/regressiontests/forms/localflavortests.py b/tests/regressiontests/forms/localflavortests.py index 7087cf0eb8..d683bb3bfa 100644 --- a/tests/regressiontests/forms/localflavortests.py +++ b/tests/regressiontests/forms/localflavortests.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from localflavor.at import tests as localflavor_at_tests from localflavor.au import tests as localflavor_au_tests from localflavor.br import tests as localflavor_br_tests from localflavor.ca import tests as localflavor_ca_tests @@ -28,14 +27,11 @@ from localflavor.uy import tests as localflavor_uy_tests from localflavor.za import tests as localflavor_za_tests from localflavor.ar import ARLocalFlavorTests +from localflavor.at import ATLocalFlavorTests from localflavor.de import DELocalFlavorTests -from localflavor.be import BELocalFlavorTests -from localflavor.il import ILLocalFlavorTests -from localflavor.tr import TRLocalFlavorTests __test__ = { - 'localflavor_at_tests': localflavor_at_tests, 'localflavor_au_tests': localflavor_au_tests, 'localflavor_br_tests': localflavor_br_tests, 'localflavor_ca_tests': localflavor_ca_tests, diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py index ca36adc58d..55c1e89ccc 100644 --- a/tests/regressiontests/forms/tests/__init__.py +++ b/tests/regressiontests/forms/tests/__init__.py @@ -11,4 +11,9 @@ from util import * from validators import TestFieldWithValidators from widgets import * -from regressiontests.forms.localflavortests import __test__, DELocalFlavorTests +from regressiontests.forms.localflavortests import ( + __test__, + ARLocalFlavorTests, + ATLocalFlavorTests, + DELocalFlavorTests, +) -- cgit v1.3