From a66e8ac579af2f47f772209b7761c651c6414e38 Mon Sep 17 00:00:00 2001
From: Adrien Brunet <adrien@emencia.com>
Date: Fri, 21 Dec 2018 16:01:52 +0100
Subject: [PATCH] Move test_relations_with_limited_querysets file within
 test_relations_pk

---
 tests/test_relations_pk.py                    | 26 +++++++++++--
 tests/test_relations_with_limited_queryset.py | 38 -------------------
 2 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 tests/test_relations_with_limited_queryset.py

diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py
index 3317d6251..31b6bb867 100644
--- a/tests/test_relations_pk.py
+++ b/tests/test_relations_pk.py
@@ -5,10 +5,10 @@ from django.utils import six
 
 from rest_framework import serializers
 from tests.models import (
-    ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget,
-    NullableForeignKeySource, NullableOneToOneSource,
-    NullableUUIDForeignKeySource, OneToOnePKSource, OneToOneTarget,
-    UUIDForeignKeyTarget
+    ForeignKeySource, ForeignKeySourceWithLimitedChoices, ForeignKeyTarget,
+    ManyToManySource, ManyToManyTarget, NullableForeignKeySource,
+    NullableOneToOneSource, NullableUUIDForeignKeySource, OneToOnePKSource,
+    OneToOneTarget, UUIDForeignKeyTarget
 )
 
 
@@ -38,6 +38,12 @@ class ForeignKeySourceSerializer(serializers.ModelSerializer):
         fields = ('id', 'name', 'target')
 
 
+class ForeignKeySourceWithLimitedChoicesSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ForeignKeySourceWithLimitedChoices
+        fields = ("id", "target")
+
+
 # Nullable ForeignKey
 class NullableForeignKeySourceSerializer(serializers.ModelSerializer):
     class Meta:
@@ -360,6 +366,18 @@ class PKForeignKeyTests(TestCase):
         serializer.is_valid(raise_exception=True)
         assert 'target' not in serializer.validated_data
 
+    def test_queryset_size_without_limited_choices(self):
+        limited_target = ForeignKeyTarget(name="limited-target")
+        limited_target.save()
+        queryset = ForeignKeySourceSerializer().fields["target"].get_queryset()
+        assert len(queryset) == 3
+
+    def test_queryset_size_with_limited_choices(self):
+        limited_target = ForeignKeyTarget(name="limited-target")
+        limited_target.save()
+        queryset = ForeignKeySourceWithLimitedChoicesSerializer().fields["target"].get_queryset()
+        assert len(queryset) == 1
+
 
 class PKNullableForeignKeyTests(TestCase):
     def setUp(self):
diff --git a/tests/test_relations_with_limited_queryset.py b/tests/test_relations_with_limited_queryset.py
deleted file mode 100644
index 4408520d3..000000000
--- a/tests/test_relations_with_limited_queryset.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from django.test import TestCase
-
-from rest_framework import serializers
-
-from .models import (
-    ForeignKeySource,
-    ForeignKeyTarget,
-    ForeignKeySourceWithLimitedChoices,
-)
-
-
-class ForeignKeySourceWithLimitedChoicesSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = ForeignKeySourceWithLimitedChoices
-        fields = ("id", "target")
-
-
-class ForeignKeySourceSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = ForeignKeySource
-        fields = ("id", "target")
-
-
-class LimitedChoicesInQuerySetTests(TestCase):
-    def setUp(self):
-        for idx in range(1, 4):
-            limited_target = ForeignKeyTarget(name="limited-target-%d" % idx)
-            limited_target.save()
-            target = ForeignKeyTarget(name="target-%d" % idx)
-            target.save()
-
-    def test_queryset_size_without_limited_choices(self):
-        queryset = ForeignKeySourceSerializer().fields["target"].get_queryset()
-        assert len(queryset) == 6
-
-    def test_queryset_size_with_limited_choices(self):
-        queryset = ForeignKeySourceWithLimitedChoicesSerializer().fields["target"].get_queryset()
-        assert len(queryset) == 3