innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #14859 -- ITSocialSecurityNumberField and ITVatNumberField didn't handle all EMPTY_VALUES gracefully. Also converted the Italias localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-12-18 20:31:49 +00:00
parent 58bc881990
commit f8caeefff1
4 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/localflavor/it/forms.py
View File

@ -50,8 +50,8 @@ class ITSocialSecurityNumberField(RegexField):
def clean(self, value): def clean(self, value):
value = super(ITSocialSecurityNumberField, self).clean(value) value = super(ITSocialSecurityNumberField, self).clean(value)
if value == u'': if value in EMPTY_VALUES:
return value return u''
value = re.sub('\s', u'', value).upper() value = re.sub('\s', u'', value).upper()
try: try:
check_digit = ssn_check_digit(value) check_digit = ssn_check_digit(value)
@ -71,8 +71,8 @@ class ITVatNumberField(Field):
def clean(self, value): def clean(self, value):
value = super(ITVatNumberField, self).clean(value) value = super(ITVatNumberField, self).clean(value)
if value == u'': if value in EMPTY_VALUES:
return value return u''
try: try:
vat_number = int(value) vat_number = int(value)
except ValueError: except ValueError:

118
tests/regressiontests/forms/localflavor/it.py
View File

@ -1,62 +1,70 @@
# -*- coding: utf-8 -*- from django.contrib.localflavor.it.forms import (ITZipCodeField, ITRegionSelect,
# Tests for the contrib/localflavor/ IT form fields. ITSocialSecurityNumberField, ITVatNumberField)
tests = r""" from utils import LocalFlavorTestCase
# ITZipCodeField #############################################################
>>> from django.contrib.localflavor.it.forms import ITZipCodeField
>>> f = ITZipCodeField()
>>> f.clean('00100')
u'00100'
>>> f.clean(' 00100')
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid zip code.']
# ITRegionSelect ############################################################# class ITLocalFlavorTests(LocalFlavorTestCase):
def test_ITRegionSelect(self):
f = ITRegionSelect()
out = u'''<select name="regions">
<option value="ABR">Abruzzo</option>
<option value="BAS">Basilicata</option>
<option value="CAL">Calabria</option>
<option value="CAM">Campania</option>
<option value="EMR">Emilia-Romagna</option>
<option value="FVG">Friuli-Venezia Giulia</option>
<option value="LAZ">Lazio</option>
<option value="LIG">Liguria</option>
<option value="LOM">Lombardia</option>
<option value="MAR">Marche</option>
<option value="MOL">Molise</option>
<option value="PMN" selected="selected">Piemonte</option>
<option value="PUG">Puglia</option>
<option value="SAR">Sardegna</option>
<option value="SIC">Sicilia</option>
<option value="TOS">Toscana</option>
<option value="TAA">Trentino-Alto Adige</option>
<option value="UMB">Umbria</option>
<option value="VAO">Valle d\u2019Aosta</option>
<option value="VEN">Veneto</option>
</select>'''
self.assertEqual(f.render('regions', 'PMN'), out)
>>> from django.contrib.localflavor.it.forms import ITRegionSelect def test_ITZipCodeField(self):
>>> w = ITRegionSelect() error_invalid = [u'Enter a valid zip code.']
>>> w.render('regions', 'PMN') valid = {
u'<select name="regions">\n<option value="ABR">Abruzzo</option>\n<option value="BAS">Basilicata</option>\n<option value="CAL">Calabria</option>\n<option value="CAM">Campania</option>\n<option value="EMR">Emilia-Romagna</option>\n<option value="FVG">Friuli-Venezia Giulia</option>\n<option value="LAZ">Lazio</option>\n<option value="LIG">Liguria</option>\n<option value="LOM">Lombardia</option>\n<option value="MAR">Marche</option>\n<option value="MOL">Molise</option>\n<option value="PMN" selected="selected">Piemonte</option>\n<option value="PUG">Puglia</option>\n<option value="SAR">Sardegna</option>\n<option value="SIC">Sicilia</option>\n<option value="TOS">Toscana</option>\n<option value="TAA">Trentino-Alto Adige</option>\n<option value="UMB">Umbria</option>\n<option value="VAO">Valle d\u2019Aosta</option>\n<option value="VEN">Veneto</option>\n</select>' '00100': '00100',
}
invalid = {
' 00100': error_invalid,
}
self.assertFieldOutput(ITZipCodeField, valid, invalid)
# ITSocialSecurityNumberField ################################################# def test_ITSocialSecurityNumberField(self):
error_invalid = [u'Enter a valid Social Security number.']
valid = {
'LVSGDU99T71H501L': 'LVSGDU99T71H501L',
'LBRRME11A01L736W': 'LBRRME11A01L736W',
'lbrrme11a01l736w': 'LBRRME11A01L736W',
'LBR RME 11A01 L736W': 'LBRRME11A01L736W',
}
invalid = {
'LBRRME11A01L736A': error_invalid,
'%BRRME11A01L736W': error_invalid,
}
self.assertFieldOutput(ITSocialSecurityNumberField, valid, invalid)
>>> from django.contrib.localflavor.it.forms import ITSocialSecurityNumberField def test_ITVatNumberField(self):
>>> f = ITSocialSecurityNumberField() error_invalid = [u'Enter a valid VAT number.']
>>> f.clean('LVSGDU99T71H501L') valid = {
u'LVSGDU99T71H501L' '07973780013': '07973780013',
>>> f.clean('LBRRME11A01L736W') '7973780013': '07973780013',
u'LBRRME11A01L736W' 7973780013: '07973780013',
>>> f.clean('lbrrme11a01l736w') }
u'LBRRME11A01L736W' invalid = {
>>> f.clean('LBR RME 11A01 L736W') '07973780014': error_invalid,
u'LBRRME11A01L736W' 'A7973780013': error_invalid,
>>> f.clean('LBRRME11A01L736A') }
Traceback (most recent call last): self.assertFieldOutput(ITVatNumberField, valid, invalid)
...
ValidationError: [u'Enter a valid Social Security number.']
>>> f.clean('%BRRME11A01L736W')
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid Social Security number.']
# ITVatNumberField ###########################################################
>>> from django.contrib.localflavor.it.forms import ITVatNumberField
>>> f = ITVatNumberField()
>>> f.clean('07973780013')
u'07973780013'
>>> f.clean('7973780013')
u'07973780013'
>>> f.clean(7973780013)
u'07973780013'
>>> f.clean('07973780014')
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid VAT number.']
>>> f.clean('A7973780013')
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid VAT number.']
"""

3
tests/regressiontests/forms/localflavortests.py
View File

@ -1,6 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from localflavor.cz import tests as localflavor_cz_tests from localflavor.cz import tests as localflavor_cz_tests
from localflavor.it import tests as localflavor_it_tests
from localflavor.jp import tests as localflavor_jp_tests from localflavor.jp import tests as localflavor_jp_tests
from localflavor.kw import tests as localflavor_kw_tests from localflavor.kw import tests as localflavor_kw_tests
from localflavor.nl import tests as localflavor_nl_tests from localflavor.nl import tests as localflavor_nl_tests
@ -31,12 +30,12 @@ from localflavor.id import IDLocalFlavorTests
from localflavor.ie import IELocalFlavorTests from localflavor.ie import IELocalFlavorTests
from localflavor.il import ILLocalFlavorTests from localflavor.il import ILLocalFlavorTests
from localflavor.is_ import ISLocalFlavorTests from localflavor.is_ import ISLocalFlavorTests
from localflavor.it import ITLocalFlavorTests
from localflavor.tr import TRLocalFlavorTests from localflavor.tr import TRLocalFlavorTests
__test__ = { __test__ = {
'localflavor_cz_tests': localflavor_cz_tests, 'localflavor_cz_tests': localflavor_cz_tests,
'localflavor_it_tests': localflavor_it_tests,
'localflavor_jp_tests': localflavor_jp_tests, 'localflavor_jp_tests': localflavor_jp_tests,
'localflavor_kw_tests': localflavor_kw_tests, 'localflavor_kw_tests': localflavor_kw_tests,
'localflavor_nl_tests': localflavor_nl_tests, 'localflavor_nl_tests': localflavor_nl_tests,

1
tests/regressiontests/forms/tests/__init__.py
View File

@ -30,5 +30,6 @@ from regressiontests.forms.localflavortests import (
IELocalFlavorTests, IELocalFlavorTests,
ILLocalFlavorTests, ILLocalFlavorTests,
ISLocalFlavorTests, ISLocalFlavorTests,
ITLocalFlavorTests,
TRLocalFlavorTests, TRLocalFlavorTests,
) )