Skip to content

Commit

Permalink
[py3] Fixed paginator tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@apollo13
apollo13 committed Aug 15, 2012
1 parent c158489 commit 0ab5702
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/modeltests/pagination/tests.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_paginator(self):
paginator = Paginator(Article.objects.all(), 5) paginator = Paginator(Article.objects.all(), 5)
self.assertEqual(9, paginator.count) self.assertEqual(9, paginator.count)
self.assertEqual(2, paginator.num_pages) self.assertEqual(2, paginator.num_pages)
self.assertEqual([1, 2], paginator.page_range) self.assertEqual([1, 2], list(paginator.page_range))


def test_first_page(self): def test_first_page(self):
paginator = Paginator(Article.objects.all(), 5) paginator = Paginator(Article.objects.all(), 5)
Expand Down Expand Up @@ -78,13 +78,13 @@ def test_empty_page(self):
paginator = Paginator(Article.objects.filter(id=0), 5, allow_empty_first_page=True) paginator = Paginator(Article.objects.filter(id=0), 5, allow_empty_first_page=True)
self.assertEqual(0, paginator.count) self.assertEqual(0, paginator.count)
self.assertEqual(1, paginator.num_pages) self.assertEqual(1, paginator.num_pages)
self.assertEqual([1], paginator.page_range) self.assertEqual([1], list(paginator.page_range))


# Empty paginators with allow_empty_first_page=False. # Empty paginators with allow_empty_first_page=False.
paginator = Paginator(Article.objects.filter(id=0), 5, allow_empty_first_page=False) paginator = Paginator(Article.objects.filter(id=0), 5, allow_empty_first_page=False)
self.assertEqual(0, paginator.count) self.assertEqual(0, paginator.count)
self.assertEqual(0, paginator.num_pages) self.assertEqual(0, paginator.num_pages)
self.assertEqual([], paginator.page_range) self.assertEqual([], list(paginator.page_range))


def test_invalid_page(self): def test_invalid_page(self):
paginator = Paginator(Article.objects.all(), 5) paginator = Paginator(Article.objects.all(), 5)
Expand All @@ -108,7 +108,7 @@ def test_paginate_list(self):
paginator = Paginator([1, 2, 3, 4, 5, 6, 7, 8, 9], 3) paginator = Paginator([1, 2, 3, 4, 5, 6, 7, 8, 9], 3)
self.assertEqual(9, paginator.count) self.assertEqual(9, paginator.count)
self.assertEqual(3, paginator.num_pages) self.assertEqual(3, paginator.num_pages)
self.assertEqual([1, 2, 3], paginator.page_range) self.assertEqual([1, 2, 3], list(paginator.page_range))
p = paginator.page(2) p = paginator.page(2)
self.assertEqual("<Page 2 of 3>", six.text_type(p)) self.assertEqual("<Page 2 of 3>", six.text_type(p))
self.assertEqual([4, 5, 6], p.object_list) self.assertEqual([4, 5, 6], p.object_list)
Expand All @@ -125,10 +125,10 @@ def test_paginate_misc_classes(self):
paginator = Paginator(CountContainer(), 10) paginator = Paginator(CountContainer(), 10)
self.assertEqual(42, paginator.count) self.assertEqual(42, paginator.count)
self.assertEqual(5, paginator.num_pages) self.assertEqual(5, paginator.num_pages)
self.assertEqual([1, 2, 3, 4, 5], paginator.page_range) self.assertEqual([1, 2, 3, 4, 5], list(paginator.page_range))


# Paginator can be passed other objects that implement __len__. # Paginator can be passed other objects that implement __len__.
paginator = Paginator(LenContainer(), 10) paginator = Paginator(LenContainer(), 10)
self.assertEqual(42, paginator.count) self.assertEqual(42, paginator.count)
self.assertEqual(5, paginator.num_pages) self.assertEqual(5, paginator.num_pages)
self.assertEqual([1, 2, 3, 4, 5], paginator.page_range) self.assertEqual([1, 2, 3, 4, 5], list(paginator.page_range))

0 comments on commit 0ab5702

Please sign in to comment.