Refs #33990 -- Renamed TransactionTestCase.assertQuerysetEqual() to assertQuerySetEqual().

Co-Authored-By: Michael Howitz <mh@gocept.com>

1 files changed, 46 insertions, 46 deletions

diff --git a/tests/custom_managers/tests.py b/tests/custom_managers/tests.py
index 5ae5c719d8..b84b157da5 100644
--- a/tests/custom_managers/tests.py
+++ b/tests/custom_managers/tests.py
@@ -44,7 +44,7 @@ class CustomManagerTests(TestCase):
         """
         Test a custom Manager method.
         """
-        self.assertQuerysetEqual(Person.objects.get_fun_people(), ["Bugs Bunny"], str)
+        self.assertQuerySetEqual(Person.objects.get_fun_people(), ["Bugs Bunny"], str)
 
     def test_queryset_copied_to_default(self):
         """
@@ -83,7 +83,7 @@ class CustomManagerTests(TestCase):
             with self.subTest(manager_name=manager_name):
                 manager = getattr(Person, manager_name)
                 queryset = manager.filter()
-                self.assertQuerysetEqual(queryset, ["Bugs Bunny"], str)
+                self.assertQuerySetEqual(queryset, ["Bugs Bunny"], str)
                 self.assertIs(queryset._filter_CustomQuerySet, True)
 
                 # Specialized querysets inherit from our custom queryset.
@@ -116,7 +116,7 @@ class CustomManagerTests(TestCase):
         Queryset method doesn't override the custom manager method.
         """
         queryset = Person.custom_queryset_custom_manager.filter()
-        self.assertQuerysetEqual(queryset, ["Bugs Bunny"], str)
+        self.assertQuerySetEqual(queryset, ["Bugs Bunny"], str)
         self.assertIs(queryset._filter_CustomManager, True)
 
     def test_related_manager(self):
@@ -139,7 +139,7 @@ class CustomManagerTests(TestCase):
         """
         Custom managers respond to usual filtering methods
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Book.published_objects.all(),
             [
                 "How to program",
@@ -161,7 +161,7 @@ class CustomManagerTests(TestCase):
             first_name="Droopy", last_name="Dog", fun=False, favorite_book=self.b1
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books.order_by("first_name").all(),
             [
                 "Bugs",
@@ -170,7 +170,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.fun_people_favorite_books.all(),
             [
                 "Bugs",
@@ -178,7 +178,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books(manager="boring_people").all(),
             [
                 "Droopy",
@@ -186,7 +186,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books(manager="fun_people").all(),
             [
                 "Bugs",
@@ -209,7 +209,7 @@ class CustomManagerTests(TestCase):
             first_name="Droopy", last_name="Dog", fun=False, favorite_thing=self.b1
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things.all(),
             [
                 "Bugs",
@@ -218,7 +218,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.fun_people_favorite_things.all(),
             [
                 "Bugs",
@@ -226,7 +226,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things(manager="boring_people").all(),
             [
                 "Droopy",
@@ -234,7 +234,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things(manager="fun_people").all(),
             [
                 "Bugs",
@@ -255,7 +255,7 @@ class CustomManagerTests(TestCase):
         )
         self.b1.fun_authors.add(droopy)
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors.order_by("first_name").all(),
             [
                 "Bugs",
@@ -264,7 +264,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.fun_authors.order_by("first_name").all(),
             [
                 "Bugs",
@@ -272,7 +272,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors(manager="boring_people").all(),
             [
                 "Droopy",
@@ -280,7 +280,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors(manager="fun_people").all(),
             [
                 "Bugs",
@@ -298,7 +298,7 @@ class CustomManagerTests(TestCase):
         )
 
         self.b1.fun_people_favorite_books.remove(droopy, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FunPerson._base_manager.filter(favorite_book=self.b1),
             [
                 "Bugs",
@@ -309,7 +309,7 @@ class CustomManagerTests(TestCase):
         )
 
         self.b1.fun_people_favorite_books.remove(bugs, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FunPerson._base_manager.filter(favorite_book=self.b1),
             [
                 "Droopy",
@@ -321,7 +321,7 @@ class CustomManagerTests(TestCase):
         bugs.save()
 
         self.b1.fun_people_favorite_books.clear(bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FunPerson._base_manager.filter(favorite_book=self.b1),
             [
                 "Droopy",
@@ -343,7 +343,7 @@ class CustomManagerTests(TestCase):
 
         # The fun manager DOESN'T remove boring people.
         self.b1.favorite_books(manager="fun_people").remove(droopy, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books(manager="boring_people").all(),
             [
                 "Droopy",
@@ -353,7 +353,7 @@ class CustomManagerTests(TestCase):
         )
         # The boring manager DOES remove boring people.
         self.b1.favorite_books(manager="boring_people").remove(droopy, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books(manager="boring_people").all(),
             [],
             lambda c: c.first_name,
@@ -364,7 +364,7 @@ class CustomManagerTests(TestCase):
 
         # The fun manager ONLY clears fun people.
         self.b1.favorite_books(manager="fun_people").clear(bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books(manager="boring_people").all(),
             [
                 "Droopy",
@@ -372,7 +372,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_books(manager="fun_people").all(),
             [],
             lambda c: c.first_name,
@@ -391,7 +391,7 @@ class CustomManagerTests(TestCase):
         )
 
         self.b1.fun_people_favorite_things.remove(droopy, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FunPerson._base_manager.order_by("first_name").filter(
                 favorite_thing_id=self.b1.pk
             ),
@@ -404,7 +404,7 @@ class CustomManagerTests(TestCase):
         )
 
         self.b1.fun_people_favorite_things.remove(bugs, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FunPerson._base_manager.order_by("first_name").filter(
                 favorite_thing_id=self.b1.pk
             ),
@@ -418,7 +418,7 @@ class CustomManagerTests(TestCase):
         bugs.save()
 
         self.b1.fun_people_favorite_things.clear(bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FunPerson._base_manager.order_by("first_name").filter(
                 favorite_thing_id=self.b1.pk
             ),
@@ -442,7 +442,7 @@ class CustomManagerTests(TestCase):
 
         # The fun manager DOESN'T remove boring people.
         self.b1.favorite_things(manager="fun_people").remove(droopy, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things(manager="boring_people").all(),
             [
                 "Droopy",
@@ -453,7 +453,7 @@ class CustomManagerTests(TestCase):
 
         # The boring manager DOES remove boring people.
         self.b1.favorite_things(manager="boring_people").remove(droopy, bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things(manager="boring_people").all(),
             [],
             lambda c: c.first_name,
@@ -464,7 +464,7 @@ class CustomManagerTests(TestCase):
 
         # The fun manager ONLY clears fun people.
         self.b1.favorite_things(manager="fun_people").clear(bulk=bulk)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things(manager="boring_people").all(),
             [
                 "Droopy",
@@ -472,7 +472,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.favorite_things(manager="fun_people").all(),
             [],
             lambda c: c.first_name,
@@ -491,7 +491,7 @@ class CustomManagerTests(TestCase):
         self.b1.fun_authors.add(droopy)
 
         self.b1.fun_authors.remove(droopy)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.fun_authors.through._default_manager.all(),
             [
                 "Bugs",
@@ -502,7 +502,7 @@ class CustomManagerTests(TestCase):
         )
 
         self.b1.fun_authors.remove(bugs)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.fun_authors.through._default_manager.all(),
             [
                 "Droopy",
@@ -513,7 +513,7 @@ class CustomManagerTests(TestCase):
         self.b1.fun_authors.add(bugs)
 
         self.b1.fun_authors.clear()
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.fun_authors.through._default_manager.all(),
             [
                 "Droopy",
@@ -530,7 +530,7 @@ class CustomManagerTests(TestCase):
 
         # The fun manager DOESN'T remove boring people.
         self.b1.authors(manager="fun_people").remove(droopy)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors(manager="boring_people").all(),
             [
                 "Droopy",
@@ -541,7 +541,7 @@ class CustomManagerTests(TestCase):
 
         # The boring manager DOES remove boring people.
         self.b1.authors(manager="boring_people").remove(droopy)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors(manager="boring_people").all(),
             [],
             lambda c: c.first_name,
@@ -551,7 +551,7 @@ class CustomManagerTests(TestCase):
 
         # The fun manager ONLY clears fun people.
         self.b1.authors(manager="fun_people").clear()
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors(manager="boring_people").all(),
             [
                 "Droopy",
@@ -559,7 +559,7 @@ class CustomManagerTests(TestCase):
             lambda c: c.first_name,
             ordered=False,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             self.b1.authors(manager="fun_people").all(),
             [],
             lambda c: c.first_name,
@@ -628,7 +628,7 @@ class CustomManagerTests(TestCase):
         It will be inherited by the abstract model's children.
         """
         PersonFromAbstract.abstract_persons.create(objects="Test")
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             PersonFromAbstract.abstract_persons.all(),
             ["Test"],
             lambda c: c.objects,
@@ -642,7 +642,7 @@ class TestCars(TestCase):
         Car.cars.create(name="Corvette", mileage=21, top_speed=180)
         Car.cars.create(name="Neon", mileage=31, top_speed=100)
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Car._default_manager.order_by("name"),
             [
                 "Corvette",
@@ -650,7 +650,7 @@ class TestCars(TestCase):
             ],
             lambda c: c.name,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Car.cars.order_by("name"),
             [
                 "Corvette",
@@ -659,7 +659,7 @@ class TestCars(TestCase):
             lambda c: c.name,
         )
         # alternate manager
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Car.fast_cars.all(),
             [
                 "Corvette",
@@ -667,7 +667,7 @@ class TestCars(TestCase):
             lambda c: c.name,
         )
         # explicit default manager
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FastCarAsDefault.cars.order_by("name"),
             [
                 "Corvette",
@@ -675,7 +675,7 @@ class TestCars(TestCase):
             ],
             lambda c: c.name,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FastCarAsDefault._default_manager.all(),
             [
                 "Corvette",
@@ -683,7 +683,7 @@ class TestCars(TestCase):
             lambda c: c.name,
         )
         # explicit base manager
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FastCarAsBase.cars.order_by("name"),
             [
                 "Corvette",
@@ -691,7 +691,7 @@ class TestCars(TestCase):
             ],
             lambda c: c.name,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             FastCarAsBase._base_manager.all(),
             [
                 "Corvette",
@@ -779,4 +779,4 @@ class CustomManagersRegressTestCase(TestCase):
         """
         qs_custom = Person.custom_init_queryset_manager.all()
         qs_default = Person.objects.all()
-        self.assertQuerysetEqual(qs_custom, qs_default)
+        self.assertQuerySetEqual(qs_custom, qs_default)