Refactoring some tests

Author: jsenecal

example/tests/unit/test_renderer_class_methods.py

@@ -0,0 +1,48 @@
+from django.contrib.auth import get_user_model
+
+from rest_framework_json_api import serializers
+from rest_framework_json_api.renderers import JSONRenderer
+
+
+class ResourceSerializer(serializers.ModelSerializer):
+    class Meta:
+        fields = ('username',)
+        model = get_user_model()
+
+
+def test_build_json_resource_obj():
+    resource = {
+        'pk': 1,
+        'username': 'Alice',
+    }
+
+    serializer = ResourceSerializer(data={'username': 'Alice'})
+    serializer.is_valid()
+    resource_instance = serializer.save()
+
+    output = {
+        'type': 'user',
+        'id': '1',
+        'attributes': {
+            'username': 'Alice'
+        },
+    }
+
+    assert JSONRenderer.build_json_resource_obj(
+        serializer.fields, resource, resource_instance, 'user') == output
+
+
+def test_extract_attributes():
+    fields = {
+        'id': serializers.Field(),
+        'username': serializers.Field(),
+        'deleted': serializers.ReadOnlyField(),
+    }
+    resource = {'id': 1, 'deleted': None, 'username': 'jerel'}
+    expected = {
+        'username': 'jerel',
+        'deleted': None
+    }
+    assert sorted(JSONRenderer.extract_attributes(fields, resource)) == sorted(expected), 'Regular fields should be extracted'
+    assert sorted(JSONRenderer.extract_attributes(fields, {})) == sorted(
+        {'username': ''}), 'Should not extract read_only fields on empty serializer'

example/tests/unit/test_utils.py

@@ -19,7 +19,7 @@ class ResourceView(APIView):
 
 
 class ResourceSerializer(serializers.ModelSerializer):
-    class Meta():
+    class Meta:
         fields = ('username',)
         model = get_user_model()
 
@@ -90,42 +90,6 @@ def test_format_relation_name():
     assert utils.format_relation_name('first_name', 'camelize') == 'firstNames'
 
 
-def test_build_json_resource_obj():
-    resource = {
-        'pk': 1,
-        'username': 'Alice',
-    }
-
-    serializer = ResourceSerializer(data={'username': 'Alice'})
-    serializer.is_valid()
-    resource_instance = serializer.save()
-
-    output = {
-        'type': 'user',
-        'id': '1',
-        'attributes': {
-            'username': 'Alice'
-        },
-    }
-
-    assert utils.build_json_resource_obj(
-        serializer.fields, resource, resource_instance, 'user') == output
-
-def test_extract_attributes():
-    fields = {
-        'id': serializers.Field(),
-        'username': serializers.Field(),
-        'deleted': serializers.ReadOnlyField(),
-    }
-    resource = {'id': 1, 'deleted': None, 'username': 'jerel'}
-    expected = {
-        'username': 'jerel',
-        'deleted': None
-    }
-    assert sorted(utils.extract_attributes(fields, resource)) == sorted(expected), 'Regular fields should be extracted'
-    assert sorted(utils.extract_attributes(fields, {})) == sorted({'username': ''}), 'Should not extract read_only fields on empty serializer'
-
-
 class SerializerWithIncludedSerializers(EntrySerializer):
     included_serializers = {
         'blog': BlogSerializer,