diff -r 5ff1fc726848 -r c6bca38c1cbf parts/django/tests/modeltests/choices/tests.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/parts/django/tests/modeltests/choices/tests.py	Sat Jan 08 11:20:57 2011 +0530
@@ -0,0 +1,23 @@
+from django.test import TestCase
+
+from models import Person
+
+
+class ChoicesTests(TestCase):
+    def test_display(self):
+        a = Person.objects.create(name='Adrian', gender='M')
+        s = Person.objects.create(name='Sara', gender='F')
+        self.assertEqual(a.gender, 'M')
+        self.assertEqual(s.gender, 'F')
+        
+        self.assertEqual(a.get_gender_display(), 'Male')
+        self.assertEqual(s.get_gender_display(), 'Female')
+        
+        # If the value for the field doesn't correspond to a valid choice,
+        # the value itself is provided as a display value.
+        a.gender = ''
+        self.assertEqual(a.get_gender_display(), '')
+
+        a.gender = 'U'
+        self.assertEqual(a.get_gender_display(), 'U')
+