Updated tests for Python 3

Author: jerel

example/tests/test_format_keys.py

@@ -3,15 +3,15 @@
 from example.tests import TestBase
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse, reverse
 from django.conf import settings
 
 
 class FormatKeysSetTests(TestBase):
     """
     Test that camelization and underscoring of key names works if they are activated.
     """
-    list_url = reverse_lazy('user-list')
+    list_url = reverse('user-list')
 
     def setUp(self):
         super(FormatKeysSetTests, self).setUp()
@@ -44,7 +44,7 @@ def test_camelization(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         meta = json_content.get('meta')
 
         self.assertEquals(expected.get('users'), json_content.get('users'))
@@ -73,7 +73,7 @@ def test_pluralization(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         self.assertEquals(expected.get('users'), json_content.get('users'))
 
     def test_empty_pluralization(self):
@@ -82,6 +82,6 @@ def test_empty_pluralization(self):
         response = self.client.get(reverse('user-empty-list'))
         self.assertEqual(response.status_code, 200)
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         self.assertEqual(json_content.get('users'), [])
 

example/tests/test_generic_viewset.py

@@ -18,7 +18,7 @@ def test_default_rest_framework_behavior(self):
 
         self.assertEqual(200, response.status_code)
         self.assertEqual(
-            json.loads(response.content),
+            json.loads(response.content.decode('utf8')),
             {
                 'id': 2,
                 'first_name': u'Miles',
@@ -37,7 +37,7 @@ def test_ember_expected_renderer(self):
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
         self.assertEqual(
-            json.loads(response.content),
+            json.loads(response.content.decode('utf8')),
             {
                 'data': {
                     'id': 2,

example/tests/test_model_viewsets.py

@@ -3,7 +3,7 @@
 from example.tests import TestBase
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse
 from django.conf import settings
 
 
@@ -15,7 +15,7 @@ class ModelViewSetTests(TestBase):
     [<RegexURLPattern user-list ^identities/$>,
     <RegexURLPattern user-detail ^identities/(?P<pk>[^/]+)/$>]
     """
-    list_url = reverse_lazy('user-list')
+    list_url = reverse('user-list')
 
     def setUp(self):
         super(ModelViewSetTests, self).setUp()
@@ -38,7 +38,7 @@ def test_key_in_list_result(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         meta = json_content.get('meta')
 
         self.assertEquals(expected.get('user'), json_content.get('user'))
@@ -66,7 +66,7 @@ def test_page_two_in_list_result(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         meta = json_content.get('meta')
 
         self.assertEquals(expected.get('user'), json_content.get('user'))
@@ -103,7 +103,7 @@ def test_page_range_in_list_result(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         meta = json_content.get('meta')
         self.assertEquals(expected.get('users'), json_content.get('user'))
         self.assertEquals(meta.get('count', 0),
@@ -117,7 +117,7 @@ def test_key_in_detail_result(self):
         response = self.client.get(self.detail_url)
         self.assertEqual(response.status_code, 200)
 
-        result = json.loads(response.content)
+        result = json.loads(response.content.decode('utf8'))
         expected = {
             u'user': {
                 u'id': self.miles.pk,
@@ -143,7 +143,7 @@ def test_key_in_post(self):
         }
         response = self.client.put(self.detail_url, data=data, format='json')
 
-        result = json.loads(response.content)
+        result = json.loads(response.content.decode('utf8'))
 
         self.assertIn('user', result.keys())
         self.assertEqual(result['user']['email'], 'miles@trumpet.org')

example/tests/test_multiple_id_mixin.py

@@ -1,7 +1,7 @@
 import json
 from example.tests import TestBase
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse
 from django.conf import settings
 
 
@@ -12,7 +12,7 @@ class MultipleIDMixin(TestBase):
     [<RegexURLPattern user-list ^user-viewsets/$>,
      <RegexURLPattern user-detail ^user-viewsets/(?P<pk>[^/]+)/$>]
     """
-    list_url = reverse_lazy('user-list')
+    list_url = reverse('user-list')
 
     def test_single_id_in_query_params(self):
         """
@@ -31,7 +31,7 @@ def test_single_id_in_query_params(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         meta = json_content.get("meta")
 
         self.assertEquals(expected.get('user'), json_content.get('user'))
@@ -58,15 +58,20 @@ def test_multiple_ids_in_query_params(self):
             }]
         }
 
-        json_content = json.loads(response.content)
+        json_content = json.loads(response.content.decode('utf8'))
         meta = json_content.get("meta")
 
         self.assertEquals(expected.get('user'), json_content.get('user'))
         self.assertEquals(meta.get('count', 0), 2)
         self.assertEquals(meta.get("next"), 2)
         self.assertEqual(
-            'http://testserver/identities?ids%5B%5D=2&ids%5B%5D=1&page=2',
-            meta.get("next_link"))
+            sorted(
+                'http://testserver/identities?ids%5B%5D=2&ids%5B%5D=1&page=2'\
+                .split('?')[1].split('&')
+            ),
+            sorted(
+                meta.get("next_link").split('?')[1].split('&'))
+            )
         self.assertEqual(meta.get("page"), 1)
 
 

example/tests/test_sideload_resources.py

@@ -3,23 +3,23 @@
 """
 import json
 from example.tests import TestBase
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse
 from django.conf import settings
 
 
 class SideloadResourceTest(TestBase):
     """
     Test that sideloading resources returns expected output.
     """
-    url = reverse_lazy('user-posts')
+    url = reverse('user-posts')
 
     def test_get_sideloaded_data(self):
         """
         Ensure resources that are meant for sideloaded data
         do not return a single root key.
         """
         response = self.client.get(self.url)
-        content = json.loads(response.content)
+        content = json.loads(response.content.decode('utf8'))
 
-        self.assertEqual(content.keys(), [u'identities', u'posts'])
+        self.assertEqual(sorted(content.keys()), [u'identities', u'posts'])