Group the model-inheritance-related tests together

3 files changed, 55 insertions, 45 deletions

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index fcfe5a0c..f2117538 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -166,17 +166,3 @@ class NullableOneToOneSource(RESTFrameworkModel):
     name = models.CharField(max_length=100)
     target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
                                   related_name='nullable_source')
-
-
-# Inherited
-class ParentModel(RESTFrameworkModel):
-    name1 = models.CharField(max_length=100)
-
-
-class ChildModel(ParentModel):
-    name2 = models.CharField(max_length=100)
-
-
-class AssociatedModel(RESTFrameworkModel):
-    ref = models.OneToOneField(ParentModel, primary_key=True)
-    name = models.CharField(max_length=100)
diff --git a/rest_framework/tests/multitable_inheritance.py b/rest_framework/tests/multitable_inheritance.py
new file mode 100644
index 00000000..1cca7823
--- /dev/null
+++ b/rest_framework/tests/multitable_inheritance.py
@@ -0,0 +1,16 @@
+from __future__ import unicode_literals
+from django.db import models
+from rest_framework.tests.models import RESTFrameworkModel
+
+
+class ParentModel(RESTFrameworkModel):
+    name1 = models.CharField(max_length=100)
+
+
+class ChildModel(ParentModel):
+    name2 = models.CharField(max_length=100)
+
+
+class AssociatedModel(RESTFrameworkModel):
+    ref = models.OneToOneField(ParentModel, primary_key=True)
+    name = models.CharField(max_length=100)
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 93909b65..c4a8a899 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -4,8 +4,9 @@ from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, ParentModel, ChildModel,
-    AssociatedModel)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
+from rest_framework.tests.multitable_inheritance import (ParentModel,
+    ChildModel, AssociatedModel)
 import datetime
 import pickle
 
@@ -181,27 +182,6 @@ class BasicTests(TestCase):
         self.assertEqual(set(serializer.data.keys()),
                           set(['name', 'age', 'info']))
 
-    def test_multitable_inherited_model_fields_as_expected(self):
-        """
-        Assert that the parent pointer field is not included in the fields
-        serialized fields
-        """
-        child = ChildModel(name1='parent name', name2='child name')
-        serializer = DerivedModelSerializer(child)
-        self.assertEqual(set(serializer.data.keys()),
-                         set(['name1', 'name2', 'id']))
-
-    def test_onetoone_primary_key_model_fields_as_expected(self):
-        """
-        Assert that a model with a onetoone field that is the primary key is
-        not treated like a derived model
-        """
-        parent = ParentModel(name1='parent name')
-        associate = AssociatedModel(name='hello', ref=parent)
-        serializer = AssociatedModelSerializer(associate)
-        self.assertEqual(set(serializer.data.keys()),
-                         set(['name', 'ref']))
-
     def test_field_with_dictionary(self):
         """
         Make sure that dictionaries from fields are left intact
@@ -282,14 +262,6 @@ class ValidationTests(TestCase):
         self.assertEqual(serializer.is_valid(), False)
         self.assertEqual(serializer.errors, {'email': ['This field is required.']})
 
-    def test_multitable_inherited_model(self):
-        data = {
-            'name1': 'parent name',
-            'name2': 'child name',
-        }
-        serializer = DerivedModelSerializer(data=data)
-        self.assertEqual(serializer.is_valid(), True)
-
     def test_missing_bool_with_default(self):
         """Make sure that a boolean value with a 'False' value is not
         mistaken for not having a default."""
@@ -1150,3 +1122,39 @@ class DeserializeListTestCase(TestCase):
         self.assertFalse(serializer.is_valid())
         expected = [{}, {'email': ['This field is required.']}, {}]
         self.assertEqual(serializer.errors, expected)
+
+
+class IneritedModelSerializationTests(TestCase):
+
+    def test_multitable_inherited_model_fields_as_expected(self):
+        """
+        Assert that the parent pointer field is not included in the fields
+        serialized fields
+        """
+        child = ChildModel(name1='parent name', name2='child name')
+        serializer = DerivedModelSerializer(child)
+        self.assertEqual(set(serializer.data.keys()),
+                         set(['name1', 'name2', 'id']))
+
+    def test_onetoone_primary_key_model_fields_as_expected(self):
+        """
+        Assert that a model with a onetoone field that is the primary key is
+        not treated like a derived model
+        """
+        parent = ParentModel(name1='parent name')
+        associate = AssociatedModel(name='hello', ref=parent)
+        serializer = AssociatedModelSerializer(associate)
+        self.assertEqual(set(serializer.data.keys()),
+                         set(['name', 'ref']))
+
+    def test_data_is_valid_without_parent_ptr(self):
+        """
+        Assert that the pointer to the parent table is not a required field
+        for input data
+        """
+        data = {
+            'name1': 'parent name',
+            'name2': 'child name',
+        }
+        serializer = DerivedModelSerializer(data=data)
+        self.assertEqual(serializer.is_valid(), True)