Tests for retrieving nullable relations

2 files changed, 32 insertions, 8 deletions

diff --git a/rest_framework/tests/relations_hyperlink.py b/rest_framework/tests/relations_hyperlink.py
index 53ce0074..86d7b1c2 100644
--- a/rest_framework/tests/relations_hyperlink.py
+++ b/rest_framework/tests/relations_hyperlink.py
@@ -249,9 +249,21 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
         target = ForeignKeyTarget(name='target-1')
         target.save()
         for idx in range(1, 4):
+            if idx == 3:
+                target = None
             source = NullableForeignKeySource(name='source-%d' % idx, target=target)
             source.save()
 
+    def test_foreign_key_retrieve_with_null(self):
+        queryset = NullableForeignKeySource.objects.all()
+        serializer = NullableForeignKeySourceSerializer(queryset)
+        expected = [
+            {'url': '/nullableforeignkeysource/1/', 'name': u'source-1', 'target': '/foreignkeytarget/1/'},
+            {'url': '/nullableforeignkeysource/2/', 'name': u'source-2', 'target': '/foreignkeytarget/1/'},
+            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': None},
+        ]
+        self.assertEquals(serializer.data, expected)
+
     def test_foreign_key_create_with_valid_null(self):
         data = {'url': '/nullableforeignkeysource/4/', 'name': u'source-4', 'target': None}
         serializer = NullableForeignKeySourceSerializer(data=data)
@@ -266,7 +278,7 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
         expected = [
             {'url': '/nullableforeignkeysource/1/', 'name': u'source-1', 'target': '/foreignkeytarget/1/'},
             {'url': '/nullableforeignkeysource/2/', 'name': u'source-2', 'target': '/foreignkeytarget/1/'},
-            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': '/foreignkeytarget/1/'},
+            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': None},
             {'url': '/nullableforeignkeysource/4/', 'name': u'source-4', 'target': None}
         ]
         self.assertEquals(serializer.data, expected)
@@ -290,7 +302,7 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
         expected = [
             {'url': '/nullableforeignkeysource/1/', 'name': u'source-1', 'target': '/foreignkeytarget/1/'},
             {'url': '/nullableforeignkeysource/2/', 'name': u'source-2', 'target': '/foreignkeytarget/1/'},
-            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': '/foreignkeytarget/1/'},
+            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': None},
             {'url': '/nullableforeignkeysource/4/', 'name': u'source-4', 'target': None}
         ]
         self.assertEquals(serializer.data, expected)
@@ -309,7 +321,7 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
         expected = [
             {'url': '/nullableforeignkeysource/1/', 'name': u'source-1', 'target': None},
             {'url': '/nullableforeignkeysource/2/', 'name': u'source-2', 'target': '/foreignkeytarget/1/'},
-            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': '/foreignkeytarget/1/'},
+            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': None},
         ]
         self.assertEquals(serializer.data, expected)
 
@@ -332,7 +344,7 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
         expected = [
             {'url': '/nullableforeignkeysource/1/', 'name': u'source-1', 'target': None},
             {'url': '/nullableforeignkeysource/2/', 'name': u'source-2', 'target': '/foreignkeytarget/1/'},
-            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': '/foreignkeytarget/1/'},
+            {'url': '/nullableforeignkeysource/3/', 'name': u'source-3', 'target': None},
         ]
         self.assertEquals(serializer.data, expected)
 
diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/relations_pk.py
index e3360939..7a1fe07c 100644
--- a/rest_framework/tests/relations_pk.py
+++ b/rest_framework/tests/relations_pk.py
@@ -229,9 +229,21 @@ class PKNullableForeignKeyTests(TestCase):
         target = ForeignKeyTarget(name='target-1')
         target.save()
         for idx in range(1, 4):
+            if idx == 3:
+                target = None
             source = NullableForeignKeySource(name='source-%d' % idx, target=target)
             source.save()
 
+    def test_foreign_key_retrieve_with_null(self):
+        queryset = NullableForeignKeySource.objects.all()
+        serializer = NullableForeignKeySourceSerializer(queryset)
+        expected = [
+            {'id': 1, 'name': u'source-1', 'target': 1},
+            {'id': 2, 'name': u'source-2', 'target': 1},
+            {'id': 3, 'name': u'source-3', 'target': None},
+        ]
+        self.assertEquals(serializer.data, expected)
+
     def test_foreign_key_create_with_valid_null(self):
         data = {'id': 4, 'name': u'source-4', 'target': None}
         serializer = NullableForeignKeySourceSerializer(data=data)
@@ -246,7 +258,7 @@ class PKNullableForeignKeyTests(TestCase):
         expected = [
             {'id': 1, 'name': u'source-1', 'target': 1},
             {'id': 2, 'name': u'source-2', 'target': 1},
-            {'id': 3, 'name': u'source-3', 'target': 1},
+            {'id': 3, 'name': u'source-3', 'target': None},
             {'id': 4, 'name': u'source-4', 'target': None}
         ]
         self.assertEquals(serializer.data, expected)
@@ -270,7 +282,7 @@ class PKNullableForeignKeyTests(TestCase):
         expected = [
             {'id': 1, 'name': u'source-1', 'target': 1},
             {'id': 2, 'name': u'source-2', 'target': 1},
-            {'id': 3, 'name': u'source-3', 'target': 1},
+            {'id': 3, 'name': u'source-3', 'target': None},
             {'id': 4, 'name': u'source-4', 'target': None}
         ]
         self.assertEquals(serializer.data, expected)
@@ -289,7 +301,7 @@ class PKNullableForeignKeyTests(TestCase):
         expected = [
             {'id': 1, 'name': u'source-1', 'target': None},
             {'id': 2, 'name': u'source-2', 'target': 1},
-            {'id': 3, 'name': u'source-3', 'target': 1}
+            {'id': 3, 'name': u'source-3', 'target': None}
         ]
         self.assertEquals(serializer.data, expected)
 
@@ -312,7 +324,7 @@ class PKNullableForeignKeyTests(TestCase):
         expected = [
             {'id': 1, 'name': u'source-1', 'target': None},
             {'id': 2, 'name': u'source-2', 'target': 1},
-            {'id': 3, 'name': u'source-3', 'target': 1}
+            {'id': 3, 'name': u'source-3', 'target': None}
         ]
         self.assertEquals(serializer.data, expected)