Author: jezdez
Date: 2010-09-10 15:54:01 -0500 (Fri, 10 Sep 2010)
New Revision: 13725
Added:
django/trunk/tests/modeltests/choices/tests.py
Modified:
django/trunk/tests/modeltests/choices/models.py
Log:
Converted doctest to unittest. Patch by Alex Gaynor.
Modified: django/trunk/tests/modeltests/choices/models.py
===================================================================
--- django/trunk/tests/modeltests/choices/models.py 2010-09-10 19:46:25 UTC
(rev 13724)
+++ django/trunk/tests/modeltests/choices/models.py 2010-09-10 20:54:01 UTC
(rev 13725)
@@ -22,29 +22,3 @@
def __unicode__(self):
return self.name
-
-__test__ = {'API_TESTS':"""
->>> a = Person(name='Adrian', gender='M')
->>> a.save()
->>> s = Person(name='Sara', gender='F')
->>> s.save()
->>> a.gender
-'M'
->>> s.gender
-'F'
->>> a.get_gender_display()
-u'Male'
->>> s.get_gender_display()
-u'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 = ''
->>> a.get_gender_display()
-u''
-
->>> a.gender = 'U'
->>> a.get_gender_display()
-u'U'
-
-"""}
Added: django/trunk/tests/modeltests/choices/tests.py
===================================================================
--- django/trunk/tests/modeltests/choices/tests.py
(rev 0)
+++ django/trunk/tests/modeltests/choices/tests.py 2010-09-10 20:54:01 UTC
(rev 13725)
@@ -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')
+
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
