Author: Alex
Date: 2010-12-18 16:14:30 -0600 (Sat, 18 Dec 2010)
New Revision: 14971

Modified:
   django/branches/releases/1.2.X/tests/regressiontests/forms/localflavor/kw.py
   
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavortests.py
   django/branches/releases/1.2.X/tests/regressiontests/forms/tests/__init__.py
Log:
[1.2.X] Converted Kuwaiti localflavor doctests to unittests.  We have always 
been at war with doctests.  Thanks to Idan Gazit.  Backport of [14947].

Modified: 
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavor/kw.py
===================================================================
--- 
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavor/kw.py    
    2010-12-18 22:14:20 UTC (rev 14970)
+++ 
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavor/kw.py    
    2010-12-18 22:14:30 UTC (rev 14971)
@@ -1,15 +1,16 @@
-# -*- coding: utf-8 -*-
-# Tests for the contrib/localflavor/ KW form fields.
+from django.contrib.localflavor.kw.forms import KWCivilIDNumberField
 
-tests = r"""
-# KWCivilIDNumberField ########################################################
+from utils import LocalFlavorTestCase
 
->>> from django.contrib.localflavor.kw.forms import KWCivilIDNumberField
->>> f = KWCivilIDNumberField()
->>> f.clean('282040701483')
-'282040701483'
->>> f.clean('289332013455')
-Traceback (most recent call last):
-...
-ValidationError: [u'Enter a valid Kuwaiti Civil ID number']
-"""
+
+class KWLocalFlavorTests(LocalFlavorTestCase):
+    def test_KWCivilIDNumberField(self):
+        error_invalid = [u'Enter a valid Kuwaiti Civil ID number']
+        valid = {
+            '282040701483': '282040701483',
+        }
+        invalid = {
+            '289332013455': error_invalid,
+        }
+        self.assertFieldOutput(KWCivilIDNumberField, valid, invalid)
+

Modified: 
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavortests.py
===================================================================
--- 
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavortests.py  
    2010-12-18 22:14:20 UTC (rev 14970)
+++ 
django/branches/releases/1.2.X/tests/regressiontests/forms/localflavortests.py  
    2010-12-18 22:14:30 UTC (rev 14971)
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from localflavor.cz import tests as localflavor_cz_tests
-from localflavor.kw import tests as localflavor_kw_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
@@ -30,11 +29,11 @@
 from localflavor.is_ import ISLocalFlavorTests
 from localflavor.it import ITLocalFlavorTests
 from localflavor.jp import JPLocalFlavorTests
+from localflavor.kw import KWLocalFlavorTests
 
 
 __test__ = {
     'localflavor_cz_tests': localflavor_cz_tests,
-    'localflavor_kw_tests': localflavor_kw_tests,
     'localflavor_nl_tests': localflavor_nl_tests,
     'localflavor_pl_tests': localflavor_pl_tests,
     'localflavor_pt_tests': localflavor_pt_tests,

Modified: 
django/branches/releases/1.2.X/tests/regressiontests/forms/tests/__init__.py
===================================================================
--- 
django/branches/releases/1.2.X/tests/regressiontests/forms/tests/__init__.py    
    2010-12-18 22:14:20 UTC (rev 14970)
+++ 
django/branches/releases/1.2.X/tests/regressiontests/forms/tests/__init__.py    
    2010-12-18 22:14:30 UTC (rev 14971)
@@ -30,4 +30,5 @@
     ISLocalFlavorTests,
     ITLocalFlavorTests,
     JPLocalFlavorTests,
+    KWLocalFlavorTests,
 )

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to