summaryrefslogtreecommitdiff
path: root/tests/template_tests
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2016-06-16 11:19:18 -0700
committerTim Graham <timograham@gmail.com>2016-06-16 14:19:18 -0400
commit4f336f66523001b009ab038b10848508fd208b3b (patch)
tree47474fb588013f1770246455ef7aa1a4163a1edb /tests/template_tests
parentea34426ae789d31b036f58c8fd59ce299649e91e (diff)
Fixed #26747 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/template_tests')
-rw-r--r--tests/template_tests/filter_tests/test_divisibleby.py4
-rw-r--r--tests/template_tests/filter_tests/test_length_is.py8
-rw-r--r--tests/template_tests/test_context.py8
-rw-r--r--tests/template_tests/test_extends.py4
-rw-r--r--tests/template_tests/test_loaders.py2
-rw-r--r--tests/template_tests/tests.py2
6 files changed, 14 insertions, 14 deletions
diff --git a/tests/template_tests/filter_tests/test_divisibleby.py b/tests/template_tests/filter_tests/test_divisibleby.py
index 2b3fe9aa4c..f0dda1f0b6 100644
--- a/tests/template_tests/filter_tests/test_divisibleby.py
+++ b/tests/template_tests/filter_tests/test_divisibleby.py
@@ -5,7 +5,7 @@ from django.test import SimpleTestCase
class FunctionTests(SimpleTestCase):
def test_true(self):
- self.assertEqual(divisibleby(4, 2), True)
+ self.assertIs(divisibleby(4, 2), True)
def test_false(self):
- self.assertEqual(divisibleby(4, 3), False)
+ self.assertIs(divisibleby(4, 3), False)
diff --git a/tests/template_tests/filter_tests/test_length_is.py b/tests/template_tests/filter_tests/test_length_is.py
index 9a67a866d4..471ef312e9 100644
--- a/tests/template_tests/filter_tests/test_length_is.py
+++ b/tests/template_tests/filter_tests/test_length_is.py
@@ -67,9 +67,9 @@ class LengthIsTests(SimpleTestCase):
class FunctionTests(SimpleTestCase):
def test_empty_list(self):
- self.assertEqual(length_is([], 0), True)
- self.assertEqual(length_is([], 1), False)
+ self.assertIs(length_is([], 0), True)
+ self.assertIs(length_is([], 1), False)
def test_string(self):
- self.assertEqual(length_is('a', 1), True)
- self.assertEqual(length_is('a', 10), False)
+ self.assertIs(length_is('a', 1), True)
+ self.assertIs(length_is('a', 10), False)
diff --git a/tests/template_tests/test_context.py b/tests/template_tests/test_context.py
index 2fa7715d27..94011fb0f1 100644
--- a/tests/template_tests/test_context.py
+++ b/tests/template_tests/test_context.py
@@ -193,10 +193,10 @@ class ContextTests(SimpleTestCase):
with warnings.catch_warnings(record=True) as warns:
warnings.simplefilter('always')
- self.assertEqual(a.has_key('a'), True)
- self.assertEqual(a.has_key('b'), False)
- self.assertEqual(b.has_key('a'), True)
- self.assertEqual(b.has_key('b'), False)
+ self.assertIs(a.has_key('a'), True)
+ self.assertIs(a.has_key('b'), False)
+ self.assertIs(b.has_key('a'), True)
+ self.assertIs(b.has_key('b'), False)
self.assertEqual(len(warns), 4)
self.assertEqual(str(warns[0].message), msg)
diff --git a/tests/template_tests/test_extends.py b/tests/template_tests/test_extends.py
index 7a9008cf54..1d7e00b60d 100644
--- a/tests/template_tests/test_extends.py
+++ b/tests/template_tests/test_extends.py
@@ -162,8 +162,8 @@ class NonRecursiveLoaderExtendsTests(SimpleTestCase):
self.assertEqual(output, 'base')
cache = engine.template_loaders[0].template_cache
- self.assertTrue('base.html' in cache)
- self.assertTrue('index.html' in cache)
+ self.assertIn('base.html', cache)
+ self.assertIn('index.html', cache)
# Render a second time from cache
output = engine.render_to_string('index.html')
diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py
index 8cb366e038..1a1457142d 100644
--- a/tests/template_tests/test_loaders.py
+++ b/tests/template_tests/test_loaders.py
@@ -112,7 +112,7 @@ class CachedLoaderTests(SimpleTestCase):
"""
loader = self.engine.template_loaders[0]
- self.assertFalse('missing.html' in loader.template_cache)
+ self.assertNotIn('missing.html', loader.template_cache)
with self.assertRaises(TemplateDoesNotExist):
loader.load_template("missing.html")
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index d555247f4b..b2e4c585b9 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -16,7 +16,7 @@ class TemplateTests(SimpleTestCase):
def test_string_origin(self):
template = Engine().from_string('string template')
self.assertEqual(template.origin.name, UNKNOWN_SOURCE)
- self.assertEqual(template.origin.loader_name, None)
+ self.assertIsNone(template.origin.loader_name)
self.assertEqual(template.source, 'string template')
@override_settings(SETTINGS_MODULE=None)