diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pagination/tests.py | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/tests/pagination/tests.py b/tests/pagination/tests.py index 67a33cd41d..3e86b88a81 100644 --- a/tests/pagination/tests.py +++ b/tests/pagination/tests.py @@ -15,6 +15,7 @@ from django.core.paginator import ( UnorderedObjectListWarning, ) from django.test import SimpleTestCase, TestCase +from django.utils.deprecation import RemovedInDjango70Warning from .custom import AsyncValidAdjacentNumsPaginator, ValidAdjacentNumsPaginator from .models import Article @@ -82,14 +83,10 @@ class PaginationTests(SimpleTestCase): ((ten, 4, 0, False), (10, 3, [1, 2, 3])), ((ten, 4, 1, False), (10, 3, [1, 2, 3])), ((ten, 4, 2, False), (10, 2, [1, 2])), - ((ten, 4, 5, False), (10, 2, [1, 2])), - ((ten, 4, 6, False), (10, 1, [1])), # Ten items, varying orphans, allow empty first page. ((ten, 4, 0, True), (10, 3, [1, 2, 3])), ((ten, 4, 1, True), (10, 3, [1, 2, 3])), ((ten, 4, 2, True), (10, 2, [1, 2])), - ((ten, 4, 5, True), (10, 2, [1, 2])), - ((ten, 4, 6, True), (10, 1, [1])), # One item, varying orphans, no empty first page. (([1], 4, 0, False), (1, 1, [1])), (([1], 4, 1, False), (1, 1, [1])), @@ -120,7 +117,6 @@ class PaginationTests(SimpleTestCase): (([1, 2, 3], 2, 0, True), (3, 2, [1, 2])), ((eleven, 10, 0, True), (11, 2, [1, 2])), # Number if items one more than per_page with one orphan. - (([1, 2], 1, 1, True), (2, 1, [1])), (([1, 2, 3], 2, 1, True), (3, 1, [1])), ((eleven, 10, 1, True), (11, 1, [1])), # Non-integer inputs @@ -160,6 +156,25 @@ class PaginationTests(SimpleTestCase): with self.assertRaises(InvalidPage): await paginator.apage(3) + def test_orphans_value_larger_than_per_page_value(self): + # RemovedInDjango70Warning: When the deprecation ends, replace with: + # msg = ( + # "The orphans argument cannot be larger than or equal to the " + # "per_page argument." + # ) + msg = ( + "Support for the orphans argument being larger than or equal to the " + "per_page argument is deprecated. This will raise a ValueError in " + "Django 7.0." + ) + for paginator_class in [Paginator, AsyncPaginator]: + for orphans in [2, 3]: + with self.subTest(paginator_class=paginator_class, msg=msg): + # RemovedInDjango70Warning: When the deprecation ends, replace with: + # with self.assertRaisesMessage(ValueError, msg): + with self.assertWarnsMessage(RemovedInDjango70Warning, msg): + paginator_class([1, 2, 3], 2, orphans) + def test_error_messages(self): error_messages = { "invalid_page": "Wrong page number", @@ -331,14 +346,10 @@ class PaginationTests(SimpleTestCase): ((ten, 3, 0, True), (1, 3), (10, 10)), ((ten, 5, 0, True), (1, 5), (6, 10)), # Ten items, varying per_page, with orphans. - ((ten, 1, 1, True), (1, 1), (9, 10)), - ((ten, 1, 2, True), (1, 1), (8, 10)), ((ten, 3, 1, True), (1, 3), (7, 10)), ((ten, 3, 2, True), (1, 3), (7, 10)), - ((ten, 3, 4, True), (1, 3), (4, 10)), ((ten, 5, 1, True), (1, 5), (6, 10)), ((ten, 5, 2, True), (1, 5), (6, 10)), - ((ten, 5, 5, True), (1, 10), (1, 10)), # One item, varying orphans, no empty first page. (([1], 4, 0, False), (1, 1), (1, 1)), (([1], 4, 1, False), (1, 1), (1, 1)), |