From 2bbea7555be92e5d7245ddf3a01ecd88bee906ef Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 14 Oct 2010 01:10:57 +0000 Subject: [PATCH] Fixed #14458 -- converted m2m_regress tests from doctests to unittests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14205 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/m2m_regress/models.py | 67 ------------------ tests/regressiontests/m2m_regress/tests.py | 75 +++++++++++++++++++++ 2 files changed, 75 insertions(+), 67 deletions(-) create mode 100644 tests/regressiontests/m2m_regress/tests.py diff --git a/tests/regressiontests/m2m_regress/models.py b/tests/regressiontests/m2m_regress/models.py index 5453d396ae..1c2126d76a 100644 --- a/tests/regressiontests/m2m_regress/models.py +++ b/tests/regressiontests/m2m_regress/models.py @@ -56,70 +56,3 @@ class Worksheet(models.Model): class User(models.Model): name = models.CharField(max_length=30) friends = models.ManyToManyField(auth.User) - -__test__ = {"regressions": """ -# Multiple m2m references to the same model or a different model must be -# distinguished when accessing the relations through an instance attribute. - ->>> s1 = SelfRefer.objects.create(name='s1') ->>> s2 = SelfRefer.objects.create(name='s2') ->>> s3 = SelfRefer.objects.create(name='s3') ->>> s1.references.add(s2) ->>> s1.related.add(s3) - ->>> e1 = Entry.objects.create(name='e1') ->>> t1 = Tag.objects.create(name='t1') ->>> t2 = Tag.objects.create(name='t2') ->>> e1.topics.add(t1) ->>> e1.related.add(t2) - ->>> s1.references.all() -[] ->>> s1.related.all() -[] - ->>> e1.topics.all() -[] ->>> e1.related.all() -[] - -# The secret internal related names for self-referential many-to-many fields -# shouldn't appear in the list when an error is made. ->>> SelfRefer.objects.filter(porcupine='fred') -Traceback (most recent call last): -... -FieldError: Cannot resolve keyword 'porcupine' into field. Choices are: id, name, references, related, selfreferchild, selfreferchildsibling - -# Test to ensure that the relationship between two inherited models -# with a self-referential m2m field maintains symmetry ->>> sr_child = SelfReferChild(name="Hanna") ->>> sr_child.save() - ->>> sr_sibling = SelfReferChildSibling(name="Beth") ->>> sr_sibling.save() ->>> sr_child.related.add(sr_sibling) ->>> sr_child.related.all() -[] ->>> sr_sibling.related.all() -[] - -# Regression for #11311 - The primary key for models in a m2m relation -# doesn't have to be an AutoField ->>> w = Worksheet(id='abc') ->>> w.save() ->>> w.delete() - -# Regression for #11956 -- You can add an object to a m2m with the -# base class without causing integrity errors ->>> c1 = TagCollection.objects.create(name='c1') ->>> c1.tags = [t1,t2] - ->>> c1 = TagCollection.objects.get(name='c1') ->>> c1.tags.all() -[, ] - ->>> t1.tag_collections.all() -[] - -""" -} diff --git a/tests/regressiontests/m2m_regress/tests.py b/tests/regressiontests/m2m_regress/tests.py new file mode 100644 index 0000000000..7bf2381a91 --- /dev/null +++ b/tests/regressiontests/m2m_regress/tests.py @@ -0,0 +1,75 @@ +from django.core.exceptions import FieldError +from django.test import TestCase + +from models import (SelfRefer, Tag, TagCollection, Entry, SelfReferChild, + SelfReferChildSibling, Worksheet) + + +class M2MRegressionTests(TestCase): + def test_multiple_m2m(self): + # Multiple m2m references to model must be distinguished when + # accessing the relations through an instance attribute. + + s1 = SelfRefer.objects.create(name='s1') + s2 = SelfRefer.objects.create(name='s2') + s3 = SelfRefer.objects.create(name='s3') + s1.references.add(s2) + s1.related.add(s3) + + e1 = Entry.objects.create(name='e1') + t1 = Tag.objects.create(name='t1') + t2 = Tag.objects.create(name='t2') + + e1.topics.add(t1) + e1.related.add(t2) + + self.assertQuerysetEqual(s1.references.all(), [""]) + self.assertQuerysetEqual(s1.related.all(), [""]) + + self.assertQuerysetEqual(e1.topics.all(), [""]) + self.assertQuerysetEqual(e1.related.all(), [""]) + + def test_internal_related_name_not_in_error_msg(self): + # The secret internal related names for self-referential many-to-many + # fields shouldn't appear in the list when an error is made. + + self.assertRaisesRegexp(FieldError, + "Choices are: id, name, references, related, selfreferchild, selfreferchildsibling$", + lambda: SelfRefer.objects.filter(porcupine='fred') + ) + + def test_m2m_inheritance_symmetry(self): + # Test to ensure that the relationship between two inherited models + # with a self-referential m2m field maintains symmetry + + sr_child = SelfReferChild(name="Hanna") + sr_child.save() + + sr_sibling = SelfReferChildSibling(name="Beth") + sr_sibling.save() + sr_child.related.add(sr_sibling) + + self.assertQuerysetEqual(sr_child.related.all(), [""]) + self.assertQuerysetEqual(sr_sibling.related.all(), [""]) + + def test_m2m_pk_field_type(self): + # Regression for #11311 - The primary key for models in a m2m relation + # doesn't have to be an AutoField + + w = Worksheet(id='abc') + w.save() + w.delete() + + def test_add_m2m_with_base_class(self): + # Regression for #11956 -- You can add an object to a m2m with the + # base class without causing integrity errors + + t1 = Tag.objects.create(name='t1') + t2 = Tag.objects.create(name='t2') + + c1 = TagCollection.objects.create(name='c1') + c1.tags = [t1,t2] + c1 = TagCollection.objects.get(name='c1') + + self.assertQuerysetEqual(c1.tags.all(), ["", ""]) + self.assertQuerysetEqual(t1.tag_collections.all(), [""])