From b5ac6956a626e9a057628e6205547d070ca03f02 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sat, 18 Dec 2010 20:31:10 +0000
Subject: [PATCH] Converted Irish localflavor doctests to unittests. We have
always been at war with doctests. Thanks to Idan Gazit.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
tests/regressiontests/forms/localflavor/ie.py | 49 +++++++++++++++----
.../regressiontests/forms/localflavortests.py | 3 +-
tests/regressiontests/forms/tests/__init__.py | 1 +
3 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/tests/regressiontests/forms/localflavor/ie.py b/tests/regressiontests/forms/localflavor/ie.py
index 540281c19e..fab519bfe9 100644
--- a/tests/regressiontests/forms/localflavor/ie.py
+++ b/tests/regressiontests/forms/localflavor/ie.py
@@ -1,12 +1,43 @@
-# -*- coding: utf-8 -*-
-# Tests for the contrib/localflavor/ie form fields.
+from django.contrib.localflavor.ie.forms import IECountySelect
-tests = r"""
-# IECountySelect #########################################################
+from utils import LocalFlavorTestCase
->>> from django.contrib.localflavor.ie.forms import IECountySelect
->>> f = IECountySelect()
->>> f.render('counties', 'dublin')
-u'<select name="counties">\n<option value="antrim">Antrim</option>\n<option value="armagh">Armagh</option>\n<option value="carlow">Carlow</option>\n<option value="cavan">Cavan</option>\n<option value="clare">Clare</option>\n<option value="cork">Cork</option>\n<option value="derry">Derry</option>\n<option value="donegal">Donegal</option>\n<option value="down">Down</option>\n<option value="dublin" selected="selected">Dublin</option>\n<option value="fermanagh">Fermanagh</option>\n<option value="galway">Galway</option>\n<option value="kerry">Kerry</option>\n<option value="kildare">Kildare</option>\n<option value="kilkenny">Kilkenny</option>\n<option value="laois">Laois</option>\n<option value="leitrim">Leitrim</option>\n<option value="limerick">Limerick</option>\n<option value="longford">Longford</option>\n<option value="louth">Louth</option>\n<option value="mayo">Mayo</option>\n<option value="meath">Meath</option>\n<option value="monaghan">Monaghan</option>\n<option value="offaly">Offaly</option>\n<option value="roscommon">Roscommon</option>\n<option value="sligo">Sligo</option>\n<option value="tipperary">Tipperary</option>\n<option value="tyrone">Tyrone</option>\n<option value="waterford">Waterford</option>\n<option value="westmeath">Westmeath</option>\n<option value="wexford">Wexford</option>\n<option value="wicklow">Wicklow</option>\n</select>'
-"""
+class IELocalFlavorTests(LocalFlavorTestCase):
+ def test_IECountySelect(self):
+ f = IECountySelect()
+ out = u'''<select name="counties">
+<option value="antrim">Antrim</option>
+<option value="armagh">Armagh</option>
+<option value="carlow">Carlow</option>
+<option value="cavan">Cavan</option>
+<option value="clare">Clare</option>
+<option value="cork">Cork</option>
+<option value="derry">Derry</option>
+<option value="donegal">Donegal</option>
+<option value="down">Down</option>
+<option value="dublin" selected="selected">Dublin</option>
+<option value="fermanagh">Fermanagh</option>
+<option value="galway">Galway</option>
+<option value="kerry">Kerry</option>
+<option value="kildare">Kildare</option>
+<option value="kilkenny">Kilkenny</option>
+<option value="laois">Laois</option>
+<option value="leitrim">Leitrim</option>
+<option value="limerick">Limerick</option>
+<option value="longford">Longford</option>
+<option value="louth">Louth</option>
+<option value="mayo">Mayo</option>
+<option value="meath">Meath</option>
+<option value="monaghan">Monaghan</option>
+<option value="offaly">Offaly</option>
+<option value="roscommon">Roscommon</option>
+<option value="sligo">Sligo</option>
+<option value="tipperary">Tipperary</option>
+<option value="tyrone">Tyrone</option>
+<option value="waterford">Waterford</option>
+<option value="westmeath">Westmeath</option>
+<option value="wexford">Wexford</option>
+<option value="wicklow">Wicklow</option>
+</select>'''
+ self.assertEqual(f.render('counties', 'dublin'), out)
diff --git a/tests/regressiontests/forms/localflavortests.py b/tests/regressiontests/forms/localflavortests.py
index 264efadc1e..47dfd6d95c 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.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
from localflavor.jp import tests as localflavor_jp_tests
@@ -30,13 +29,13 @@ from localflavor.fi import FILocalFlavorTests
from localflavor.fr import FRLocalFlavorTests
from localflavor.generic import GenericLocalFlavorTests
from localflavor.id import IDLocalFlavorTests
+from localflavor.ie import IELocalFlavorTests
from localflavor.il import ILLocalFlavorTests
from localflavor.tr import TRLocalFlavorTests
__test__ = {
'localflavor_cz_tests': localflavor_cz_tests,
- 'localflavor_ie_tests': localflavor_ie_tests,
'localflavor_is_tests': localflavor_is_tests,
'localflavor_it_tests': localflavor_it_tests,
'localflavor_jp_tests': localflavor_jp_tests,
diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py
index 190577c9f6..065a8beb47 100644
--- a/tests/regressiontests/forms/tests/__init__.py
+++ b/tests/regressiontests/forms/tests/__init__.py
@@ -27,6 +27,7 @@ from regressiontests.forms.localflavortests import (
FRLocalFlavorTests,
GenericLocalFlavorTests,
IDLocalFlavorTests,
+ IELocalFlavorTests,
ILLocalFlavorTests,
TRLocalFlavorTests,
)