Author: Alex
Date: 2010-10-11 21:09:35 -0500 (Mon, 11 Oct 2010)
New Revision: 14182
Added:
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/tests.py
Modified:
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/models.py
Log:
[1.2.X] Converted model_inheritance_select_related tests from doctests to
unittests. We have always been at war with doctests. Backport of [14181].
Modified:
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/models.py
===================================================================
---
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/models.py
2010-10-12 02:09:13 UTC (rev 14181)
+++
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/models.py
2010-10-12 02:09:35 UTC (rev 14182)
@@ -27,21 +27,3 @@
def __unicode__(self):
return self.name
-
-__test__ = {'API_TESTS':"""
-Regression test for #7246
-
->>> r1 = Restaurant.objects.create(name="Nobu", serves_sushi=True,
serves_steak=False)
->>> r2 = Restaurant.objects.create(name="Craft", serves_sushi=False,
serves_steak=True)
->>> p1 = Person.objects.create(name="John", favorite_restaurant=r1)
->>> p2 = Person.objects.create(name="Jane", favorite_restaurant=r2)
-
->>> Person.objects.order_by('name').select_related()
-[<Person: Jane>, <Person: John>]
-
->>> jane =
Person.objects.order_by('name').select_related('favorite_restaurant')[0]
->>> jane.favorite_restaurant.name
-u'Craft'
-
-"""}
-
Added:
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/tests.py
===================================================================
---
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/tests.py
(rev 0)
+++
django/branches/releases/1.2.X/tests/regressiontests/model_inheritance_select_related/tests.py
2010-10-12 02:09:35 UTC (rev 14182)
@@ -0,0 +1,29 @@
+from operator import attrgetter
+
+from django.test import TestCase
+
+from models import Restaurant, Person
+
+
+class ModelInheritanceSelectRelatedTests(TestCase):
+ def test_inherited_select_related(self):
+ # Regression test for #7246
+ r1 = Restaurant.objects.create(
+ name="Nobu", serves_sushi=True, serves_steak=False
+ )
+ r2 = Restaurant.objects.create(
+ name="Craft", serves_sushi=False, serves_steak=True
+ )
+ p1 = Person.objects.create(name="John", favorite_restaurant=r1)
+ p2 = Person.objects.create(name="Jane", favorite_restaurant=r2)
+
+ self.assertQuerysetEqual(
+ Person.objects.order_by("name").select_related(), [
+ "Jane",
+ "John",
+ ],
+ attrgetter("name")
+ )
+
+ jane =
Person.objects.order_by("name").select_related("favorite_restaurant")[0]
+ self.assertEqual(jane.favorite_restaurant.name, "Craft")
--
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.
