Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Converted Dutch localflavor doctests to unittests. We have always bee…

…n at war with doctests. Thanks to Idan Gazit.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 187a11e1f14ed655c98ad94699ccfb314f6690ea 1 parent 79ea397
@alex alex authored
View
134 tests/regressiontests/forms/localflavor/nl.py
@@ -1,72 +1,62 @@
-# -*- coding: utf-8 -*-
-# Tests for the contrib/localflavor/ NL form fields.
-
-tests = r"""
-# NLPhoneNumberField ########################################################
-
->>> from django.contrib.localflavor.nl.forms import NLPhoneNumberField
->>> f = NLPhoneNumberField(required=False)
->>> f.clean('')
-u''
->>> f.clean('012-3456789')
-'012-3456789'
->>> f.clean('0123456789')
-'0123456789'
->>> f.clean('+31-12-3456789')
-'+31-12-3456789'
->>> f.clean('(0123) 456789')
-'(0123) 456789'
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid phone number']
-
-# NLZipCodeField ############################################################
-
->>> from django.contrib.localflavor.nl.forms import NLZipCodeField
->>> f = NLZipCodeField(required=False)
->>> f.clean('')
-u''
->>> f.clean('1234ab')
-u'1234 AB'
->>> f.clean('1234 ab')
-u'1234 AB'
->>> f.clean('1234 AB')
-u'1234 AB'
->>> f.clean('0123AB')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid postal code']
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid postal code']
-
-# NLSoFiNumberField #########################################################
-
->>> from django.contrib.localflavor.nl.forms import NLSoFiNumberField
->>> f = NLSoFiNumberField(required=False)
->>> f.clean('')
-u''
->>> f.clean('123456782')
-'123456782'
->>> f.clean('000000000')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid SoFi number']
->>> f.clean('123456789')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid SoFi number']
->>> f.clean('foo')
-Traceback (most recent call last):
- ...
-ValidationError: [u'Enter a valid SoFi number']
-
-# NLProvinceSelect ##########################################################
-
->>> from django.contrib.localflavor.nl.forms import NLProvinceSelect
->>> s = NLProvinceSelect()
->>> s.render('provinces', 'OV')
-u'<select name="provinces">\n<option value="DR">Drenthe</option>\n<option value="FL">Flevoland</option>\n<option value="FR">Friesland</option>\n<option value="GL">Gelderland</option>\n<option value="GR">Groningen</option>\n<option value="LB">Limburg</option>\n<option value="NB">Noord-Brabant</option>\n<option value="NH">Noord-Holland</option>\n<option value="OV" selected="selected">Overijssel</option>\n<option value="UT">Utrecht</option>\n<option value="ZE">Zeeland</option>\n<option value="ZH">Zuid-Holland</option>\n</select>'
-"""
+from django.contrib.localflavor.nl.forms import (NLPhoneNumberField,
+ NLZipCodeField, NLSoFiNumberField, NLProvinceSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class NLLocalFlavorTests(LocalFlavorTestCase):
+ def test_NLProvinceSelect(self):
+ f = NLProvinceSelect()
+ out = u'''<select name="provinces">
+<option value="DR">Drenthe</option>
+<option value="FL">Flevoland</option>
+<option value="FR">Friesland</option>
+<option value="GL">Gelderland</option>
+<option value="GR">Groningen</option>
+<option value="LB">Limburg</option>
+<option value="NB">Noord-Brabant</option>
+<option value="NH">Noord-Holland</option>
+<option value="OV" selected="selected">Overijssel</option>
+<option value="UT">Utrecht</option>
+<option value="ZE">Zeeland</option>
+<option value="ZH">Zuid-Holland</option>
+</select>'''
+ self.assertEqual(f.render('provinces', 'OV'), out)
+
+ def test_NLPhoneNumberField(self):
+ error_invalid = [u'Enter a valid phone number']
+ valid = {
+ '012-3456789': '012-3456789',
+ '0123456789': '0123456789',
+ '+31-12-3456789': '+31-12-3456789',
+ '(0123) 456789': '(0123) 456789',
+ }
+ invalid = {
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(NLPhoneNumberField, valid, invalid)
+
+ def test_NLZipCodeField(self):
+ error_invalid = [u'Enter a valid postal code']
+ valid = {
+ '1234ab': '1234 AB',
+ '1234 ab': '1234 AB',
+ '1234 AB': '1234 AB',
+ }
+ invalid = {
+ '0123AB': error_invalid,
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(NLZipCodeField, valid, invalid)
+
+ def test_NLSoFiNumberField(self):
+ error_invalid = [u'Enter a valid SoFi number']
+ valid = {
+ '123456782': '123456782',
+ }
+ invalid = {
+ '000000000': error_invalid,
+ '123456789': error_invalid,
+ 'foo': error_invalid,
+ }
+ self.assertFieldOutput(NLSoFiNumberField, valid, invalid)
View
3  tests/regressiontests/forms/localflavortests.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from localflavor.cz import tests as localflavor_cz_tests
-from localflavor.nl import tests as localflavor_nl_tests
from localflavor.pl import tests as localflavor_pl_tests
from localflavor.pt import tests as localflavor_pt_tests
from localflavor.ro import tests as localflavor_ro_tests
@@ -31,12 +30,12 @@
from localflavor.it import ITLocalFlavorTests
from localflavor.jp import JPLocalFlavorTests
from localflavor.kw import KWLocalFlavorTests
+from localflavor.nl import NLLocalFlavorTests
from localflavor.tr import TRLocalFlavorTests
__test__ = {
'localflavor_cz_tests': localflavor_cz_tests,
- 'localflavor_nl_tests': localflavor_nl_tests,
'localflavor_pl_tests': localflavor_pl_tests,
'localflavor_pt_tests': localflavor_pt_tests,
'localflavor_ro_tests': localflavor_ro_tests,
View
1  tests/regressiontests/forms/tests/__init__.py
@@ -33,5 +33,6 @@
ITLocalFlavorTests,
JPLocalFlavorTests,
KWLocalFlavorTests,
+ NLLocalFlavorTests,
TRLocalFlavorTests,
)
Please sign in to comment.
Something went wrong with that request. Please try again.