From 1365df3d777b3133f045e54c2b56e9bd7c645be1 Mon Sep 17 00:00:00 2001 From: jangsutsr Date: Mon, 15 Aug 2016 18:35:44 -0400 Subject: [PATCH] Refactor unit test for robustness. --- awx/main/tests/unit/api/decorator_paginated.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/awx/main/tests/unit/api/decorator_paginated.py b/awx/main/tests/unit/api/decorator_paginated.py index 39444590e7..71344e92ba 100644 --- a/awx/main/tests/unit/api/decorator_paginated.py +++ b/awx/main/tests/unit/api/decorator_paginated.py @@ -40,7 +40,9 @@ class PaginatedDecoratorTests(TestCase): # Ensure the response looks like what it should. r = json.loads(response.rendered_content) self.assertEqual(r['count'], 26) - self.assertEqual(r['next'], '/dummy/?page=2&page_size=5') + self.assertIn(r['next'], + (u'/dummy/?page=2&page_size=5', + u'/dummy/?page_size=5&page=2')) self.assertEqual(r['previous'], None) self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e']) @@ -55,8 +57,12 @@ class PaginatedDecoratorTests(TestCase): # Ensure the response looks like what it should. r = json.loads(response.rendered_content) self.assertEqual(r['count'], 26) - self.assertEqual(r['next'], '/dummy/?page=4&page_size=5') - self.assertEqual(r['previous'], '/dummy/?page=2&page_size=5') + self.assertIn(r['next'], + (u'/dummy/?page=4&page_size=5', + u'/dummy/?page_size=5&page=4')) + self.assertIn(r['previous'], + (u'/dummy/?page=2&page_size=5', + u'/dummy/?page_size=5&page=2')) self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e']) def test_last_page(self): @@ -71,5 +77,7 @@ class PaginatedDecoratorTests(TestCase): r = json.loads(response.rendered_content) self.assertEqual(r['count'], 26) self.assertEqual(r['next'], None) - self.assertEqual(r['previous'], '/dummy/?page=5&page_size=5') + self.assertIn(r['previous'], + (u'/dummy/?page=5&page_size=5', + u'/dummy/?page_size=5&page=5')) self.assertEqual(r['results'], ['a', 'b', 'c', 'd', 'e'])