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

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

1 files changed, 35 insertions, 35 deletions

diff --git a/tests/ordering/tests.py b/tests/ordering/tests.py
index 8109ea1b45..88eeccf358 100644
--- a/tests/ordering/tests.py
+++ b/tests/ordering/tests.py
@@ -52,7 +52,7 @@ class OrderingTests(TestCase):
         By default, Article.objects.all() orders by pub_date descending, then
         headline ascending.
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.all(),
             [
                 "Article 4",
@@ -71,7 +71,7 @@ class OrderingTests(TestCase):
         Override ordering with order_by, which is in the same format as the
         ordering attribute in models.
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("headline"),
             [
                 "Article 1",
@@ -81,7 +81,7 @@ class OrderingTests(TestCase):
             ],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("pub_date", "-headline"),
             [
                 "Article 1",
@@ -109,7 +109,7 @@ class OrderingTests(TestCase):
         Only the last order_by has any effect (since they each override any
         previous ordering).
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("id"),
             [
                 "Article 1",
@@ -119,7 +119,7 @@ class OrderingTests(TestCase):
             ],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("id").order_by("-headline"),
             [
                 "Article 4",
@@ -137,7 +137,7 @@ class OrderingTests(TestCase):
                 F("author").desc(nulls_last=True, nulls_first=True)
             )
 
-    def assertQuerysetEqualReversible(self, queryset, sequence):
+    def assertQuerySetEqualReversible(self, queryset, sequence):
         self.assertSequenceEqual(queryset, sequence)
         self.assertSequenceEqual(queryset.reverse(), list(reversed(sequence)))
 
@@ -145,21 +145,21 @@ class OrderingTests(TestCase):
         Article.objects.filter(headline="Article 3").update(author=self.author_1)
         Article.objects.filter(headline="Article 4").update(author=self.author_2)
         # asc and desc are chainable with nulls_last.
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(F("author").desc(nulls_last=True), "headline"),
             [self.a4, self.a3, self.a1, self.a2],
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(F("author").asc(nulls_last=True), "headline"),
             [self.a3, self.a4, self.a1, self.a2],
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(
                 Upper("author__name").desc(nulls_last=True), "headline"
             ),
             [self.a4, self.a3, self.a1, self.a2],
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(
                 Upper("author__name").asc(nulls_last=True), "headline"
             ),
@@ -170,21 +170,21 @@ class OrderingTests(TestCase):
         Article.objects.filter(headline="Article 3").update(author=self.author_1)
         Article.objects.filter(headline="Article 4").update(author=self.author_2)
         # asc and desc are chainable with nulls_first.
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(F("author").asc(nulls_first=True), "headline"),
             [self.a1, self.a2, self.a3, self.a4],
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(F("author").desc(nulls_first=True), "headline"),
             [self.a1, self.a2, self.a4, self.a3],
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(
                 Upper("author__name").asc(nulls_first=True), "headline"
             ),
             [self.a1, self.a2, self.a3, self.a4],
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Article.objects.order_by(
                 Upper("author__name").desc(nulls_first=True), "headline"
             ),
@@ -209,7 +209,7 @@ class OrderingTests(TestCase):
             )
             .values("last_date")
         )
-        self.assertQuerysetEqualReversible(
+        self.assertQuerySetEqualReversible(
             Author.objects.annotate(
                 last_date=Subquery(article_subquery, output_field=DateTimeField())
             )
@@ -222,7 +222,7 @@ class OrderingTests(TestCase):
         """
         Use the 'stop' part of slicing notation to limit the results.
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("headline")[:2],
             [
                 "Article 1",
@@ -236,7 +236,7 @@ class OrderingTests(TestCase):
         Use the 'stop' and 'start' parts of slicing notation to offset the
         result list.
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("headline")[1:3],
             [
                 "Article 2",
@@ -257,7 +257,7 @@ class OrderingTests(TestCase):
         This allows you to extract things like "the last two items" (reverse
         and then take the first two).
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.reverse()[:2],
             [
                 "Article 1",
@@ -269,7 +269,7 @@ class OrderingTests(TestCase):
     def test_reverse_ordering_pure(self):
         qs1 = Article.objects.order_by(F("headline").asc())
         qs2 = qs1.reverse()
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs2,
             [
                 "Article 4",
@@ -279,7 +279,7 @@ class OrderingTests(TestCase):
             ],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs1,
             [
                 "Article 1",
@@ -303,12 +303,12 @@ class OrderingTests(TestCase):
             author=self.author_2,
             second_author=self.author_1,
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(headline="Article 5").reverse(),
             ["Name 2", "Name 1"],
             attrgetter("author.name"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(headline="Article 5"),
             ["Name 1", "Name 2"],
             attrgetter("author.name"),
@@ -326,7 +326,7 @@ class OrderingTests(TestCase):
         """
         Ordering can be based on fields included from an 'extra' clause
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.extra(
                 select={"foo": "pub_date"}, order_by=["foo", "headline"]
             ),
@@ -344,7 +344,7 @@ class OrderingTests(TestCase):
         If the extra clause uses an SQL keyword for a name, it will be
         protected by quoting.
         """
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.extra(
                 select={"order": "pub_date"}, order_by=["order", "headline"]
             ),
@@ -358,7 +358,7 @@ class OrderingTests(TestCase):
         )
 
     def test_extra_ordering_with_table_name(self):
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.extra(order_by=["ordering_article.headline"]),
             [
                 "Article 1",
@@ -368,7 +368,7 @@ class OrderingTests(TestCase):
             ],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.extra(order_by=["-ordering_article.headline"]),
             [
                 "Article 4",
@@ -400,7 +400,7 @@ class OrderingTests(TestCase):
             article.author = author
             article.save(update_fields={"author"})
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by("author_id"),
             [
                 "Article 4",
@@ -416,19 +416,19 @@ class OrderingTests(TestCase):
         self.a1.save()
         self.a2.author = Author.objects.create(editor=self.author_2)
         self.a2.save()
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(author__isnull=False).order_by("author__editor"),
             ["Article 2", "Article 1"],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(author__isnull=False).order_by("author__editor_id"),
             ["Article 1", "Article 2"],
             attrgetter("headline"),
         )
 
     def test_order_by_f_expression(self):
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by(F("headline")),
             [
                 "Article 1",
@@ -438,7 +438,7 @@ class OrderingTests(TestCase):
             ],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by(F("headline").asc()),
             [
                 "Article 1",
@@ -448,7 +448,7 @@ class OrderingTests(TestCase):
             ],
             attrgetter("headline"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.order_by(F("headline").desc()),
             [
                 "Article 4",
@@ -468,7 +468,7 @@ class OrderingTests(TestCase):
         sql = str(qs.query).upper()
         fragment = sql[sql.find("ORDER BY") :]
         self.assertEqual(fragment.count("HEADLINE"), 1)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 "Article 1",
@@ -482,7 +482,7 @@ class OrderingTests(TestCase):
         sql = str(qs.query).upper()
         fragment = sql[sql.find("ORDER BY") :]
         self.assertEqual(fragment.count("HEADLINE"), 1)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             qs,
             [
                 "Article 4",
@@ -535,7 +535,7 @@ class OrderingTests(TestCase):
         articles = OrderedByFArticle.objects.all()
         articles.filter(headline="Article 2").update(author=self.author_2)
         articles.filter(headline="Article 3").update(author=self.author_1)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             articles,
             ["Article 1", "Article 4", "Article 3", "Article 2"],
             attrgetter("headline"),