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

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

1 files changed, 22 insertions, 22 deletions

diff --git a/tests/or_lookups/tests.py b/tests/or_lookups/tests.py
index 1a7264015c..bfcb32bea7 100644
--- a/tests/or_lookups/tests.py
+++ b/tests/or_lookups/tests.py
@@ -21,7 +21,7 @@ class OrLookupsTests(TestCase):
         ).pk
 
     def test_filter_or(self):
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             (
                 Article.objects.filter(headline__startswith="Hello")
                 | Article.objects.filter(headline__startswith="Goodbye")
@@ -30,21 +30,21 @@ class OrLookupsTests(TestCase):
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(headline__contains="Hello")
             | Article.objects.filter(headline__contains="bye"),
             ["Hello", "Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(headline__iexact="Hello")
             | Article.objects.filter(headline__contains="ood"),
             ["Hello", "Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(
                 Q(headline__startswith="Hello") | Q(headline__startswith="Goodbye")
             ),
@@ -56,12 +56,12 @@ class OrLookupsTests(TestCase):
         # You can shorten this syntax with code like the following,  which is
         # especially useful if building the query in stages:
         articles = Article.objects.all()
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             articles.filter(headline__startswith="Hello")
             & articles.filter(headline__startswith="Goodbye"),
             [],
         )
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             articles.filter(headline__startswith="Hello")
             & articles.filter(headline__contains="bye"),
             ["Hello and goodbye"],
@@ -69,32 +69,32 @@ class OrLookupsTests(TestCase):
         )
 
     def test_pk_q(self):
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(Q(pk=self.a1) | Q(pk=self.a2)),
             ["Hello", "Goodbye"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(Q(pk=self.a1) | Q(pk=self.a2) | Q(pk=self.a3)),
             ["Hello", "Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
         )
 
     def test_pk_in(self):
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(pk__in=[self.a1, self.a2, self.a3]),
             ["Hello", "Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(pk__in=(self.a1, self.a2, self.a3)),
             ["Hello", "Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(pk__in=[self.a1, self.a2, self.a3, 40000]),
             ["Hello", "Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
@@ -108,20 +108,20 @@ class OrLookupsTests(TestCase):
 
     def test_q_negated(self):
         # Q objects can be negated
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(Q(pk=self.a1) | ~Q(pk=self.a2)),
             ["Hello", "Hello and goodbye"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(~Q(pk=self.a1) & ~Q(pk=self.a2)),
             ["Hello and goodbye"],
             attrgetter("headline"),
         )
         # This allows for more complex queries than filter() and exclude()
         # alone would allow
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(Q(pk=self.a1) & (~Q(pk=self.a2) | Q(pk=self.a3))),
             ["Hello"],
             attrgetter("headline"),
@@ -131,13 +131,13 @@ class OrLookupsTests(TestCase):
         # The 'complex_filter' method supports framework features such as
         # 'limit_choices_to' which normally take a single dictionary of lookup
         # arguments but need to support arbitrary queries via Q objects too.
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.complex_filter({"pk": self.a1}),
             ["Hello"],
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.complex_filter(Q(pk=self.a1) | Q(pk=self.a2)),
             ["Hello", "Goodbye"],
             attrgetter("headline"),
@@ -145,9 +145,9 @@ class OrLookupsTests(TestCase):
 
     def test_empty_in(self):
         # Passing "in" an empty list returns no results ...
-        self.assertQuerysetEqual(Article.objects.filter(pk__in=[]), [])
+        self.assertQuerySetEqual(Article.objects.filter(pk__in=[]), [])
         # ... but can return results if we OR it with another query.
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(Q(pk__in=[]) | Q(headline__icontains="goodbye")),
             ["Goodbye", "Hello and goodbye"],
             attrgetter("headline"),
@@ -155,7 +155,7 @@ class OrLookupsTests(TestCase):
 
     def test_q_and(self):
         # Q arg objects are ANDed
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(
                 Q(headline__startswith="Hello"), Q(headline__contains="bye")
             ),
@@ -163,7 +163,7 @@ class OrLookupsTests(TestCase):
             attrgetter("headline"),
         )
         # Q arg AND order is irrelevant
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(
                 Q(headline__contains="bye"), headline__startswith="Hello"
             ),
@@ -171,7 +171,7 @@ class OrLookupsTests(TestCase):
             attrgetter("headline"),
         )
 
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.filter(
                 Q(headline__startswith="Hello") & Q(headline__startswith="Goodbye")
             ),
@@ -179,7 +179,7 @@ class OrLookupsTests(TestCase):
         )
 
     def test_q_exclude(self):
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             Article.objects.exclude(Q(headline__startswith="Hello")),
             ["Goodbye"],
             attrgetter("headline"),