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 #26747 -- Used more specific assertions in the Django test suite.

Browse Source
This commit is contained in:
Jon Dufresne
2016-06-16 11:19:18 -07:00
committed by Tim Graham
parent ea34426ae7
commit 4f336f6652
87 changed files with 406 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/i18n/tests.py
View File

@@ -76,10 +76,10 @@ class TranslationTests(SimpleTestCase):
self.assertEqual(get_language(), 'pl')
self.assertEqual(get_language(), 'de')
with translation.override(None):
self.assertEqual(get_language(), None)
self.assertIsNone(get_language())
with translation.override('pl'):
pass
self.assertEqual(get_language(), None)
self.assertIsNone(get_language())
self.assertEqual(get_language(), 'de')
finally:
deactivate()
@@ -92,7 +92,7 @@ class TranslationTests(SimpleTestCase):
@translation.override(None)
def func_none():
self.assertEqual(get_language(), None)
self.assertIsNone(get_language())
try:
activate('de')
@@ -475,9 +475,9 @@ class TranslationTests(SimpleTestCase):
self.assertEqual(trans_real.to_language('sr_Lat'), 'sr-lat')
def test_language_bidi(self):
self.assertEqual(get_language_bidi(), False)
self.assertIs(get_language_bidi(), False)
with translation.override(None):
self.assertEqual(get_language_bidi(), False)
self.assertIs(get_language_bidi(), False)
@override_settings(LOCALE_PATHS=[os.path.join(here, 'other', 'locale')])
def test_bad_placeholder_1(self):
@@ -1464,13 +1464,13 @@ class MiscTests(SimpleTestCase):
g = trans_real.get_language_from_path
self.assertEqual(g('/pl/'), 'pl')
self.assertEqual(g('/pl'), 'pl')
self.assertEqual(g('/xyz/'), None)
self.assertIsNone(g('/xyz/'))
def test_get_language_from_path_null(self):
from django.utils.translation.trans_null import get_language_from_path as g
self.assertEqual(g('/pl/'), None)
self.assertEqual(g('/pl'), None)
self.assertEqual(g('/xyz/'), None)
self.assertIsNone(g('/pl/'))
self.assertIsNone(g('/pl'))
self.assertIsNone(g('/xyz/'))
@override_settings(LOCALE_PATHS=extended_locale_paths)
def test_percent_in_translatable_block(self):
@@ -1595,7 +1595,7 @@ class TestLanguageInfo(SimpleTestCase):
self.assertEqual(li['code'], 'de')
self.assertEqual(li['name_local'], 'Deutsch')
self.assertEqual(li['name'], 'German')
self.assertEqual(li['bidi'], False)
self.assertIs(li['bidi'], False)
def test_unknown_language_code(self):
six.assertRaisesRegex(self, KeyError, r"Unknown language code xx\.", get_language_info, 'xx')
@@ -1609,7 +1609,7 @@ class TestLanguageInfo(SimpleTestCase):
self.assertEqual(li['code'], 'de')
self.assertEqual(li['name_local'], 'Deutsch')
self.assertEqual(li['name'], 'German')
self.assertEqual(li['bidi'], False)
self.assertIs(li['bidi'], False)
def test_unknown_language_code_and_country_code(self):
six.assertRaisesRegex(self, KeyError, r"Unknown language code xx-xx and xx\.", get_language_info, 'xx-xx')