mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Refs #26022 -- Used context manager version of assertRaises in tests.
This commit is contained in:
@@ -114,9 +114,12 @@ class PaginationTests(unittest.TestCase):
|
||||
raised.
|
||||
"""
|
||||
paginator = Paginator([1, 2, 3], 2)
|
||||
self.assertRaises(InvalidPage, paginator.page, 3)
|
||||
self.assertRaises(PageNotAnInteger, paginator.validate_number, None)
|
||||
self.assertRaises(PageNotAnInteger, paginator.validate_number, 'x')
|
||||
with self.assertRaises(InvalidPage):
|
||||
paginator.page(3)
|
||||
with self.assertRaises(PageNotAnInteger):
|
||||
paginator.validate_number(None)
|
||||
with self.assertRaises(PageNotAnInteger):
|
||||
paginator.validate_number('x')
|
||||
# With no content and allow_empty_first_page=True, 1 is a valid page number
|
||||
paginator = Paginator([], 2)
|
||||
self.assertEqual(paginator.validate_number(1), 1)
|
||||
@@ -203,9 +206,12 @@ class PaginationTests(unittest.TestCase):
|
||||
self.check_indexes(params, 'last', last)
|
||||
|
||||
# When no items and no empty first page, we should get EmptyPage error.
|
||||
self.assertRaises(EmptyPage, self.check_indexes, ([], 4, 0, False), 1, None)
|
||||
self.assertRaises(EmptyPage, self.check_indexes, ([], 4, 1, False), 1, None)
|
||||
self.assertRaises(EmptyPage, self.check_indexes, ([], 4, 2, False), 1, None)
|
||||
with self.assertRaises(EmptyPage):
|
||||
self.check_indexes(([], 4, 0, False), 1, None)
|
||||
with self.assertRaises(EmptyPage):
|
||||
self.check_indexes(([], 4, 1, False), 1, None)
|
||||
with self.assertRaises(EmptyPage):
|
||||
self.check_indexes(([], 4, 2, False), 1, None)
|
||||
|
||||
def test_page_sequence(self):
|
||||
"""
|
||||
@@ -267,7 +273,8 @@ class ModelPaginationTests(TestCase):
|
||||
self.assertFalse(p.has_previous())
|
||||
self.assertTrue(p.has_other_pages())
|
||||
self.assertEqual(2, p.next_page_number())
|
||||
self.assertRaises(InvalidPage, p.previous_page_number)
|
||||
with self.assertRaises(InvalidPage):
|
||||
p.previous_page_number()
|
||||
self.assertEqual(1, p.start_index())
|
||||
self.assertEqual(5, p.end_index())
|
||||
|
||||
@@ -286,7 +293,8 @@ class ModelPaginationTests(TestCase):
|
||||
self.assertFalse(p.has_next())
|
||||
self.assertTrue(p.has_previous())
|
||||
self.assertTrue(p.has_other_pages())
|
||||
self.assertRaises(InvalidPage, p.next_page_number)
|
||||
with self.assertRaises(InvalidPage):
|
||||
p.next_page_number()
|
||||
self.assertEqual(1, p.previous_page_number())
|
||||
self.assertEqual(6, p.start_index())
|
||||
self.assertEqual(9, p.end_index())
|
||||
@@ -302,7 +310,8 @@ class ModelPaginationTests(TestCase):
|
||||
# Make sure object_list queryset is not evaluated by an invalid __getitem__ call.
|
||||
# (this happens from the template engine when using eg: {% page_obj.has_previous %})
|
||||
self.assertIsNone(p.object_list._result_cache)
|
||||
self.assertRaises(TypeError, lambda: p['has_previous'])
|
||||
with self.assertRaises(TypeError):
|
||||
p['has_previous']
|
||||
self.assertIsNone(p.object_list._result_cache)
|
||||
self.assertNotIsInstance(p.object_list, list)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user