summaryrefslogtreecommitdiff
path: root/tests/one_to_one
diff options
context:
space:
mode:
authorHasan Ramezani <hasan.r67@gmail.com>2020-10-18 18:29:52 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-11-06 09:24:50 +0100
commit3f7b3275627385f8f7531fca01cdda50d4ec6b6e (patch)
treefb082d40e73f6c877911eab92229ac21cdfaa5bc /tests/one_to_one
parent13b6fff11703a694e155b84d41d02822bbc0aaa0 (diff)
downloaddjango-3f7b3275627385f8f7531fca01cdda50d4ec6b6e.tar.gz
Fixed #31235 -- Made assertQuerysetEqual() compare querysets directly.
This also replaces assertQuerysetEqual() to assertSequenceEqual()/assertCountEqual() where appropriate. Co-authored-by: Peter Inglesby <peter.inglesby@gmail.com> Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Diffstat (limited to 'tests/one_to_one')
-rw-r--r--tests/one_to_one/tests.py18
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/one_to_one/tests.py b/tests/one_to_one/tests.py
index bb3e5aebbf..6100e53208 100644
--- a/tests/one_to_one/tests.py
+++ b/tests/one_to_one/tests.py
@@ -46,15 +46,10 @@ class OneToOneTests(TestCase):
def test_manager_all(self):
# Restaurant.objects.all() just returns the Restaurants, not the Places.
- self.assertQuerysetEqual(Restaurant.objects.all(), [
- '<Restaurant: Demon Dogs the restaurant>',
- ])
+ self.assertSequenceEqual(Restaurant.objects.all(), [self.r1])
# Place.objects.all() returns all Places, regardless of whether they
# have Restaurants.
- self.assertQuerysetEqual(Place.objects.order_by('name'), [
- '<Place: Ace Hardware the place>',
- '<Place: Demon Dogs the place>',
- ])
+ self.assertSequenceEqual(Place.objects.order_by('name'), [self.p2, self.p1])
def test_manager_get(self):
def assert_get_restaurant(**params):
@@ -92,9 +87,7 @@ class OneToOneTests(TestCase):
# Query the waiters
def assert_filter_waiters(**params):
- self.assertQuerysetEqual(Waiter.objects.filter(**params), [
- '<Waiter: Joe the waiter at Demon Dogs the restaurant>'
- ])
+ self.assertSequenceEqual(Waiter.objects.filter(**params), [w])
assert_filter_waiters(restaurant__place__exact=self.p1.pk)
assert_filter_waiters(restaurant__place__exact=self.p1)
assert_filter_waiters(restaurant__place__pk=self.p1.pk)
@@ -169,10 +162,7 @@ class OneToOneTests(TestCase):
f = Favorites(name='Fred')
f.save()
f.restaurants.set([self.r1])
- self.assertQuerysetEqual(
- f.restaurants.all(),
- ['<Restaurant: Demon Dogs the restaurant>']
- )
+ self.assertSequenceEqual(f.restaurants.all(), [self.r1])
def test_reverse_object_cache(self):
"""