From dd9d40d8c01f54f1542ba728d89b8b2da584dc1f Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin <maryokhin@gmail.com>
Date: Sat, 29 Nov 2014 20:04:50 +0100
Subject: [PATCH] Moved non-conflicting models

---
 tests/models.py        | 12 ------------
 tests/test_generics.py | 34 +++++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/tests/models.py b/tests/models.py
index a0e0b3cc8..456b0a0bb 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -17,11 +17,6 @@ class BasicModel(RESTFrameworkModel):
     text = models.CharField(max_length=100, verbose_name=_("Text comes here"), help_text=_("Text description."))
 
 
-class SlugBasedModel(RESTFrameworkModel):
-    text = models.CharField(max_length=100)
-    slug = models.SlugField(max_length=32)
-
-
 class BaseFilterableItem(RESTFrameworkModel):
     text = models.CharField(max_length=100)
 
@@ -34,13 +29,6 @@ class FilterableItem(BaseFilterableItem):
     date = models.DateField()
 
 
-# Model for regression test for #285
-class Comment(RESTFrameworkModel):
-    email = models.EmailField()
-    content = models.CharField(max_length=200)
-    created = models.DateTimeField(auto_now_add=True)
-
-
 # Models for relations tests
 # ManyToMany
 class ManyToManyTarget(RESTFrameworkModel):
diff --git a/tests/test_generics.py b/tests/test_generics.py
index 2690fb47c..b78584f01 100644
--- a/tests/test_generics.py
+++ b/tests/test_generics.py
@@ -6,12 +6,26 @@ from django.test import TestCase
 from django.utils import six
 from rest_framework import generics, renderers, serializers, status
 from rest_framework.test import APIRequestFactory
-from tests.models import BasicModel, Comment, SlugBasedModel
+from tests.models import BasicModel, RESTFrameworkModel
 from tests.models import ForeignKeySource, ForeignKeyTarget
 
 factory = APIRequestFactory()
 
 
+# Models
+class SlugBasedModel(RESTFrameworkModel):
+    text = models.CharField(max_length=100)
+    slug = models.SlugField(max_length=32)
+
+
+# Model for regression test for #285
+class Comment(RESTFrameworkModel):
+    email = models.EmailField()
+    content = models.CharField(max_length=200)
+    created = models.DateTimeField(auto_now_add=True)
+
+
+# Serializers
 class BasicSerializer(serializers.ModelSerializer):
     class Meta:
         model = BasicModel
@@ -22,6 +36,15 @@ class ForeignKeySerializer(serializers.ModelSerializer):
         model = ForeignKeySource
 
 
+class SlugSerializer(serializers.ModelSerializer):
+    slug = serializers.ReadOnlyField()
+
+    class Meta:
+        model = SlugBasedModel
+        fields = ('text', 'slug')
+
+
+# Views
 class RootView(generics.ListCreateAPIView):
     queryset = BasicModel.objects.all()
     serializer_class = BasicSerializer
@@ -37,14 +60,6 @@ class FKInstanceView(generics.RetrieveUpdateDestroyAPIView):
     serializer_class = ForeignKeySerializer
 
 
-class SlugSerializer(serializers.ModelSerializer):
-    slug = serializers.ReadOnlyField()
-
-    class Meta:
-        model = SlugBasedModel
-        fields = ('text', 'slug')
-
-
 class SlugBasedInstanceView(InstanceView):
     """
     A model with a slug-field.
@@ -54,6 +69,7 @@ class SlugBasedInstanceView(InstanceView):
     lookup_field = 'slug'
 
 
+# Tests
 class TestRootView(TestCase):
     def setUp(self):
         """