mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #16921 -- Added assertHTMLEqual and assertHTMLNotEqual assertions, and converted Django tests to use them where appropriate. Thanks Greg Müllegger.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer
2012-01-31 20:36:11 +00:00
parent c82f1dcf95
commit 844a24bbb9
61 changed files with 1345 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/regressiontests/localflavor/ar/tests.py
View File

@@ -33,7 +33,7 @@ class ARLocalFlavorTests(SimpleTestCase):
<option value="V">Tierra del Fuego, Ant\xe1rtida e Islas del Atl\xe1ntico Sur</option>
<option value="T">Tucum\xe1n</option>
</select>'''
self.assertEqual(f.render('provincias', 'A'), out)
self.assertHTMLEqual(f.render('provincias', 'A'), out)
def test_ARPostalCodeField(self):
error_format = [u'Enter a postal code in the format NNNN or ANNNNAAA.']

2
tests/regressiontests/localflavor/at/tests.py
View File

@@ -18,7 +18,7 @@ class ATLocalFlavorTests(SimpleTestCase):
<option value="VO">Vorarlberg</option>
<option value="WI" selected="selected">Vienna</option>
</select>'''
self.assertEqual(f.render('bundesland', 'WI'), out)
self.assertHTMLEqual(f.render('bundesland', 'WI'), out)
def test_ATZipCodeField(self):
error_format = [u'Enter a zip code in the format XXXX.']

2
tests/regressiontests/localflavor/au/tests.py
View File

@@ -76,7 +76,7 @@ class AULocalflavorTests(SimpleTestCase):
<option value="VIC">Victoria</option>
<option value="WA">Western Australia</option>
</select>'''
self.assertEqual(f.render('state', 'NSW'), out)
self.assertHTMLEqual(f.render('state', 'NSW'), out)
def test_AUPostCodeField(self):
error_format = [u'Enter a 4 digit postcode.']

4
tests/regressiontests/localflavor/be/tests.py
View File

@@ -59,7 +59,7 @@ class BELocalFlavorTests(SimpleTestCase):
<option value="VLG" selected="selected">Flemish Region</option>
<option value="WAL">Wallonia</option>
</select>'''
self.assertEqual(f.render('regions', 'VLG'), out)
self.assertHTMLEqual(f.render('regions', 'VLG'), out)
def test_BEProvinceSelect(self):
f = BEProvinceSelect()
@@ -76,4 +76,4 @@ class BELocalFlavorTests(SimpleTestCase):
<option value="WBR">Walloon Brabant</option>
<option value="VWV">West Flanders</option>
</select>'''
self.assertEqual(f.render('provinces', 'WLG'), out)
self.assertHTMLEqual(f.render('provinces', 'WLG'), out)

2
tests/regressiontests/localflavor/br/tests.py
View File

@@ -105,7 +105,7 @@ class BRLocalFlavorTests(SimpleTestCase):
<option value="SE">Sergipe</option>
<option value="TO">Tocantins</option>
</select>'''
self.assertEqual(f.render('states', 'PR'), out)
self.assertHTMLEqual(f.render('states', 'PR'), out)
def test_BRStateChoiceField(self):
error_invalid = [u'Select a valid brazilian state. That state is not one of the available states.']

2
tests/regressiontests/localflavor/ca/tests.py
View File

@@ -36,7 +36,7 @@ class CALocalFlavorTests(SimpleTestCase):
<option value="SK">Saskatchewan</option>
<option value="YT">Yukon</option>
</select>'''
self.assertEqual(f.render('province', 'AB'), out)
self.assertHTMLEqual(f.render('province', 'AB'), out)
def test_CAPostalCodeField(self):
error_format = [u'Enter a postal code in the format XXX XXX.']

2
tests/regressiontests/localflavor/ch/tests.py
View File

@@ -35,7 +35,7 @@ class CHLocalFlavorTests(SimpleTestCase):
<option value="ZG">Zug</option>
<option value="ZH">Zurich</option>
</select>'''
self.assertEqual(f.render('state', 'AG'), out)
self.assertHTMLEqual(f.render('state', 'AG'), out)
def test_CHZipCodeField(self):
error_format = [u'Enter a zip code in the format XXXX.']

2
tests/regressiontests/localflavor/cl/tests.py
View File

@@ -23,7 +23,7 @@ class CLLocalFlavorTests(SimpleTestCase):
<option value="XIV">Regi\xf3n de Los R\xedos</option>
<option value="XV">Regi\xf3n de Arica-Parinacota</option>
</select>'''
self.assertEqual(f.render('foo', 'bar'), out)
self.assertHTMLEqual(f.render('foo', 'bar'), out)
def test_CLRutField(self):
error_invalid = [u'The Chilean RUT is not valid.']

2
tests/regressiontests/localflavor/cn/tests.py
View File

@@ -43,7 +43,7 @@ class CNLocalFlavorTests(SimpleTestCase):
<option value="yunnan">\u4e91\u5357</option>
<option value="zhejiang">\u6d59\u6c5f</option>
</select>'''
self.assertEqual(f.render('provinces', 'hubei'), correct_output)
self.assertHTMLEqual(f.render('provinces', 'hubei'), correct_output)
def test_CNPostCodeField(self):
error_format = [u'Enter a post code in the format XXXXXX.']

2
tests/regressiontests/localflavor/co/tests.py
View File

@@ -40,4 +40,4 @@ class COLocalFlavorTests(SimpleTestCase):
<option value="VAU">Vaup\xe9s</option>
<option value="VID">Vichada</option>
</select>"""
self.assertEqual(d.render('department', 'COR'), out)
self.assertHTMLEqual(d.render('department', 'COR'), out)

2
tests/regressiontests/localflavor/cz/tests.py
View File

@@ -37,7 +37,7 @@ class CZLocalFlavorTests(SimpleTestCase):
<option value="ZL">Zlin Region</option>
<option value="MS">Moravian-Silesian Region</option>
</select>'''
self.assertEqual(f.render('regions', 'TT'), out)
self.assertHTMLEqual(f.render('regions', 'TT'), out)
def test_CZPostalCodeField(self):
error_format = [u'Enter a postal code in the format XXXXX or XXX XX.']

2
tests/regressiontests/localflavor/de/tests.py
View File

@@ -25,7 +25,7 @@ class DELocalFlavorTests(SimpleTestCase):
<option value="SH">Schleswig-Holstein</option>
<option value="TH" selected="selected">Thuringia</option>
</select>'''
self.assertEqual(f.render('states', 'TH'), out)
self.assertHTMLEqual(f.render('states', 'TH'), out)
def test_DEZipCodeField(self):
error_format = [u'Enter a zip code in the format XXXXX.']

2
tests/regressiontests/localflavor/ec/tests.py
View File

@@ -31,4 +31,4 @@ class ECLocalFlavorTests(SimpleTestCase):
<option value="T">Tungurahua</option>
<option value="Z">Zamora Chinchipe</option>
</select>"""
self.assertEqual(p.render('province', 'U'), out)
self.assertHTMLEqual(p.render('province', 'U'), out)

4
tests/regressiontests/localflavor/es/tests.py
View File

@@ -26,7 +26,7 @@ class ESLocalFlavorTests(SimpleTestCase):
<option value="NA">Foral Community of Navarre</option>
<option value="VC">Valencian Community</option>
</select>'''
self.assertEqual(f.render('regions', 'CT'), out)
self.assertHTMLEqual(f.render('regions', 'CT'), out)
def test_ESProvinceSelect(self):
f = ESProvinceSelect()
@@ -84,7 +84,7 @@ class ESLocalFlavorTests(SimpleTestCase):
<option value="51">Ceuta</option>
<option value="52">Melilla</option>
</select>'''
self.assertEqual(f.render('provinces', '08'), out)
self.assertHTMLEqual(f.render('provinces', '08'), out)
def test_ESPostalCodeField(self):
error_invalid = [u'Enter a valid postal code in the range and format 01XXX - 52XXX.']

2
tests/regressiontests/localflavor/fi/tests.py
View File

@@ -351,7 +351,7 @@ class FILocalFlavorTests(SimpleTestCase):
<option value="ahtari">\xc4ht\xe4ri</option>
<option value="aanekoski">\xc4\xe4nekoski</option>
</select>'''
self.assertEqual(f.render('municipalities', 'turku'), out)
self.assertHTMLEqual(f.render('municipalities', 'turku'), out)
def test_FIZipCodeField(self):
error_format = [u'Enter a zip code in the format XXXXX.']

2
tests/regressiontests/localflavor/fr/tests.py
View File

@@ -142,4 +142,4 @@ class FRLocalFlavorTests(SimpleTestCase):
<option value="987">987 - Polynesie Francaise</option>
<option value="988">988 - Nouvelle-Caledonie</option>
</select>'''
self.assertEqual(f.render('dep', 'Paris'), out)
self.assertHTMLEqual(f.render('dep', 'Paris'), out)

6
tests/regressiontests/localflavor/hr/tests.py
View File

@@ -32,7 +32,7 @@ class HRLocalFlavorTests(SimpleTestCase):
<option value="ZDŽ">Zadarska županija</option>
<option value="ZGŽ">Zagrebačka županija</option>
</select>'''
self.assertEqual(f.render('county', 'GZG'), out)
self.assertHTMLEqual(f.render('county', 'GZG'), out)
def test_HRPhoneNumberPrefixSelect(self):
f = HRPhoneNumberPrefixSelect()
@@ -64,7 +64,7 @@ class HRLocalFlavorTests(SimpleTestCase):
<option value="98">098</option>
<option value="99">099</option>
</select>'''
self.assertEqual(f.render('phone', '1'), out)
self.assertHTMLEqual(f.render('phone', '1'), out)
def test_HRLicensePlatePrefixSelect(self):
f = HRLicensePlatePrefixSelect()
@@ -104,7 +104,7 @@ class HRLocalFlavorTests(SimpleTestCase):
<option value="ZG">ZG</option>
<option value="ŽU">ŽU</option>
</select>'''
self.assertEqual(f.render('license', 'BJ'), out)
self.assertHTMLEqual(f.render('license', 'BJ'), out)
def test_HRPhoneNumberField(self):
error_invalid = [u'Enter a valid phone number']

4
tests/regressiontests/localflavor/id/tests.py
View File

@@ -56,7 +56,7 @@ class IDLocalFlavorTests(SimpleTestCase):
<option value="SMS">Sumatera Selatan</option>
<option value="SMU">Sumatera Utara</option>
</select>'''
self.assertEqual(f.render('provinces', 'LPG'), out)
self.assertHTMLEqual(f.render('provinces', 'LPG'), out)
def test_IDLicensePlatePrefixSelect(self):
f = IDLicensePlatePrefixSelect()
@@ -118,7 +118,7 @@ class IDLocalFlavorTests(SimpleTestCase):
<option value="W">Sidoarjo</option>
<option value="Z">Garut</option>
</select>'''
self.assertEqual(f.render('codes', 'BE'), out)
self.assertHTMLEqual(f.render('codes', 'BE'), out)
def test_IDPhoneNumberField(self):
error_invalid = [u'Enter a valid phone number']

2
tests/regressiontests/localflavor/ie/tests.py
View File

@@ -40,4 +40,4 @@ class IELocalFlavorTests(SimpleTestCase):
<option value="wexford">Wexford</option>
<option value="wicklow">Wicklow</option>
</select>'''
self.assertEqual(f.render('counties', 'dublin'), out)
self.assertHTMLEqual(f.render('counties', 'dublin'), out)

2
tests/regressiontests/localflavor/in_/tests.py
View File

@@ -64,7 +64,7 @@ class INLocalFlavorTests(SimpleTestCase):
<option value="LD">Lakshadweep</option>
<option value="PY">Pondicherry</option>
</select>'''
self.assertEqual(f.render('state', 'AP'), out)
self.assertHTMLEqual(f.render('state', 'AP'), out)
def test_INZipCodeField(self):
error_format = [u'Enter a zip code in the format XXXXXX or XXX XXX.']

2
tests/regressiontests/localflavor/is_/tests.py
View File

@@ -156,7 +156,7 @@ class ISLocalFlavorTests(SimpleTestCase):
<option value="900">900 Vestmannaeyjar</option>
<option value="902">902 Vestmannaeyjar</option>
</select>'''
self.assertEqual(f.render('foo', 'bar'), out)
self.assertHTMLEqual(f.render('foo', 'bar'), out)
def test_ISIdNumberField(self):
error_atleast = [u'Ensure this value has at least 10 characters (it has 9).']

2
tests/regressiontests/localflavor/it/tests.py
View File

@@ -29,7 +29,7 @@ class ITLocalFlavorTests(SimpleTestCase):
<option value="VAO">Valle d\u2019Aosta</option>
<option value="VEN">Veneto</option>
</select>'''
self.assertEqual(f.render('regions', 'PMN'), out)
self.assertHTMLEqual(f.render('regions', 'PMN'), out)
def test_ITZipCodeField(self):
error_invalid = [u'Enter a valid zip code.']

2
tests/regressiontests/localflavor/jp/tests.py
View File

@@ -56,7 +56,7 @@ class JPLocalFlavorTests(SimpleTestCase):
<option value="kagoshima">Kagoshima</option>
<option value="okinawa">Okinawa</option>
</select>'''
self.assertEqual(f.render('prefecture', 'kanagawa'), out)
self.assertHTMLEqual(f.render('prefecture', 'kanagawa'), out)
def test_JPPostalCodeField(self):
error_format = [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']

4
tests/regressiontests/localflavor/mk/tests.py
View File

@@ -180,7 +180,7 @@ class MKLocalFlavorTests(SimpleTestCase):
<option value="ST">\xc5\xa0tip</option>
<option value="SO">\xc5\xa0uto Orizari</option>
</select>"""
self.assertEqual(str(self.form['municipality']), municipality_select_html)
self.assertHTMLEqual(str(self.form['municipality']), municipality_select_html)
def test_MKIdentityCardNumberField(self):
error_invalid = [u'Identity card numbers must contain either 4 to 7 '
@@ -284,7 +284,7 @@ class MKLocalFlavorTests(SimpleTestCase):
<option value="ST">\u0160tip</option>
<option value="SO">\u0160uto Orizari</option>
</select>'''
self.assertEqual(f.render('municipality', 'DL' ), out)
self.assertHTMLEqual(f.render('municipality', 'DL' ), out)
def test_UMCNField(self):
error_invalid = [u'This field should contain exactly 13 digits.']

4
tests/regressiontests/localflavor/mx/tests.py
View File

@@ -75,7 +75,7 @@ class MXLocalFlavorTests(SimpleTestCase):
<option value="YUC">Yucatán</option>
<option value="ZAC">Zacatecas</option>
</select>"""
self.assertEqual(str(self.form['state']), state_select_html)
self.assertHTMLEqual(str(self.form['state']), state_select_html)
def test_MXStateSelect(self):
f = MXStateSelect()
@@ -113,7 +113,7 @@ class MXLocalFlavorTests(SimpleTestCase):
<option value="YUC">Yucatán</option>
<option value="ZAC">Zacatecas</option>
</select>'''
self.assertEqual(f.render('state', 'MIC'), out)
self.assertHTMLEqual(f.render('state', 'MIC'), out)
def test_MXZipCodeField(self):
error_format = [u'Enter a valid zip code in the format XXXXX.']

2
tests/regressiontests/localflavor/nl/tests.py
View File

@@ -21,7 +21,7 @@ class NLLocalFlavorTests(SimpleTestCase):
<option value="ZE">Zeeland</option>
<option value="ZH">Zuid-Holland</option>
</select>'''
self.assertEqual(f.render('provinces', 'OV'), out)
self.assertHTMLEqual(f.render('provinces', 'OV'), out)
def test_NLPhoneNumberField(self):
error_invalid = [u'Enter a valid phone number']

4
tests/regressiontests/localflavor/pl/tests.py
View File

@@ -25,7 +25,7 @@ class PLLocalFlavorTests(SimpleTestCase):
<option value="greater_poland">Greater Poland</option>
<option value="west_pomerania">West Pomerania</option>
</select>'''
self.assertEqual(f.render('voivodeships', 'pomerania'), out)
self.assertHTMLEqual(f.render('voivodeships', 'pomerania'), out)
def test_PLCountrySelect(self):
f = PLCountySelect()
@@ -407,7 +407,7 @@ class PLLocalFlavorTests(SimpleTestCase):
<option value="swidwinski">\u015bwidwi\u0144ski</option>
<option value="walecki">wa\u0142ecki</option>
</select>'''
self.assertEqual(f.render('administrativeunit', 'katowice'), out)
self.assertHTMLEqual(f.render('administrativeunit', 'katowice'), out)
def test_PLPostalCodeField(self):
error_format = [u'Enter a postal code in the format XX-XXX.']

4
tests/regressiontests/localflavor/py/tests.py
View File

@@ -26,7 +26,7 @@ class PYLocalFlavorTests(SimpleTestCase):
<option value="PH">Pdte. Hayes</option>
<option value="SP">San Pedro</option>
</select>'''
self.assertEqual(py.render('department', 'M'), out)
self.assertHTMLEqual(py.render('department', 'M'), out)
def test_PyNumberedDepartmentSelect(self):
py = PyNumberedDepartmentSelect()
@@ -50,4 +50,4 @@ class PYLocalFlavorTests(SimpleTestCase):
<option value="BQ">XVII Boquer\xf3n</option>
<option value="AS">XVIII Asunci\xf3n</option>
</select>'''
self.assertEqual(py.render('department', 'AM'), out)
self.assertHTMLEqual(py.render('department', 'AM'), out)

2
tests/regressiontests/localflavor/ro/tests.py
View File

@@ -53,7 +53,7 @@ class ROLocalFlavorTests(SimpleTestCase):
<option value="VL">V\xe2lcea</option>
<option value="VN">Vrancea</option>
</select>'''
self.assertEqual(f.render('county', 'CJ'), out)
self.assertHTMLEqual(f.render('county', 'CJ'), out)
def test_ROCIFField(self):
error_invalid = [u'Enter a valid CIF.']

4
tests/regressiontests/localflavor/ru/tests.py
View File

@@ -56,7 +56,7 @@ class RULocalFlavorTests(SimpleTestCase):
<option value="Privolzhsky Federal County">Privolzhsky Federal County</option>
<option value="North-Caucasian Federal County">North-Caucasian Federal County</option>
</select>'''
self.assertEqual(f.render('county', None), out)
self.assertHTMLEqual(f.render('county', None), out)
def test_RURegionSelect(self):
f = RURegionSelect()
@@ -145,4 +145,4 @@ class RULocalFlavorTests(SimpleTestCase):
<option value="87">Chukotskiy avtonomnyy okrug</option>
<option value="89">Yamalo-Neneckiy avtonomnyy okrug</option>
</select>'''
self.assertEqual(f.render('region', '67'), out)
self.assertHTMLEqual(f.render('region', '67'), out)

2
tests/regressiontests/localflavor/se/tests.py
View File

@@ -47,7 +47,7 @@ class SELocalFlavorTests(SimpleTestCase):
<option value="Y">V\xe4sternorrland</option>
<option value="Z">J\xe4mtland</option>
</select>'''
self.assertEqual(f.render('swedish_county', 'E'), out)
self.assertHTMLEqual(f.render('swedish_county', 'E'), out)
def test_SEOrganizationNumberField(self):
error_invalid = [u'Enter a valid Swedish organisation number.']

2
tests/regressiontests/localflavor/si/tests.py
View File

@@ -553,4 +553,4 @@ class SILocalFlavorTests(SimpleTestCase):
<option value="4274">\u017dirovnica</option>
<option value="8360">\u017du\u017eemberk</option>
</select>'''
self.assertEqual(f.render('Kranj', '4000'), out)
self.assertHTMLEqual(f.render('Kranj', '4000'), out)

4
tests/regressiontests/localflavor/sk/tests.py
View File

@@ -17,7 +17,7 @@ class SKLocalFlavorTests(SimpleTestCase):
<option value="TT" selected="selected">Trnava region</option>
<option value="ZA">Zilina region</option>
</select>'''
self.assertEqual(f.render('regions', 'TT'), out)
self.assertHTMLEqual(f.render('regions', 'TT'), out)
def test_SKDistrictSelect(self):
f = SKDistrictSelect()
@@ -102,7 +102,7 @@ class SKLocalFlavorTests(SimpleTestCase):
<option value="ZH">Ziar nad Hronom</option>
<option value="ZA">Zilina</option>
</select>'''
self.assertEqual(f.render('Districts', 'RK'), out)
self.assertHTMLEqual(f.render('Districts', 'RK'), out)
def test_SKPostalCodeField(self):
error_format = [u'Enter a postal code in the format XXXXX or XXX XX.']

6
tests/regressiontests/localflavor/us/tests.py
View File

@@ -90,7 +90,7 @@ class USLocalFlavorTests(SimpleTestCase):
<option value="WI">Wisconsin</option>
<option value="WY">Wyoming</option>
</select>"""
self.assertEqual(str(self.form['state']), state_select_html)
self.assertHTMLEqual(str(self.form['state']), state_select_html)
def test_full_postal_code_list(self):
"""Test that the full USPS code field is really the full list."""
@@ -160,7 +160,7 @@ class USLocalFlavorTests(SimpleTestCase):
<option value="WI">Wisconsin</option>
<option value="WY">Wyoming</option>
</select>"""
self.assertEqual(str(self.form['postal_code']), usps_select_html)
self.assertHTMLEqual(str(self.form['postal_code']), usps_select_html)
def test_USStateSelect(self):
f = USStateSelect()
@@ -225,7 +225,7 @@ class USLocalFlavorTests(SimpleTestCase):
<option value="WI">Wisconsin</option>
<option value="WY">Wyoming</option>
</select>'''
self.assertEqual(f.render('state', 'IL'), out)
self.assertHTMLEqual(f.render('state', 'IL'), out)
def test_USZipCodeField(self):
error_format = [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.']

2
tests/regressiontests/localflavor/uy/tests.py
View File

@@ -28,7 +28,7 @@ class UYLocalFlavorTests(SimpleTestCase):
<option value="R">Tacuaremb\xf3</option>
<option value="D">Treinta y Tres</option>
</select>'''
self.assertEqual(f.render('departamentos', 'S'), out)
self.assertHTMLEqual(f.render('departamentos', 'S'), out)
def test_UYCIField(self):
error_format = [u'Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format.']