summaryrefslogtreecommitdiff
path: root/tests/one_to_one
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-10-28 12:02:56 +0200
committerTim Graham <timograham@gmail.com>2014-11-03 11:56:37 -0500
commitf7969b0920c403118656f6bfec58d6454d79ef1a (patch)
tree866df7de0524251323fef2b4262e672150d95f00 /tests/one_to_one
parentc0c78f1b707f825eee974c65515a837f8cf46e66 (diff)
downloaddjango-f7969b0920c403118656f6bfec58d6454d79ef1a.tar.gz
Fixed #23620 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/one_to_one')
-rw-r--r--tests/one_to_one/tests.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/one_to_one/tests.py b/tests/one_to_one/tests.py
index d9eef0b133..f59749f8cf 100644
--- a/tests/one_to_one/tests.py
+++ b/tests/one_to_one/tests.py
@@ -190,23 +190,23 @@ class OneToOneTests(TestCase):
r = p.restaurant
# Accessing the related object again returns the exactly same object
- self.assertTrue(p.restaurant is r)
+ self.assertIs(p.restaurant, r)
# But if we kill the cache, we get a new object
del p._restaurant_cache
- self.assertFalse(p.restaurant is r)
+ self.assertIsNot(p.restaurant, r)
# Reassigning the Restaurant object results in an immediate cache update
# We can't use a new Restaurant because that'll violate one-to-one, but
# with a new *instance* the is test below will fail if #6886 regresses.
r2 = Restaurant.objects.get(pk=r.pk)
p.restaurant = r2
- self.assertTrue(p.restaurant is r2)
+ self.assertIs(p.restaurant, r2)
# Assigning None succeeds if field is null=True.
ug_bar = UndergroundBar.objects.create(place=p, serves_cocktails=False)
ug_bar.place = None
- self.assertTrue(ug_bar.place is None)
+ self.assertIsNone(ug_bar.place)
# Assigning None fails: Place.restaurant is null=False
self.assertRaises(ValueError, setattr, p, 'restaurant', None)
@@ -217,13 +217,13 @@ class OneToOneTests(TestCase):
# Creation using keyword argument should cache the related object.
p = Place.objects.get(name="Demon Dogs")
r = Restaurant(place=p)
- self.assertTrue(r.place is p)
+ self.assertIs(r.place, p)
# Creation using attname keyword argument and an id will cause the related
# object to be fetched.
p = Place.objects.get(name="Demon Dogs")
r = Restaurant(place_id=p.id)
- self.assertFalse(r.place is p)
+ self.assertIsNot(r.place, p)
self.assertEqual(r.place, p)
def test_filter_one_to_one_relations(self):