Ticket #5465: issue_55.patch

mediagoblin/tests/test_tools.py

@@ -16 +16 @@
 
 from __future__ import absolute_import, unicode_literals
 
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
+
 from werkzeug.wrappers import Request
 from werkzeug.test import EnvironBuilder
 
 from mediagoblin.tools.request import decode_request
+from mediagoblin.tools.pagination import Pagination
 
 class TestDecodeRequest(object):
     """Test the decode_request function."""
@@ -59 +65 @@
         request.form = {'foo': 'bar'}
         data = decode_request(request)
         assert data['foo'] == 'bar'
+
+
+class TestPagination(object):
+    def setup(self):
+        mock_cursor = mock.MagicMock()
+        mock_cursor.count.return_value = 1
+        self.paginator = Pagination(1, mock_cursor)
+
+    def test_creates_valid_page_url_from_explicit_base_url(self):
+        """Check that test_page_url_explicit runs.
+
+        This is a regression test for a Python 2/3 compatibility fix.
+
+        """
+        url = self.paginator.get_page_url_explicit(
+            'http://example.com', [], 1)
+        assert url == 'http://example.com?page=1'
+
+    def test_iter_pages_handes_single_page(self):
+        """Check that iter_pages produces the expected result for single page.
+
+        This is a regression test for a Python 2/3 compatibility fix.
+
+        """
+        assert list(self.paginator.iter_pages()) == [1]

mediagoblin/tools/pagination.py

@@ -14 +14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib
 import copy
 from math import ceil, floor
 from itertools import count
 from werkzeug.datastructures import MultiDict
 
-from six.moves import zip
+from six.moves import range, urllib, zip
 
 PAGINATION_DEFAULT_PER_PAGE = 30
 
@@ -86 +85 @@
     def iter_pages(self, left_edge=2, left_current=2,
                    right_current=5, right_edge=2):
         last = 0
-        for num in xrange(1, self.pages + 1):
+        for num in range(1, self.pages + 1):
             if num <= left_edge or \
                (num > self.page - left_current - 1 and \
                 num < self.page + right_current) or \
@@ -107 +106 @@
 
         new_get_params['page'] = page_no
         return "%s?%s" % (
-            base_url, urllib.urlencode(new_get_params))
+            base_url, urllib.parse.urlencode(new_get_params))
 
     def get_page_url(self, request, page_no):
         """

mediagoblin/tests/test_tools.py

@@ -68 +68 @@
 
 
 class TestPagination(object):
-    def setup(self):
+    def _create_paginator(self, num_items, page, per_page):
+        """Create a Paginator with a mock database cursor."""
         mock_cursor = mock.MagicMock()
-        mock_cursor.count.return_value = 1
-        self.paginator = Pagination(1, mock_cursor)
+        mock_cursor.count.return_value = num_items
+        return Pagination(page, mock_cursor, per_page)
 
     def test_creates_valid_page_url_from_explicit_base_url(self):
         """Check that test_page_url_explicit runs.
@@ -79 +80 @@
         This is a regression test for a Python 2/3 compatibility fix.
 
         """
-        url = self.paginator.get_page_url_explicit(
-            'http://example.com', [], 1)
+        paginator = self._create_paginator(num_items=1, page=1, per_page=30)
+        url = paginator.get_page_url_explicit('http://example.com', [], 1)
         assert url == 'http://example.com?page=1'
 
-    def test_iter_pages_handes_single_page(self):
+    def test_iter_pages_handles_single_page(self):
         """Check that iter_pages produces the expected result for single page.
 
         This is a regression test for a Python 2/3 compatibility fix.
 
         """
-        assert list(self.paginator.iter_pages()) == [1]
+        paginator = self._create_paginator(num_items=1, page=1, per_page=30)
+        assert list(paginator.iter_pages()) == [1]
+
+    def test_zero_items(self):
+        """Check that no items produces no pages."""
+        paginator = self._create_paginator(num_items=0, page=1, per_page=30)
+        assert paginator.total_count == 0
+        assert paginator.pages == 0
+
+    def test_single_item(self):
+        """Check that one item produces one page."""
+        paginator = self._create_paginator(num_items=1, page=1, per_page=30)
+        assert paginator.total_count == 1
+        assert paginator.pages == 1
+
+    def test_full_page(self):
+        """Check that a full page of items produces one page."""
+        paginator = self._create_paginator(num_items=30, page=1, per_page=30)
+        assert paginator.total_count == 30
+        assert paginator.pages == 1
+
+    def test_multiple_pages(self):
+        """Check that more than a full page produces two pages."""
+        paginator = self._create_paginator(num_items=31, page=1, per_page=30)
+        assert paginator.total_count == 31
+        assert paginator.pages == 2