1 files changed, 13 insertions, 24 deletions
diff --git a/src/mailman/rest/tests/test_paginate.py b/src/mailman/rest/tests/test_paginate.py
index 0774125bb..3a166d9d2 100644
--- a/src/mailman/rest/tests/test_paginate.py
+++ b/src/mailman/rest/tests/test_paginate.py
@@ -27,6 +27,7 @@ __all__ = [
 
 import unittest
 
+from falcon import InvalidParam, Request
 from mailman.app.lifecycle import create_list
 from mailman.database.transaction import transaction
 from mailman.rest.helpers import paginate
@@ -34,15 +35,15 @@ from mailman.testing.layers import RESTLayer
 
 
 
-class _FakeRequest:
+class _FakeRequest(Request):
     """Fake restish.http.Request object."""
 
     def __init__(self, count=None, page=None):
-        self.GET = {}
+        self._params = {}
         if count is not None:
-            self.GET['count'] = count
+            self._params['count'] = count
         if page is not None:
-            self.GET['page'] = page
+            self._params['page'] = page
 
 
 
@@ -105,41 +106,29 @@ class TestPaginateHelper(unittest.TestCase):
         @paginate
         def get_collection(self, request):
             return []
-        response = get_collection(None, _FakeRequest('two', 1))
-        self.assertEqual(response.status, '400 Bad Request')
-
-    def test_no_get_attr_returns_bad_request(self):
-        # ?count=two&page=2 are not valid values so a bad request is returned.
-        @paginate
-        def get_collection(self, request):
-            return []
-        request = _FakeRequest()
-        del request.GET
-        # The request object has no GET attribute.
-        self.assertIsNone(getattr(request, 'GET', None))
-        response = get_collection(None, request)
-        self.assertEqual(response.status, '400 Bad Request')
+        self.assertRaises(InvalidParam, get_collection,
+                          None, _FakeRequest('two', 1))
 
     def test_negative_count(self):
         # ?count=-1&page=1
         @paginate
         def get_collection(self, request):
             return ['one', 'two', 'three', 'four', 'five']
-        response = get_collection(None, _FakeRequest(-1, 1))
-        self.assertEqual(response.status, '400 Bad Request')
+        self.assertRaises(InvalidParam, get_collection,
+                          None, _FakeRequest(-1, 1))
 
     def test_negative_page(self):
         # ?count=1&page=-1
         @paginate
         def get_collection(self, request):
             return ['one', 'two', 'three', 'four', 'five']
-        response = get_collection(None, _FakeRequest(1, -1))
-        self.assertEqual(response.status, '400 Bad Request')
+        self.assertRaises(InvalidParam, get_collection,
+                          None, _FakeRequest(1, -1))
 
     def test_negative_page_and_count(self):
         # ?count=1&page=-1
         @paginate
         def get_collection(self, request):
             return ['one', 'two', 'three', 'four', 'five']
-        response = get_collection(None, _FakeRequest(-1, -1))
-        self.assertEqual(response.status, '400 Bad Request')
+        self.assertRaises(InvalidParam, get_collection,
+                          None, _FakeRequest(-1, -1))