From 13d60298ea2a07242dc3952a9dfcd9c8857bf1f9 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Thu, 16 Jun 2016 11:19:18 -0700 Subject: [1.10.x] Fixed #26747 -- Used more specific assertions in the Django test suite. Backport of 4f336f66523001b009ab038b10848508fd208b3b from master --- tests/postgres_tests/test_array.py | 2 +- tests/postgres_tests/test_hstore.py | 2 +- tests/postgres_tests/test_json.py | 6 +++--- tests/postgres_tests/test_ranges.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/postgres_tests') diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py index edbc1d9241..6a305556d4 100644 --- a/tests/postgres_tests/test_array.py +++ b/tests/postgres_tests/test_array.py @@ -68,7 +68,7 @@ class TestSaveLoad(PostgreSQLTestCase): instance = NullableIntegerArrayModel() instance.save() loaded = NullableIntegerArrayModel.objects.get(pk=instance.pk) - self.assertEqual(loaded.field, None) + self.assertIsNone(loaded.field) self.assertEqual(instance.field, loaded.field) def test_null_handling(self): diff --git a/tests/postgres_tests/test_hstore.py b/tests/postgres_tests/test_hstore.py index b927d8e19f..0afa630e46 100644 --- a/tests/postgres_tests/test_hstore.py +++ b/tests/postgres_tests/test_hstore.py @@ -31,7 +31,7 @@ class SimpleTests(PostgreSQLTestCase): instance = HStoreModel(field=None) instance.save() reloaded = HStoreModel.objects.get() - self.assertEqual(reloaded.field, None) + self.assertIsNone(reloaded.field) def test_value_null(self): value = {'a': None} diff --git a/tests/postgres_tests/test_json.py b/tests/postgres_tests/test_json.py index 11b6a349aa..1978552cf9 100644 --- a/tests/postgres_tests/test_json.py +++ b/tests/postgres_tests/test_json.py @@ -33,7 +33,7 @@ class TestSaveLoad(TestCase): instance = JSONModel() instance.save() loaded = JSONModel.objects.get() - self.assertEqual(loaded.field, None) + self.assertIsNone(loaded.field) def test_empty_object(self): instance = JSONModel(field={}) @@ -51,7 +51,7 @@ class TestSaveLoad(TestCase): instance = JSONModel(field=True) instance.save() loaded = JSONModel.objects.get() - self.assertEqual(loaded.field, True) + self.assertIs(loaded.field, True) def test_string(self): instance = JSONModel(field='why?') @@ -247,7 +247,7 @@ class TestFormField(PostgreSQLTestCase): def test_valid_empty(self): field = forms.JSONField(required=False) value = field.clean('') - self.assertEqual(value, None) + self.assertIsNone(value) def test_invalid(self): field = forms.JSONField() diff --git a/tests/postgres_tests/test_ranges.py b/tests/postgres_tests/test_ranges.py index ce0b3e90a3..3dd60dea0d 100644 --- a/tests/postgres_tests/test_ranges.py +++ b/tests/postgres_tests/test_ranges.py @@ -58,7 +58,7 @@ class TestSaveLoad(PostgreSQLTestCase): instance.save() loaded = RangesModel.objects.get() self.assertEqual(r, loaded.floats) - self.assertTrue(10 in loaded.floats) + self.assertIn(10, loaded.floats) def test_unbounded(self): r = NumericRange(None, None, '()') @@ -313,7 +313,7 @@ class TestSerialization(PostgreSQLTestCase): instance = list(serializers.deserialize('json', self.test_data))[0].object self.assertEqual(instance.ints, NumericRange(0, 10)) self.assertEqual(instance.floats, NumericRange(empty=True)) - self.assertEqual(instance.bigints, None) + self.assertIsNone(instance.bigints) self.assertEqual(instance.dates, DateRange(self.lower_date, self.upper_date)) self.assertEqual(instance.timestamps, DateTimeTZRange(self.lower_dt, self.upper_dt)) @@ -409,7 +409,7 @@ class TestFormField(PostgreSQLTestCase): def test_none(self): field = pg_forms.IntegerRangeField(required=False) value = field.clean(['', '']) - self.assertEqual(value, None) + self.assertIsNone(value) def test_rendering(self): class RangeForm(forms.Form): -- cgit v1.3