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

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

17 files changed, 113 insertions, 113 deletions

diff --git a/tests/db_functions/comparison/test_coalesce.py b/tests/db_functions/comparison/test_coalesce.py
index d5f6a7a6a2..b08ae742df 100644
--- a/tests/db_functions/comparison/test_coalesce.py
+++ b/tests/db_functions/comparison/test_coalesce.py
@@ -15,7 +15,7 @@ class CoalesceTests(TestCase):
         Author.objects.create(name="John Smith", alias="smithj")
         Author.objects.create(name="Rhonda")
         authors = Author.objects.annotate(display_name=Coalesce("alias", "name"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["smithj", "Rhonda"], lambda a: a.display_name
         )
 
@@ -39,7 +39,7 @@ class CoalesceTests(TestCase):
         article = Article.objects.annotate(
             headline=Coalesce("summary", "text", output_field=TextField()),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             article.order_by("title"), [lorem_ipsum], lambda a: a.headline
         )
         # mixed Text and Char wrapped
@@ -48,7 +48,7 @@ class CoalesceTests(TestCase):
                 Lower("summary"), Lower("text"), output_field=TextField()
             ),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             article.order_by("title"), [lorem_ipsum.lower()], lambda a: a.headline
         )
 
@@ -56,11 +56,11 @@ class CoalesceTests(TestCase):
         Author.objects.create(name="John Smith", alias="smithj")
         Author.objects.create(name="Rhonda")
         authors = Author.objects.order_by(Coalesce("alias", "name"))
-        self.assertQuerysetEqual(authors, ["Rhonda", "John Smith"], lambda a: a.name)
+        self.assertQuerySetEqual(authors, ["Rhonda", "John Smith"], lambda a: a.name)
         authors = Author.objects.order_by(Coalesce("alias", "name").asc())
-        self.assertQuerysetEqual(authors, ["Rhonda", "John Smith"], lambda a: a.name)
+        self.assertQuerySetEqual(authors, ["Rhonda", "John Smith"], lambda a: a.name)
         authors = Author.objects.order_by(Coalesce("alias", "name").desc())
-        self.assertQuerysetEqual(authors, ["John Smith", "Rhonda"], lambda a: a.name)
+        self.assertQuerySetEqual(authors, ["John Smith", "Rhonda"], lambda a: a.name)
 
     def test_empty_queryset(self):
         Author.objects.create(name="John Smith")
diff --git a/tests/db_functions/datetime/test_extract_trunc.py b/tests/db_functions/datetime/test_extract_trunc.py
index 00e3897e68..2d38234981 100644
--- a/tests/db_functions/datetime/test_extract_trunc.py
+++ b/tests/db_functions/datetime/test_extract_trunc.py
@@ -277,21 +277,21 @@ class DateFunctionTests(TestCase):
         ):
             list(DTModel.objects.annotate(extracted=Extract("start_date", "second")))
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "year")
             ).order_by("start_datetime"),
             [(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "quarter")
             ).order_by("start_datetime"),
             [(start_datetime, 2), (end_datetime, 2)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "month")
             ).order_by("start_datetime"),
@@ -301,21 +301,21 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "day")
             ).order_by("start_datetime"),
             [(start_datetime, start_datetime.day), (end_datetime, end_datetime.day)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "week")
             ).order_by("start_datetime"),
             [(start_datetime, 25), (end_datetime, 24)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "week_day")
             ).order_by("start_datetime"),
@@ -325,7 +325,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "iso_week_day"),
             ).order_by("start_datetime"),
@@ -335,14 +335,14 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "hour")
             ).order_by("start_datetime"),
             [(start_datetime, start_datetime.hour), (end_datetime, end_datetime.hour)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "minute")
             ).order_by("start_datetime"),
@@ -352,7 +352,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=Extract("start_datetime", "second")
             ).order_by("start_datetime"),
@@ -417,7 +417,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=Extract("duration", "second")).order_by(
                 "start_datetime"
             ),
@@ -465,14 +465,14 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractYear("start_datetime")).order_by(
                 "start_datetime"
             ),
             [(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractYear("start_date")).order_by(
                 "start_datetime"
             ),
@@ -494,14 +494,14 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractIsoYear("start_datetime")
             ).order_by("start_datetime"),
             [(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractIsoYear("start_date")).order_by(
                 "start_datetime"
             ),
@@ -538,7 +538,7 @@ class DateFunctionTests(TestCase):
             )
             .order_by("start_datetime")
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 (week_52_day_2014, 2014),
@@ -569,7 +569,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractMonth("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -579,7 +579,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractMonth("start_date")).order_by(
                 "start_datetime"
             ),
@@ -604,14 +604,14 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractDay("start_datetime")).order_by(
                 "start_datetime"
             ),
             [(start_datetime, start_datetime.day), (end_datetime, end_datetime.day)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractDay("start_date")).order_by(
                 "start_datetime"
             ),
@@ -633,14 +633,14 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractWeek("start_datetime")).order_by(
                 "start_datetime"
             ),
             [(start_datetime, 25), (end_datetime, 24)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractWeek("start_date")).order_by(
                 "start_datetime"
             ),
@@ -663,14 +663,14 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractQuarter("start_datetime")
             ).order_by("start_datetime"),
             [(start_datetime, 2), (end_datetime, 3)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractQuarter("start_date")).order_by(
                 "start_datetime"
             ),
@@ -704,7 +704,7 @@ class DateFunctionTests(TestCase):
             )
             .order_by("start_datetime")
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 (last_quarter_2014, 4),
@@ -737,7 +737,7 @@ class DateFunctionTests(TestCase):
             )
             .order_by("start_datetime")
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 (week_52_day_2014, 52),
@@ -755,7 +755,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractWeekDay("start_datetime")
             ).order_by("start_datetime"),
@@ -765,7 +765,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractWeekDay("start_date")).order_by(
                 "start_datetime"
             ),
@@ -790,7 +790,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractIsoWeekDay("start_datetime"),
             ).order_by("start_datetime"),
@@ -800,7 +800,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractIsoWeekDay("start_date"),
             ).order_by("start_datetime"),
@@ -825,14 +825,14 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractHour("start_datetime")).order_by(
                 "start_datetime"
             ),
             [(start_datetime, start_datetime.hour), (end_datetime, end_datetime.hour)],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractHour("start_time")).order_by(
                 "start_datetime"
             ),
@@ -854,7 +854,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractMinute("start_datetime")
             ).order_by("start_datetime"),
@@ -864,7 +864,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractMinute("start_time")).order_by(
                 "start_datetime"
             ),
@@ -889,7 +889,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 extracted=ExtractSecond("start_datetime")
             ).order_by("start_datetime"),
@@ -899,7 +899,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=ExtractSecond("start_time")).order_by(
                 "start_datetime"
             ),
@@ -963,7 +963,7 @@ class DateFunctionTests(TestCase):
         self.create_model(end_datetime, start_datetime)
 
         def test_datetime_kind(kind):
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 DTModel.objects.annotate(
                     truncated=Trunc(
                         "start_datetime", kind, output_field=DateTimeField()
@@ -977,7 +977,7 @@ class DateFunctionTests(TestCase):
             )
 
         def test_date_kind(kind):
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 DTModel.objects.annotate(
                     truncated=Trunc("start_date", kind, output_field=DateField())
                 ).order_by("start_datetime"),
@@ -989,7 +989,7 @@ class DateFunctionTests(TestCase):
             )
 
         def test_time_kind(kind):
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 DTModel.objects.annotate(
                     truncated=Trunc("start_time", kind, output_field=TimeField())
                 ).order_by("start_datetime"),
@@ -1001,7 +1001,7 @@ class DateFunctionTests(TestCase):
             )
 
         def test_datetime_to_time_kind(kind):
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 DTModel.objects.annotate(
                     truncated=Trunc("start_datetime", kind, output_field=TimeField()),
                 ).order_by("start_datetime"),
@@ -1044,7 +1044,7 @@ class DateFunctionTests(TestCase):
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 truncated=Trunc("start_datetime", "week", output_field=DateTimeField())
             ).order_by("start_datetime"),
@@ -1054,7 +1054,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.truncated),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(
                 truncated=Trunc("start_date", "week", output_field=DateField())
             ).order_by("start_datetime"),
@@ -1137,7 +1137,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncYear("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1147,7 +1147,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncYear("start_date")).order_by(
                 "start_datetime"
             ),
@@ -1194,7 +1194,7 @@ class DateFunctionTests(TestCase):
         self.create_model(start_datetime=end_datetime, end_datetime=start_datetime)
         self.create_model(start_datetime=last_quarter_2015, end_datetime=end_datetime)
         self.create_model(start_datetime=first_quarter_2016, end_datetime=end_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncQuarter("start_date")).order_by(
                 "start_datetime"
             ),
@@ -1206,7 +1206,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncQuarter("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1241,7 +1241,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncMonth("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1251,7 +1251,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncMonth("start_date")).order_by(
                 "start_datetime"
             ),
@@ -1288,7 +1288,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncWeek("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1325,7 +1325,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncDate("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1372,7 +1372,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncTime("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1446,7 +1446,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncDay("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1482,7 +1482,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncHour("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1492,7 +1492,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncHour("start_time")).order_by(
                 "start_datetime"
             ),
@@ -1529,7 +1529,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncMinute("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1539,7 +1539,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncMinute("start_time")).order_by(
                 "start_datetime"
             ),
@@ -1578,7 +1578,7 @@ class DateFunctionTests(TestCase):
             end_datetime = timezone.make_aware(end_datetime)
         self.create_model(start_datetime, end_datetime)
         self.create_model(end_datetime, start_datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncSecond("start_datetime")).order_by(
                 "start_datetime"
             ),
@@ -1588,7 +1588,7 @@ class DateFunctionTests(TestCase):
             ],
             lambda m: (m.start_datetime, m.extracted),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             DTModel.objects.annotate(extracted=TruncSecond("start_time")).order_by(
                 "start_datetime"
             ),
@@ -1909,7 +1909,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
             with self.subTest(repr(melb)):
 
                 def test_datetime_kind(kind):
-                    self.assertQuerysetEqual(
+                    self.assertQuerySetEqual(
                         DTModel.objects.annotate(
                             truncated=Trunc(
                                 "start_datetime",
@@ -1934,7 +1934,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
                     )
 
                 def test_datetime_to_date_kind(kind):
-                    self.assertQuerysetEqual(
+                    self.assertQuerySetEqual(
                         DTModel.objects.annotate(
                             truncated=Trunc(
                                 "start_datetime",
@@ -1959,7 +1959,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
                     )
 
                 def test_datetime_to_time_kind(kind):
-                    self.assertQuerysetEqual(
+                    self.assertQuerySetEqual(
                         DTModel.objects.annotate(
                             truncated=Trunc(
                                 "start_datetime",
diff --git a/tests/db_functions/datetime/test_now.py b/tests/db_functions/datetime/test_now.py
index 716c5744e9..64f56fdb58 100644
--- a/tests/db_functions/datetime/test_now.py
+++ b/tests/db_functions/datetime/test_now.py
@@ -39,12 +39,12 @@ class NowTests(TestCase):
         a2.save()
         a2.refresh_from_db()
         self.assertIsInstance(a2.published, datetime)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(published__lte=Now()),
             ["How to Django"],
             lambda a: a.title,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(published__gt=Now()),
             ["How to Time Travel"],
             lambda a: a.title,
diff --git a/tests/db_functions/tests.py b/tests/db_functions/tests.py
index e5b73cdaac..5fb15d4fd9 100644
--- a/tests/db_functions/tests.py
+++ b/tests/db_functions/tests.py
@@ -17,7 +17,7 @@ class FunctionTests(TestCase):
         Author.objects.create(name="Rhonda Simpson", alias="ronny")
 
         authors = Author.objects.order_by(Length(Coalesce("alias", "name")))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors,
             [
                 "Rhonda Simpson",
@@ -27,7 +27,7 @@ class FunctionTests(TestCase):
         )
 
         authors = Author.objects.order_by(Length(Coalesce("alias", "name")).desc())
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors,
             [
                 "John Smith",
@@ -41,7 +41,7 @@ class FunctionTests(TestCase):
             Author.objects.create(name="John Smith", alias="smithj")
             Author.objects.create(name="Rhonda")
             authors = Author.objects.filter(name__upper__exact="john smith")
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 authors.order_by("name"),
                 [
                     "John Smith",
@@ -54,7 +54,7 @@ class FunctionTests(TestCase):
             Author.objects.create(name="John Smith", alias="smithj")
             Author.objects.create(name="Rhonda")
             authors = Author.objects.filter(name__upper__in=["john smith", "rhonda"])
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 authors.order_by("name"),
                 [
                     "John Smith",
@@ -66,12 +66,12 @@ class FunctionTests(TestCase):
     def test_function_as_filter(self):
         Author.objects.create(name="John Smith", alias="SMITHJ")
         Author.objects.create(name="Rhonda")
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Author.objects.filter(alias=Upper(V("smithj"))),
             ["John Smith"],
             lambda x: x.name,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Author.objects.exclude(alias=Upper(V("smithj"))),
             ["Rhonda"],
             lambda x: x.name,
diff --git a/tests/db_functions/text/test_concat.py b/tests/db_functions/text/test_concat.py
index 5932a9bed0..1441e31e97 100644
--- a/tests/db_functions/text/test_concat.py
+++ b/tests/db_functions/text/test_concat.py
@@ -21,7 +21,7 @@ class ConcatTests(TestCase):
         Author.objects.create(name="Margaret", goes_by="Maggie")
         Author.objects.create(name="Rhonda", alias="adnohR")
         authors = Author.objects.annotate(joined=Concat("alias", "goes_by"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"),
             [
                 "",
@@ -46,7 +46,7 @@ class ConcatTests(TestCase):
         authors = Author.objects.annotate(
             joined=Concat("name", V(" ("), "goes_by", V(")"), output_field=CharField()),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"),
             [
                 "Jayden ()",
diff --git a/tests/db_functions/text/test_left.py b/tests/db_functions/text/test_left.py
index 8871f9ac79..aa2944c7e3 100644
--- a/tests/db_functions/text/test_left.py
+++ b/tests/db_functions/text/test_left.py
@@ -13,12 +13,12 @@ class LeftTests(TestCase):
 
     def test_basic(self):
         authors = Author.objects.annotate(name_part=Left("name", 5))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["John ", "Rhond"], lambda a: a.name_part
         )
         # If alias is null, set it to the first 2 lower characters of the name.
         Author.objects.filter(alias__isnull=True).update(alias=Lower(Left("name", 2)))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["smithj", "rh"], lambda a: a.alias
         )
 
@@ -30,6 +30,6 @@ class LeftTests(TestCase):
         authors = Author.objects.annotate(
             name_part=Left("name", Value(3, output_field=IntegerField()))
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["Joh", "Rho"], lambda a: a.name_part
         )
diff --git a/tests/db_functions/text/test_length.py b/tests/db_functions/text/test_length.py
index c6afead6aa..5fb2650beb 100644
--- a/tests/db_functions/text/test_length.py
+++ b/tests/db_functions/text/test_length.py
@@ -14,7 +14,7 @@ class LengthTests(TestCase):
             name_length=Length("name"),
             alias_length=Length("alias"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"),
             [(10, 6), (6, None)],
             lambda a: (a.name_length, a.alias_length),
@@ -26,7 +26,7 @@ class LengthTests(TestCase):
         Author.objects.create(name="John Smith", alias="smithj1")
         Author.objects.create(name="Rhonda", alias="ronny")
         authors = Author.objects.order_by(Length("name"), Length("alias"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors,
             [
                 ("Rhonda", "ronny"),
@@ -41,6 +41,6 @@ class LengthTests(TestCase):
             Author.objects.create(name="John Smith", alias="smithj")
             Author.objects.create(name="Rhonda")
             authors = Author.objects.filter(name__length__gt=7)
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 authors.order_by("name"), ["John Smith"], lambda a: a.name
             )
diff --git a/tests/db_functions/text/test_lower.py b/tests/db_functions/text/test_lower.py
index f4bdc04573..a1feabc52a 100644
--- a/tests/db_functions/text/test_lower.py
+++ b/tests/db_functions/text/test_lower.py
@@ -11,11 +11,11 @@ class LowerTests(TestCase):
         Author.objects.create(name="John Smith", alias="smithj")
         Author.objects.create(name="Rhonda")
         authors = Author.objects.annotate(lower_name=Lower("name"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["john smith", "rhonda"], lambda a: a.lower_name
         )
         Author.objects.update(name=Lower("name"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"),
             [
                 ("john smith", "john smith"),
@@ -35,6 +35,6 @@ class LowerTests(TestCase):
             Author.objects.create(name="John Smith", alias="smithj")
             Author.objects.create(name="Rhonda")
             authors = Author.objects.filter(name__lower__exact="john smith")
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 authors.order_by("name"), ["John Smith"], lambda a: a.name
             )
diff --git a/tests/db_functions/text/test_pad.py b/tests/db_functions/text/test_pad.py
index 006a27c0e8..6ae5e7496b 100644
--- a/tests/db_functions/text/test_pad.py
+++ b/tests/db_functions/text/test_pad.py
@@ -35,7 +35,7 @@ class PadTests(TestCase):
         for function, padded_name in tests:
             with self.subTest(function=function):
                 authors = Author.objects.annotate(padded_name=function)
-                self.assertQuerysetEqual(
+                self.assertQuerySetEqual(
                     authors, [padded_name], lambda a: a.padded_name, ordered=False
                 )
 
@@ -51,7 +51,7 @@ class PadTests(TestCase):
         Author.objects.create(name="Rhonda", alias="john_smith")
         Author.objects.create(name="♥♣♠", alias="bytes")
         authors = Author.objects.annotate(filled=LPad("name", Length("alias")))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("alias"),
             ["  ♥♣♠", "    Rhonda"],
             lambda a: a.filled,
diff --git a/tests/db_functions/text/test_repeat.py b/tests/db_functions/text/test_repeat.py
index c2d21eae50..3a68958676 100644
--- a/tests/db_functions/text/test_repeat.py
+++ b/tests/db_functions/text/test_repeat.py
@@ -24,7 +24,7 @@ class RepeatTests(TestCase):
         for function, repeated_text in tests:
             with self.subTest(function=function):
                 authors = Author.objects.annotate(repeated_text=function)
-                self.assertQuerysetEqual(
+                self.assertQuerySetEqual(
                     authors, [repeated_text], lambda a: a.repeated_text, ordered=False
                 )
 
diff --git a/tests/db_functions/text/test_replace.py b/tests/db_functions/text/test_replace.py
index 28e39faf09..8b4d6ae9fe 100644
--- a/tests/db_functions/text/test_replace.py
+++ b/tests/db_functions/text/test_replace.py
@@ -15,7 +15,7 @@ class ReplaceTests(TestCase):
         qs = Author.objects.annotate(
             without_middlename=Replace(F("name"), Value("R. R. "), Value("")),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 ("George R. R. Martin", "George Martin"),
@@ -29,7 +29,7 @@ class ReplaceTests(TestCase):
         qs = Author.objects.annotate(
             same_name=Replace(F("name"), Value("r. r."), Value(""))
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 ("George R. R. Martin", "George R. R. Martin"),
@@ -45,7 +45,7 @@ class ReplaceTests(TestCase):
                 Concat(Value("Author: "), F("name")), Value("Author: "), Value("")
             ),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 ("George R. R. Martin", "George R. R. Martin"),
@@ -59,7 +59,7 @@ class ReplaceTests(TestCase):
         Author.objects.update(
             name=Replace(F("name"), Value("R. R. "), Value("")),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Author.objects.all(),
             [
                 ("George Martin"),
@@ -72,7 +72,7 @@ class ReplaceTests(TestCase):
     def test_replace_with_default_arg(self):
         # The default replacement is an empty string.
         qs = Author.objects.annotate(same_name=Replace(F("name"), Value("R. R. ")))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 ("George R. R. Martin", "George Martin"),
diff --git a/tests/db_functions/text/test_reverse.py b/tests/db_functions/text/test_reverse.py
index 4d1a81ccf2..62d769d80c 100644
--- a/tests/db_functions/text/test_reverse.py
+++ b/tests/db_functions/text/test_reverse.py
@@ -25,7 +25,7 @@ class ReverseTests(TestCase):
 
     def test_basic(self):
         authors = Author.objects.annotate(backward=Reverse("name"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors,
             [
                 ("John Smith", "htimS nhoJ"),
diff --git a/tests/db_functions/text/test_right.py b/tests/db_functions/text/test_right.py
index 8c271fcf7d..126f1583a5 100644
--- a/tests/db_functions/text/test_right.py
+++ b/tests/db_functions/text/test_right.py
@@ -13,12 +13,12 @@ class RightTests(TestCase):
 
     def test_basic(self):
         authors = Author.objects.annotate(name_part=Right("name", 5))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["Smith", "honda"], lambda a: a.name_part
         )
         # If alias is null, set it to the first 2 lower characters of the name.
         Author.objects.filter(alias__isnull=True).update(alias=Lower(Right("name", 2)))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["smithj", "da"], lambda a: a.alias
         )
 
@@ -30,6 +30,6 @@ class RightTests(TestCase):
         authors = Author.objects.annotate(
             name_part=Right("name", Value(3, output_field=IntegerField()))
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["ith", "nda"], lambda a: a.name_part
         )
diff --git a/tests/db_functions/text/test_strindex.py b/tests/db_functions/text/test_strindex.py
index 84305ea1b7..7120a6516e 100644
--- a/tests/db_functions/text/test_strindex.py
+++ b/tests/db_functions/text/test_strindex.py
@@ -12,7 +12,7 @@ class StrIndexTests(TestCase):
         Author.objects.create(name="J. R. R. Tolkien")
         Author.objects.create(name="Terry Pratchett")
         authors = Author.objects.annotate(fullstop=StrIndex("name", Value("R.")))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), [9, 4, 0], lambda a: a.fullstop
         )
 
@@ -28,7 +28,7 @@ class StrIndexTests(TestCase):
             written=timezone.now(),
         )
         articles = Article.objects.annotate(title_pos=StrIndex("text", "title"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             articles.order_by("title"), [15, 0], lambda a: a.title_pos
         )
 
@@ -36,7 +36,7 @@ class StrIndexTests(TestCase):
         Author.objects.create(name="Terry Pratchett")
         Author.objects.create(name="J. R. R. Tolkien")
         Author.objects.create(name="George. R. R. Martin")
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Author.objects.order_by(StrIndex("name", Value("R.")).asc()),
             [
                 "Terry Pratchett",
@@ -45,7 +45,7 @@ class StrIndexTests(TestCase):
             ],
             lambda a: a.name,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Author.objects.order_by(StrIndex("name", Value("R.")).desc()),
             [
                 "George. R. R. Martin",
@@ -60,12 +60,12 @@ class StrIndexTests(TestCase):
         Author.objects.create(name="皇帝")
         Author.objects.create(name="皇帝 ツリー")
         authors = Author.objects.annotate(sb=StrIndex("name", Value("リ")))
-        self.assertQuerysetEqual(authors.order_by("name"), [2, 0, 5], lambda a: a.sb)
+        self.assertQuerySetEqual(authors.order_by("name"), [2, 0, 5], lambda a: a.sb)
 
     def test_filtering(self):
         Author.objects.create(name="George. R. R. Martin")
         Author.objects.create(name="Terry Pratchett")
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Author.objects.annotate(middle_name=StrIndex("name", Value("R."))).filter(
                 middle_name__gt=0
             ),
diff --git a/tests/db_functions/text/test_substr.py b/tests/db_functions/text/test_substr.py
index 751995355c..702b40e8a9 100644
--- a/tests/db_functions/text/test_substr.py
+++ b/tests/db_functions/text/test_substr.py
@@ -10,18 +10,18 @@ class SubstrTests(TestCase):
         Author.objects.create(name="John Smith", alias="smithj")
         Author.objects.create(name="Rhonda")
         authors = Author.objects.annotate(name_part=Substr("name", 5, 3))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), [" Sm", "da"], lambda a: a.name_part
         )
         authors = Author.objects.annotate(name_part=Substr("name", 2))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["ohn Smith", "honda"], lambda a: a.name_part
         )
         # If alias is null, set to first 5 lower characters of the name.
         Author.objects.filter(alias__isnull=True).update(
             alias=Lower(Substr("name", 1, 5)),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["smithj", "rhond"], lambda a: a.alias
         )
 
@@ -43,6 +43,6 @@ class SubstrTests(TestCase):
         Author.objects.create(name="Rhonda")
         substr = Substr(Upper("name"), StrIndex("name", V("h")), 5)
         authors = Author.objects.annotate(name_part=substr)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"), ["HN SM", "HONDA"], lambda a: a.name_part
         )
diff --git a/tests/db_functions/text/test_trim.py b/tests/db_functions/text/test_trim.py
index 57a342851e..e3d2e71ea5 100644
--- a/tests/db_functions/text/test_trim.py
+++ b/tests/db_functions/text/test_trim.py
@@ -15,7 +15,7 @@ class TrimTests(TestCase):
             rtrim=RTrim("name"),
             trim=Trim("name"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("alias"),
             [
                 ("John ", "  John", "John"),
@@ -38,4 +38,4 @@ class TrimTests(TestCase):
                     authors = Author.objects.filter(
                         **{"name__%s" % transform.lookup_name: trimmed_name}
                     )
-                    self.assertQuerysetEqual(authors, [" John  "], lambda a: a.name)
+                    self.assertQuerySetEqual(authors, [" John  "], lambda a: a.name)
diff --git a/tests/db_functions/text/test_upper.py b/tests/db_functions/text/test_upper.py
index 728ea82265..df1a616ad3 100644
--- a/tests/db_functions/text/test_upper.py
+++ b/tests/db_functions/text/test_upper.py
@@ -11,7 +11,7 @@ class UpperTests(TestCase):
         Author.objects.create(name="John Smith", alias="smithj")
         Author.objects.create(name="Rhonda")
         authors = Author.objects.annotate(upper_name=Upper("name"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"),
             [
                 "JOHN SMITH",
@@ -20,7 +20,7 @@ class UpperTests(TestCase):
             lambda a: a.upper_name,
         )
         Author.objects.update(name=Upper("name"))
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             authors.order_by("name"),
             [
                 ("JOHN SMITH", "JOHN SMITH"),
@@ -34,7 +34,7 @@ class UpperTests(TestCase):
             Author.objects.create(name="John Smith", alias="smithj")
             Author.objects.create(name="Rhonda")
             authors = Author.objects.filter(name__upper__exact="JOHN SMITH")
-            self.assertQuerysetEqual(
+            self.assertQuerySetEqual(
                 authors.order_by("name"),
                 [
                     "John Smith",