Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #14459 -- converted many_to_one_regress tests from doct…

…ests to unittests. We have always been at war with doctests. Patch from Gabriel Hurley. Backport of [14210].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 14419f916bbbe8017976b19a3bcf7d45e0f30f64 1 parent 25db006
@alex alex authored
View
130 tests/regressiontests/many_to_one_regress/models.py
@@ -44,133 +44,3 @@ class Relation(models.Model):
def __unicode__(self):
return u"%s - %s" % (self.left.category.name, self.right.category.name)
-
-
-__test__ = {'API_TESTS':"""
->>> Third.objects.create(id='3', name='An example')
-<Third: Third object>
->>> parent = Parent(name = 'fred')
->>> parent.save()
->>> Child.objects.create(name='bam-bam', parent=parent)
-<Child: Child object>
-
-#
-# Tests of ForeignKey assignment and the related-object cache (see #6886).
-#
->>> p = Parent.objects.create(name="Parent")
->>> c = Child.objects.create(name="Child", parent=p)
-
-# Look up the object again so that we get a "fresh" object.
->>> c = Child.objects.get(name="Child")
->>> p = c.parent
-
-# Accessing the related object again returns the exactly same object.
->>> c.parent is p
-True
-
-# But if we kill the cache, we get a new object.
->>> del c._parent_cache
->>> c.parent is p
-False
-
-# Assigning a new object results in that object getting cached immediately.
->>> p2 = Parent.objects.create(name="Parent 2")
->>> c.parent = p2
->>> c.parent is p2
-True
-
-# Assigning None succeeds if field is null=True.
->>> p.bestchild = None
->>> p.bestchild is None
-True
-
-# bestchild should still be None after saving.
->>> p.save()
->>> p.bestchild is None
-True
-
-# bestchild should still be None after fetching the object again.
->>> p = Parent.objects.get(name="Parent")
->>> p.bestchild is None
-True
-
-# Assigning None fails: Child.parent is null=False.
->>> c.parent = None
-Traceback (most recent call last):
- ...
-ValueError: Cannot assign None: "Child.parent" does not allow null values.
-
-# You also can't assign an object of the wrong type here
->>> c.parent = First(id=1, second=1)
-Traceback (most recent call last):
- ...
-ValueError: Cannot assign "<First: First object>": "Child.parent" must be a "Parent" instance.
-
-# Nor can you explicitly assign None to Child.parent during object creation
-# (regression for #9649).
->>> Child(name='xyzzy', parent=None)
-Traceback (most recent call last):
- ...
-ValueError: Cannot assign None: "Child.parent" does not allow null values.
->>> Child.objects.create(name='xyzzy', parent=None)
-Traceback (most recent call last):
- ...
-ValueError: Cannot assign None: "Child.parent" does not allow null values.
-
-# Creation using keyword argument should cache the related object.
->>> p = Parent.objects.get(name="Parent")
->>> c = Child(parent=p)
->>> c.parent is p
-True
-
-# Creation using keyword argument and unsaved related instance (#8070).
->>> p = Parent()
->>> c = Child(parent=p)
->>> c.parent is p
-True
-
-# Creation using attname keyword argument and an id will cause the related
-# object to be fetched.
->>> p = Parent.objects.get(name="Parent")
->>> c = Child(parent_id=p.id)
->>> c.parent is p
-False
->>> c.parent == p
-True
-
-
-#
-# Test of multiple ForeignKeys to the same model (bug #7125).
-#
->>> c1 = Category.objects.create(name='First')
->>> c2 = Category.objects.create(name='Second')
->>> c3 = Category.objects.create(name='Third')
->>> r1 = Record.objects.create(category=c1)
->>> r2 = Record.objects.create(category=c1)
->>> r3 = Record.objects.create(category=c2)
->>> r4 = Record.objects.create(category=c2)
->>> r5 = Record.objects.create(category=c3)
->>> r = Relation.objects.create(left=r1, right=r2)
->>> r = Relation.objects.create(left=r3, right=r4)
->>> r = Relation.objects.create(left=r1, right=r3)
->>> r = Relation.objects.create(left=r5, right=r2)
->>> r = Relation.objects.create(left=r3, right=r2)
-
->>> Relation.objects.filter(left__category__name__in=['First'], right__category__name__in=['Second'])
-[<Relation: First - Second>]
-
->>> Category.objects.filter(record__left_set__right__category__name='Second').order_by('name')
-[<Category: First>, <Category: Second>]
-
->>> c2 = Child.objects.create(name="Grandchild", parent=c)
-Traceback (most recent call last):
- ...
-ValueError: Cannot assign "<Child: Child object>": "Child.parent" must be a "Parent" instance.
-
-# Regression for #12190 -- Should be able to instantiate a FK
-# outside of a model, and interrogate its related field.
->>> cat = models.ForeignKey(Category)
->>> cat.rel.get_related_field().name
-'id'
-
-"""}
View
105 tests/regressiontests/many_to_one_regress/tests.py
@@ -0,0 +1,105 @@
+from django.db import models
+from django.test import TestCase
+
+from models import First, Second, Third, Parent, Child, Category, Record, Relation
+
+class ManyToOneRegressionTests(TestCase):
+ def test_object_creation(self):
+ Third.objects.create(id='3', name='An example')
+ parent = Parent(name='fred')
+ parent.save()
+ Child.objects.create(name='bam-bam', parent=parent)
+
+ def test_fk_assignment_and_related_object_cache(self):
+ # Tests of ForeignKey assignment and the related-object cache (see #6886).
+
+ p = Parent.objects.create(name="Parent")
+ c = Child.objects.create(name="Child", parent=p)
+
+ # Look up the object again so that we get a "fresh" object.
+ c = Child.objects.get(name="Child")
+ p = c.parent
+
+ # Accessing the related object again returns the exactly same object.
+ self.assertTrue(c.parent is p)
+
+ # But if we kill the cache, we get a new object.
+ del c._parent_cache
+ self.assertFalse(c.parent is p)
+
+ # Assigning a new object results in that object getting cached immediately.
+ p2 = Parent.objects.create(name="Parent 2")
+ c.parent = p2
+ self.assertTrue(c.parent is p2)
+
+ # Assigning None succeeds if field is null=True.
+ p.bestchild = None
+ self.assertTrue(p.bestchild is None)
+
+ # bestchild should still be None after saving.
+ p.save()
+ self.assertTrue(p.bestchild is None)
+
+ # bestchild should still be None after fetching the object again.
+ p = Parent.objects.get(name="Parent")
+ self.assertTrue(p.bestchild is None)
+
+ # Assigning None fails: Child.parent is null=False.
+ self.assertRaises(ValueError, setattr, c, "parent", None)
+
+ # You also can't assign an object of the wrong type here
+ self.assertRaises(ValueError, setattr, c, "parent", First(id=1, second=1))
+
+ # Nor can you explicitly assign None to Child.parent during object
+ # creation (regression for #9649).
+ self.assertRaises(ValueError, Child, name='xyzzy', parent=None)
+ self.assertRaises(ValueError, Child.objects.create, name='xyzzy', parent=None)
+
+ # Creation using keyword argument should cache the related object.
+ p = Parent.objects.get(name="Parent")
+ c = Child(parent=p)
+ self.assertTrue(c.parent is p)
+
+ # Creation using keyword argument and unsaved related instance (#8070).
+ p = Parent()
+ c = Child(parent=p)
+ self.assertTrue(c.parent is p)
+
+ # Creation using attname keyword argument and an id will cause the
+ # related object to be fetched.
+ p = Parent.objects.get(name="Parent")
+ c = Child(parent_id=p.id)
+ self.assertFalse(c.parent is p)
+ self.assertEqual(c.parent, p)
+
+ def test_multiple_foreignkeys(self):
+ # Test of multiple ForeignKeys to the same model (bug #7125).
+ c1 = Category.objects.create(name='First')
+ c2 = Category.objects.create(name='Second')
+ c3 = Category.objects.create(name='Third')
+ r1 = Record.objects.create(category=c1)
+ r2 = Record.objects.create(category=c1)
+ r3 = Record.objects.create(category=c2)
+ r4 = Record.objects.create(category=c2)
+ r5 = Record.objects.create(category=c3)
+ r = Relation.objects.create(left=r1, right=r2)
+ r = Relation.objects.create(left=r3, right=r4)
+ r = Relation.objects.create(left=r1, right=r3)
+ r = Relation.objects.create(left=r5, right=r2)
+ r = Relation.objects.create(left=r3, right=r2)
+
+ q1 = Relation.objects.filter(left__category__name__in=['First'], right__category__name__in=['Second'])
+ self.assertQuerysetEqual(q1, ["<Relation: First - Second>"])
+
+ q2 = Category.objects.filter(record__left_set__right__category__name='Second').order_by('name')
+ self.assertQuerysetEqual(q2, ["<Category: First>", "<Category: Second>"])
+
+ p = Parent.objects.create(name="Parent")
+ c = Child.objects.create(name="Child", parent=p)
+ self.assertRaises(ValueError, Child.objects.create, name="Grandchild", parent=c)
+
+ def test_fk_instantiation_outside_model(self):
+ # Regression for #12190 -- Should be able to instantiate a FK outside
+ # of a model, and interrogate its related field.
+ cat = models.ForeignKey(Category)
+ self.assertEqual('id', cat.rel.get_related_field().name)

0 comments on commit 14419f9

Please sign in to comment.
Something went wrong with that request. Please try again.