diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-10-28 12:02:56 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-03 11:56:37 -0500 |
| commit | f7969b0920c403118656f6bfec58d6454d79ef1a (patch) | |
| tree | 866df7de0524251323fef2b4262e672150d95f00 /tests/utils_tests | |
| parent | c0c78f1b707f825eee974c65515a837f8cf46e66 (diff) | |
Fixed #23620 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/utils_tests')
| -rw-r--r-- | tests/utils_tests/test_datastructures.py | 2 | ||||
| -rw-r--r-- | tests/utils_tests/test_functional.py | 2 | ||||
| -rw-r--r-- | tests/utils_tests/test_http.py | 4 | ||||
| -rw-r--r-- | tests/utils_tests/test_lazyobject.py | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py index ec4001cafc..d9a0a678f8 100644 --- a/tests/utils_tests/test_datastructures.py +++ b/tests/utils_tests/test_datastructures.py @@ -177,7 +177,7 @@ class MergeDictTests(IgnoreDeprecationWarningsMixin, SimpleTestCase): self.assertEqual(sorted(six.iterkeys(mm)), ['key1', 'key2', 'key4']) self.assertEqual(len(list(six.itervalues(mm))), 3) - self.assertTrue('value1' in six.itervalues(mm)) + self.assertIn('value1', six.itervalues(mm)) self.assertEqual( sorted(six.iteritems(mm), key=lambda k: k[0]), diff --git a/tests/utils_tests/test_functional.py b/tests/utils_tests/test_functional.py index b806be0b16..7d71f32415 100644 --- a/tests/utils_tests/test_functional.py +++ b/tests/utils_tests/test_functional.py @@ -20,7 +20,7 @@ class FunctionalTestCase(unittest.TestCase): pass t = lazy(lambda: Klazz(), Klazz)() - self.assertTrue('base_method' in dir(t)) + self.assertIn('base_method', dir(t)) def test_lazy_property(self): diff --git a/tests/utils_tests/test_http.py b/tests/utils_tests/test_http.py index c54c15a95d..b3e2c7b8d3 100644 --- a/tests/utils_tests/test_http.py +++ b/tests/utils_tests/test_http.py @@ -47,7 +47,7 @@ class TestUtilsHttp(unittest.TestCase): 'c=3&a=1&b=2', 'c=3&b=2&a=1' ] - self.assertTrue(result in acceptable_results) + self.assertIn(result, acceptable_results) result = http.urlencode({'a': [1, 2]}, doseq=False) self.assertEqual(result, 'a=%5B%271%27%2C+%272%27%5D') result = http.urlencode({'a': [1, 2]}, doseq=True) @@ -65,7 +65,7 @@ class TestUtilsHttp(unittest.TestCase): 'name=Adrian&name=Simon&position=Developer', 'position=Developer&name=Adrian&name=Simon' ] - self.assertTrue(result in acceptable_results) + self.assertIn(result, acceptable_results) def test_base36(self): # reciprocity works diff --git a/tests/utils_tests/test_lazyobject.py b/tests/utils_tests/test_lazyobject.py index c15388fb3b..a80f0a2c95 100644 --- a/tests/utils_tests/test_lazyobject.py +++ b/tests/utils_tests/test_lazyobject.py @@ -257,8 +257,8 @@ class SimpleLazyObjectTestCase(LazyObjectTestCase): self.assertEqual(lazydict['one'], 1) lazydict['one'] = -1 self.assertEqual(lazydict['one'], -1) - self.assertTrue('one' in lazydict) - self.assertFalse('two' in lazydict) + self.assertIn('one', lazydict) + self.assertNotIn('two', lazydict) self.assertEqual(len(lazydict), 1) del lazydict['one'] with self.assertRaises(KeyError): @@ -267,9 +267,9 @@ class SimpleLazyObjectTestCase(LazyObjectTestCase): def test_list_set(self): lazy_list = SimpleLazyObject(lambda: [1, 2, 3, 4, 5]) lazy_set = SimpleLazyObject(lambda: {1, 2, 3, 4}) - self.assertTrue(1 in lazy_list) - self.assertTrue(1 in lazy_set) - self.assertFalse(6 in lazy_list) - self.assertFalse(6 in lazy_set) + self.assertIn(1, lazy_list) + self.assertIn(1, lazy_set) + self.assertNotIn(6, lazy_list) + self.assertNotIn(6, lazy_set) self.assertEqual(len(lazy_list), 5) self.assertEqual(len(lazy_set), 4) |
