summaryrefslogtreecommitdiff
path: root/tests/ordering
diff options
context:
space:
mode:
authorTomer Chachamu <tomer@festicket.com>2017-10-18 14:09:45 +0100
committerTim Graham <timograham@gmail.com>2017-10-21 21:03:52 -0400
commite98ae4fe6bc1baa402b10bc379d2e96b79bbb3b0 (patch)
treeba70d4778ea58858051841162ac37e74197cda5c /tests/ordering
parentb0566e5bb3216b8ca6e9c8473ed550d5d8825f56 (diff)
[1.11.x] Fixed #28722 -- Made QuerySet.reverse() affect nulls_first/nulls_last.
Backport of 21a3a29dc9d138c248fd7922923b3ec710735c6c from master
Diffstat (limited to 'tests/ordering')
-rw-r--r--tests/ordering/tests.py36
1 files changed, 20 insertions, 16 deletions
diff --git a/tests/ordering/tests.py b/tests/ordering/tests.py
index 399b8d7035..62ce558a93 100644
--- a/tests/ordering/tests.py
+++ b/tests/ordering/tests.py
@@ -94,24 +94,28 @@ class OrderingTests(TestCase):
with self.assertRaisesMessage(ValueError, msg):
Article.objects.order_by(F("author").desc(nulls_last=True, nulls_first=True))
+ def assertQuerysetEqualReversible(self, queryset, sequence):
+ self.assertSequenceEqual(queryset, sequence)
+ self.assertSequenceEqual(queryset.reverse(), list(reversed(sequence)))
+
def test_order_by_nulls_last(self):
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.assertSequenceEqual(
- Article.objects.order_by(F("author").desc(nulls_last=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(F("author").desc(nulls_last=True), 'headline'),
[self.a4, self.a3, self.a1, self.a2],
)
- self.assertSequenceEqual(
- Article.objects.order_by(F("author").asc(nulls_last=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(F("author").asc(nulls_last=True), 'headline'),
[self.a3, self.a4, self.a1, self.a2],
)
- self.assertSequenceEqual(
- Article.objects.order_by(Upper("author__name").desc(nulls_last=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(Upper("author__name").desc(nulls_last=True), 'headline'),
[self.a4, self.a3, self.a1, self.a2],
)
- self.assertSequenceEqual(
- Article.objects.order_by(Upper("author__name").asc(nulls_last=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(Upper("author__name").asc(nulls_last=True), 'headline'),
[self.a3, self.a4, self.a1, self.a2],
)
@@ -119,20 +123,20 @@ 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.assertSequenceEqual(
- Article.objects.order_by(F("author").asc(nulls_first=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(F("author").asc(nulls_first=True), 'headline'),
[self.a1, self.a2, self.a3, self.a4],
)
- self.assertSequenceEqual(
- Article.objects.order_by(F("author").desc(nulls_first=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(F("author").desc(nulls_first=True), 'headline'),
[self.a1, self.a2, self.a4, self.a3],
)
- self.assertSequenceEqual(
- Article.objects.order_by(Upper("author__name").asc(nulls_first=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(Upper("author__name").asc(nulls_first=True), 'headline'),
[self.a1, self.a2, self.a3, self.a4],
)
- self.assertSequenceEqual(
- Article.objects.order_by(Upper("author__name").desc(nulls_first=True)),
+ self.assertQuerysetEqualReversible(
+ Article.objects.order_by(Upper("author__name").desc(nulls_first=True), 'headline'),
[self.a1, self.a2, self.a4, self.a3],
)