diff options
| author | Gregor Gärtner <code@gregorgaertner.de> | 2022-09-24 11:29:58 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-10-08 08:07:38 +0200 |
| commit | f0c06f8ab7904e1fd082f2de57337f6c7e05f177 (patch) | |
| tree | 2073bfe1bb55350d9516f9a54ad7d9895a84ca48 /tests/foreign_object | |
| parent | d795259ea96004df0a2469246229a146307bcd2c (diff) | |
| download | django-f0c06f8ab7904e1fd082f2de57337f6c7e05f177.tar.gz | |
Refs #33990 -- Renamed TransactionTestCase.assertQuerysetEqual() to assertQuerySetEqual().
Co-Authored-By: Michael Howitz <mh@gocept.com>
Diffstat (limited to 'tests/foreign_object')
| -rw-r--r-- | tests/foreign_object/test_agnostic_order_trimjoin.py | 4 | ||||
| -rw-r--r-- | tests/foreign_object/tests.py | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/tests/foreign_object/test_agnostic_order_trimjoin.py b/tests/foreign_object/test_agnostic_order_trimjoin.py index c5b8f66e7b..745da1d97f 100644 --- a/tests/foreign_object/test_agnostic_order_trimjoin.py +++ b/tests/foreign_object/test_agnostic_order_trimjoin.py @@ -13,14 +13,14 @@ class TestLookupQuery(TestCase): cls.contact1 = Contact.objects.create(company_code=1, customer_code=20) def test_deep_mixed_forward(self): - self.assertQuerysetEqual( + self.assertQuerySetEqual( Address.objects.filter(customer__contacts=self.contact1), [self.address.id], attrgetter("id"), ) def test_deep_mixed_backward(self): - self.assertQuerysetEqual( + self.assertQuerySetEqual( Contact.objects.filter(customer__address=self.address), [self.contact1.id], attrgetter("id"), diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py index fc41c043f5..733e40831c 100644 --- a/tests/foreign_object/tests.py +++ b/tests/foreign_object/tests.py @@ -113,7 +113,7 @@ class MultiColumnFKTests(TestCase): group_id=self.cia.id, ) - self.assertQuerysetEqual( + self.assertQuerySetEqual( Membership.objects.filter(person__name__contains="o"), [self.bob.id], attrgetter("person_id"), @@ -146,7 +146,7 @@ class MultiColumnFKTests(TestCase): date_joined=timemark + timedelta, ) - self.assertQuerysetEqual( + self.assertQuerySetEqual( Person.objects.filter(membership__date_joined__gte=timemark), ["Jim"], attrgetter("name"), @@ -171,14 +171,14 @@ class MultiColumnFKTests(TestCase): group_id=self.cia.id, ) - self.assertQuerysetEqual( + self.assertQuerySetEqual( Membership.objects.filter(person__in=[self.george, self.jim]), [ self.jim.id, ], attrgetter("person_id"), ) - self.assertQuerysetEqual( + self.assertQuerySetEqual( Membership.objects.filter(person__in=Person.objects.filter(name="Jim")), [ self.jim.id, @@ -281,7 +281,7 @@ class MultiColumnFKTests(TestCase): def test_m2m_through_forward_returns_valid_members(self): # We start out by making sure that the Group 'CIA' has no members. - self.assertQuerysetEqual(self.cia.members.all(), []) + self.assertQuerySetEqual(self.cia.members.all(), []) Membership.objects.create( membership_country=self.usa, person=self.bob, group=self.cia @@ -292,13 +292,13 @@ class MultiColumnFKTests(TestCase): # Bob and Jim should be members of the CIA. - self.assertQuerysetEqual( + self.assertQuerySetEqual( self.cia.members.all(), ["Bob", "Jim"], attrgetter("name") ) def test_m2m_through_reverse_returns_valid_members(self): # We start out by making sure that Bob is in no groups. - self.assertQuerysetEqual(self.bob.groups.all(), []) + self.assertQuerySetEqual(self.bob.groups.all(), []) Membership.objects.create( membership_country=self.usa, person=self.bob, group=self.cia @@ -308,13 +308,13 @@ class MultiColumnFKTests(TestCase): ) # Bob should be in the CIA and a Republican - self.assertQuerysetEqual( + self.assertQuerySetEqual( self.bob.groups.all(), ["CIA", "Republican"], attrgetter("name") ) def test_m2m_through_forward_ignores_invalid_members(self): # We start out by making sure that the Group 'CIA' has no members. - self.assertQuerysetEqual(self.cia.members.all(), []) + self.assertQuerySetEqual(self.cia.members.all(), []) # Something adds jane to group CIA but Jane is in Soviet Union which # isn't CIA's country. @@ -323,11 +323,11 @@ class MultiColumnFKTests(TestCase): ) # There should still be no members in CIA - self.assertQuerysetEqual(self.cia.members.all(), []) + self.assertQuerySetEqual(self.cia.members.all(), []) def test_m2m_through_reverse_ignores_invalid_members(self): # We start out by making sure that Jane has no groups. - self.assertQuerysetEqual(self.jane.groups.all(), []) + self.assertQuerySetEqual(self.jane.groups.all(), []) # Something adds jane to group CIA but Jane is in Soviet Union which # isn't CIA's country. @@ -336,10 +336,10 @@ class MultiColumnFKTests(TestCase): ) # Jane should still not be in any groups - self.assertQuerysetEqual(self.jane.groups.all(), []) + self.assertQuerySetEqual(self.jane.groups.all(), []) def test_m2m_through_on_self_works(self): - self.assertQuerysetEqual(self.jane.friends.all(), []) + self.assertQuerySetEqual(self.jane.friends.all(), []) Friendship.objects.create( from_friend_country=self.jane.person_country, @@ -348,12 +348,12 @@ class MultiColumnFKTests(TestCase): to_friend=self.george, ) - self.assertQuerysetEqual( + self.assertQuerySetEqual( self.jane.friends.all(), ["George"], attrgetter("name") ) def test_m2m_through_on_self_ignores_mismatch_columns(self): - self.assertQuerysetEqual(self.jane.friends.all(), []) + self.assertQuerySetEqual(self.jane.friends.all(), []) # Note that we use ids instead of instances. This is because instances # on ForeignObject properties will set all related field off of the @@ -365,7 +365,7 @@ class MultiColumnFKTests(TestCase): from_friend_country_id=self.george.person_country_id, ) - self.assertQuerysetEqual(self.jane.friends.all(), []) + self.assertQuerySetEqual(self.jane.friends.all(), []) def test_prefetch_related_m2m_forward_works(self): Membership.objects.create( |
