Author: russellm
Date: 2010-09-28 02:06:15 -0500 (Tue, 28 Sep 2010)
New Revision: 13926

Added:
   django/trunk/tests/regressiontests/reverse_single_related/tests.py
Modified:
   django/trunk/tests/regressiontests/reverse_single_related/models.py
Log:
Migrated reverse_single_related doctests. Thanks to Stephan Jaekel.

Modified: django/trunk/tests/regressiontests/reverse_single_related/models.py
===================================================================
--- django/trunk/tests/regressiontests/reverse_single_related/models.py 
2010-09-28 07:05:51 UTC (rev 13925)
+++ django/trunk/tests/regressiontests/reverse_single_related/models.py 
2010-09-28 07:06:15 UTC (rev 13926)
@@ -1,11 +1,5 @@
-"""
-Regression tests for an object that cannot access a single related object due
-to a restrictive default manager.
-"""
-
 from django.db import models
 
-
 class SourceManager(models.Manager):
     def get_query_set(self):
         return super(SourceManager, 
self).get_query_set().filter(is_public=True)
@@ -16,39 +10,3 @@
 
 class Item(models.Model):
     source = models.ForeignKey(Source)
-
-
-__test__ = {'API_TESTS':"""
-
->>> public_source = Source.objects.create(is_public=True)
->>> public_item = Item.objects.create(source=public_source)
-
->>> private_source = Source.objects.create(is_public=False)
->>> private_item = Item.objects.create(source=private_source)
-
-# Only one source is available via all() due to the custom default manager.
-
->>> Source.objects.all()
-[<Source: Source object>]
-
->>> public_item.source
-<Source: Source object>
-
-# Make sure that an item can still access its related source even if the 
default
-# manager doesn't normally allow it.
-
->>> private_item.source
-<Source: Source object>
-
-# If the manager is marked "use_for_related_fields", it'll get used instead
-# of the "bare" queryset. Usually you'd define this as a property on the class,
-# but this approximates that in a way that's easier in tests.
-
->>> Source.objects.use_for_related_fields = True
->>> private_item = Item.objects.get(pk=private_item.pk)
->>> private_item.source
-Traceback (most recent call last):
-    ...
-DoesNotExist: Source matching query does not exist.
-
-"""}

Added: django/trunk/tests/regressiontests/reverse_single_related/tests.py
===================================================================
--- django/trunk/tests/regressiontests/reverse_single_related/tests.py          
                (rev 0)
+++ django/trunk/tests/regressiontests/reverse_single_related/tests.py  
2010-09-28 07:06:15 UTC (rev 13926)
@@ -0,0 +1,36 @@
+from django.test import TestCase
+
+from regressiontests.reverse_single_related.models import *
+
+class ReverseSingleRelatedTests(TestCase):
+    """
+    Regression tests for an object that cannot access a single related
+    object due to a restrictive default manager.
+    """
+
+    def test_reverse_single_related(self):
+
+        public_source = Source.objects.create(is_public=True)
+        public_item = Item.objects.create(source=public_source)
+
+        private_source = Source.objects.create(is_public=False)
+        private_item = Item.objects.create(source=private_source)
+
+        # Only one source is available via all() due to the custom default 
manager.
+        self.assertQuerysetEqual(
+                Source.objects.all(),
+                ["<Source: Source object>"]
+        )
+
+        self.assertEquals(public_item.source, public_source)
+
+        # Make sure that an item can still access its related source even if 
the default
+        # manager doesn't normally allow it.
+        self.assertEquals(private_item.source, private_source)
+
+        # If the manager is marked "use_for_related_fields", it'll get used 
instead
+        # of the "bare" queryset. Usually you'd define this as a property on 
the class,
+        # but this approximates that in a way that's easier in tests.
+        Source.objects.use_for_related_fields = True
+        private_item = Item.objects.get(pk=private_item.pk)
+        self.assertRaises(Source.DoesNotExist, lambda: private_item.source)

-- 
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.

Reply via email to