diff --git a/tests/regressiontests/forms/localflavor/id.py b/tests/regressiontests/forms/localflavor/id.py
index 9098b9d6c0..cb346ef721 100644
--- a/tests/regressiontests/forms/localflavor/id.py
+++ b/tests/regressiontests/forms/localflavor/id.py
@@ -1,175 +1,181 @@
-# -*- coding: utf-8 -*-
-# Tests for the contrib/localflavor/ ID form fields.
+from django.contrib.localflavor.id.forms import (IDPhoneNumberField,
+ IDPostCodeField, IDNationalIdentityNumberField, IDLicensePlateField,
+ IDProvinceSelect, IDLicensePlatePrefixSelect)
-tests = r"""
+from utils import LocalFlavorTestCase
-# IDPhoneNumberField ########################################################
->>> from django.contrib.localflavor.id.forms import IDPhoneNumberField
->>> f = IDPhoneNumberField(required=False)
->>> f.clean('')
-u''
->>> f.clean('0812-3456789')
-u'0812-3456789'
->>> f.clean('081234567890')
-u'081234567890'
->>> f.clean('021 345 6789')
-u'021 345 6789'
->>> f.clean('0213456789')
-u'0213456789'
->>> f.clean('0123456789')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
->>> f.clean('+62-21-3456789')
-u'+62-21-3456789'
->>> f.clean('+62-021-3456789')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
->>> f.clean('(021) 345 6789')
-u'(021) 345 6789'
->>> f.clean('+62-021-3456789')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
->>> f.clean('+62-0812-3456789')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
->>> f.clean('0812345678901')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
+class IDLocalFlavorTests(LocalFlavorTestCase):
+ def test_IDProvinceSelect(self):
+ f = IDProvinceSelect()
+ out = u''''''
+ self.assertEqual(f.render('provinces', 'LPG'), out)
-# IDPostCodeField ############################################################
+ def test_IDLicensePlatePrefixSelect(self):
+ f = IDLicensePlatePrefixSelect()
+ out = u''''''
+ self.assertEqual(f.render('codes', 'BE'), out)
->>> from django.contrib.localflavor.id.forms import IDPostCodeField
->>> f = IDPostCodeField(required=False)
->>> f.clean('')
-u''
->>> f.clean('12340')
-u'12340'
->>> f.clean('25412')
-u'25412'
->>> f.clean(' 12340 ')
-u'12340'
->>> f.clean('12 3 4 0')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid post code']
->>> f.clean('12345')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid post code']
->>> f.clean('10100')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid post code']
->>> f.clean('123456')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid post code']
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid post code']
+ def test_IDPhoneNumberField(self):
+ error_invalid = [u'Enter a valid phone number']
+ valid = {
+ '0812-3456789': u'0812-3456789',
+ '081234567890': u'081234567890',
+ '021 345 6789': u'021 345 6789',
+ '0213456789': u'0213456789',
+ '+62-21-3456789': u'+62-21-3456789',
+ '(021) 345 6789': u'(021) 345 6789',
+ }
+ invalid = {
+ '0123456789': error_invalid,
+ '+62-021-3456789': error_invalid,
+ '+62-021-3456789': error_invalid,
+ '+62-0812-3456789': error_invalid,
+ '0812345678901': error_invalid,
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(IDPhoneNumberField, valid, invalid)
-# IDNationalIdentityNumberField #########################################################
+ def test_IDPostCodeField(self):
+ error_invalid = [u'Enter a valid post code']
+ valid = {
+ '12340': u'12340',
+ '25412': u'25412',
+ ' 12340 ': u'12340',
+ }
+ invalid = {
+ '12 3 4 0': error_invalid,
+ '12345': error_invalid,
+ '10100': error_invalid,
+ '123456': error_invalid,
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(IDPostCodeField, valid, invalid)
->>> from django.contrib.localflavor.id.forms import IDNationalIdentityNumberField
->>> f = IDNationalIdentityNumberField(required=False)
->>> f.clean('')
-u''
->>> f.clean(' 12.3456.010178 3456 ')
-u'12.3456.010178.3456'
->>> f.clean('1234560101783456')
-u'12.3456.010178.3456'
->>> f.clean('12.3456.010101.3456')
-u'12.3456.010101.3456'
->>> f.clean('12.3456.310278.3456')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid NIK/KTP number']
->>> f.clean('00.0000.010101.0000')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid NIK/KTP number']
->>> f.clean('1234567890123456')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid NIK/KTP number']
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid NIK/KTP number']
+ def test_IDNationalIdentityNumberField(self):
+ error_invalid = [u'Enter a valid NIK/KTP number']
+ valid = {
+ ' 12.3456.010178 3456 ': u'12.3456.010178.3456',
+ '1234560101783456': u'12.3456.010178.3456',
+ '12.3456.010101.3456': u'12.3456.010101.3456',
+ }
+ invalid = {
+ '12.3456.310278.3456': error_invalid,
+ '00.0000.010101.0000': error_invalid,
+ '1234567890123456': error_invalid,
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(IDNationalIdentityNumberField, valid, invalid)
-# IDProvinceSelect ##########################################################
-
->>> from django.contrib.localflavor.id.forms import IDProvinceSelect
->>> s = IDProvinceSelect()
->>> s.render('provinces', 'LPG')
-u''
-
-# IDLicensePlatePrefixelect ########################################################################
-
->>> from django.contrib.localflavor.id.forms import IDLicensePlatePrefixSelect
->>> s = IDLicensePlatePrefixSelect()
->>> s.render('codes', 'BE')
-u''
-
-# IDLicensePlateField #######################################################################
-
->>> from django.contrib.localflavor.id.forms import IDLicensePlateField
->>> f = IDLicensePlateField(required=False)
->>> f.clean('')
-u''
->>> f.clean(' b 1234 ab ')
-u'B 1234 AB'
->>> f.clean('B 1234 ABC')
-u'B 1234 ABC'
->>> f.clean('A 12')
-u'A 12'
->>> f.clean('DK 12345 12')
-u'DK 12345 12'
->>> f.clean('RI 10')
-u'RI 10'
->>> f.clean('CD 12 12')
-u'CD 12 12'
->>> f.clean('CD 10 12')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('CD 1234 12')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('RI 10 AB')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('B 12345 01')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('N 1234 12')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('A 12 XYZ')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('Q 1234 AB')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid vehicle license plate number']
-"""
\ No newline at end of file
+ def test_IDLicensePlateField(self):
+ error_invalid = [u'Enter a valid vehicle license plate number']
+ valid = {
+ ' b 1234 ab ': u'B 1234 AB',
+ 'B 1234 ABC': u'B 1234 ABC',
+ 'A 12': u'A 12',
+ 'DK 12345 12': u'DK 12345 12',
+ 'RI 10': u'RI 10',
+ 'CD 12 12': u'CD 12 12',
+ }
+ invalid = {
+ 'CD 10 12': error_invalid,
+ 'CD 1234 12': error_invalid,
+ 'RI 10 AB': error_invalid,
+ 'B 12345 01': error_invalid,
+ 'N 1234 12': error_invalid,
+ 'A 12 XYZ': error_invalid,
+ 'Q 1234 AB': error_invalid,
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(IDLicensePlateField, valid, invalid)
diff --git a/tests/regressiontests/forms/localflavortests.py b/tests/regressiontests/forms/localflavortests.py
index f41aff7b30..06d0e8d34a 100644
--- a/tests/regressiontests/forms/localflavortests.py
+++ b/tests/regressiontests/forms/localflavortests.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from localflavor.cz import tests as localflavor_cz_tests
-from localflavor.id import tests as localflavor_id_tests
from localflavor.ie import tests as localflavor_ie_tests
from localflavor.is_ import tests as localflavor_is_tests
from localflavor.it import tests as localflavor_it_tests
@@ -30,11 +29,11 @@ from localflavor.es import ESLocalFlavorTests
from localflavor.fi import FILocalFlavorTests
from localflavor.fr import FRLocalFlavorTests
from localflavor.generic import GenericLocalFlavorTests
+from localflavor.id import IDLocalFlavorTests
__test__ = {
'localflavor_cz_tests': localflavor_cz_tests,
- 'localflavor_id_tests': localflavor_id_tests,
'localflavor_ie_tests': localflavor_ie_tests,
'localflavor_is_tests': localflavor_is_tests,
'localflavor_it_tests': localflavor_it_tests,
diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py
index 92e2a7bb17..8120460e1f 100644
--- a/tests/regressiontests/forms/tests/__init__.py
+++ b/tests/regressiontests/forms/tests/__init__.py
@@ -25,4 +25,5 @@ from regressiontests.forms.localflavortests import (
FILocalFlavorTests,
FRLocalFlavorTests,
GenericLocalFlavorTests,
+ IDLocalFlavorTests,
)