Author: russellm
Date: 2010-10-11 19:55:31 -0500 (Mon, 11 Oct 2010)
New Revision: 14165
Added:
django/trunk/tests/modeltests/properties/tests.py
Modified:
django/trunk/tests/modeltests/properties/models.py
Log:
Migrated properties doctests. Thanks to George Sakkis for the patch.
Modified: django/trunk/tests/modeltests/properties/models.py
===================================================================
--- django/trunk/tests/modeltests/properties/models.py 2010-10-12 00:55:05 UTC
(rev 14164)
+++ django/trunk/tests/modeltests/properties/models.py 2010-10-12 00:55:31 UTC
(rev 14165)
@@ -19,22 +19,3 @@
full_name = property(_get_full_name)
full_name_2 = property(_get_full_name, _set_full_name)
-
-__test__ = {'API_TESTS':"""
->>> a = Person(first_name='John', last_name='Lennon')
->>> a.save()
->>> a.full_name
-'John Lennon'
-
-# The "full_name" property hasn't provided a "set" method.
->>> a.full_name = 'Paul McCartney'
-Traceback (most recent call last):
- ...
-AttributeError: can't set attribute
-
-# But "full_name_2" has, and it can be used to initialise the class.
->>> a2 = Person(full_name_2 = 'Paul McCartney')
->>> a2.save()
->>> a2.first_name
-'Paul'
-"""}
Added: django/trunk/tests/modeltests/properties/tests.py
===================================================================
--- django/trunk/tests/modeltests/properties/tests.py
(rev 0)
+++ django/trunk/tests/modeltests/properties/tests.py 2010-10-12 00:55:31 UTC
(rev 14165)
@@ -0,0 +1,20 @@
+from django.test import TestCase
+from models import Person
+
+class PropertyTests(TestCase):
+
+ def setUp(self):
+ self.a = Person(first_name='John', last_name='Lennon')
+ self.a.save()
+
+ def test_getter(self):
+ self.assertEqual(self.a.full_name, 'John Lennon')
+
+ def test_setter(self):
+ # The "full_name" property hasn't provided a "set" method.
+ self.assertRaises(AttributeError, setattr, self.a, 'full_name', 'Paul
McCartney')
+
+ # But "full_name_2" has, and it can be used to initialise the class.
+ a2 = Person(full_name_2 = 'Paul McCartney')
+ a2.save()
+ self.assertEqual(a2.first_name, 'Paul')
--
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.
