From 8d364763ed45f4298ac3395f41252e21e82f9f28 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 14 Oct 2010 01:40:20 +0000 Subject: [PATCH] Fixed #14456 -- converted inline_formsets tests from doctests to unittests. We have always been at war with doctests. Thanks to prestontimmons for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14212 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../regressiontests/inline_formsets/models.py | 44 +--------------- .../regressiontests/inline_formsets/tests.py | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/tests/regressiontests/inline_formsets/models.py b/tests/regressiontests/inline_formsets/models.py index 9b1f8b4932..d76eea758b 100644 --- a/tests/regressiontests/inline_formsets/models.py +++ b/tests/regressiontests/inline_formsets/models.py @@ -1,6 +1,7 @@ # coding: utf-8 from django.db import models + class School(models.Model): name = models.CharField(max_length=100) @@ -25,46 +26,3 @@ class Poem(models.Model): def __unicode__(self): return self.name - -__test__ = {'API_TESTS': """ - ->>> from django.forms.models import inlineformset_factory - - -Child has two ForeignKeys to Parent, so if we don't specify which one to use -for the inline formset, we should get an exception. - ->>> ifs = inlineformset_factory(Parent, Child) -Traceback (most recent call last): - ... -Exception: has more than 1 ForeignKey to - - -These two should both work without a problem. - ->>> ifs = inlineformset_factory(Parent, Child, fk_name='mother') ->>> ifs = inlineformset_factory(Parent, Child, fk_name='father') - - -If we specify fk_name, but it isn't a ForeignKey from the child model to the -parent model, we should get an exception. - ->>> ifs = inlineformset_factory(Parent, Child, fk_name='school') -Traceback (most recent call last): - ... -Exception: fk_name 'school' is not a ForeignKey to - - -If the field specified in fk_name is not a ForeignKey, we should get an -exception. - ->>> ifs = inlineformset_factory(Parent, Child, fk_name='test') -Traceback (most recent call last): - ... -Exception: has no field named 'test' - - -# Regression test for #9171. ->>> ifs = inlineformset_factory(Parent, Child, exclude=('school',), fk_name='mother') -""" -} diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/regressiontests/inline_formsets/tests.py index 83d2fba193..24488661c7 100644 --- a/tests/regressiontests/inline_formsets/tests.py +++ b/tests/regressiontests/inline_formsets/tests.py @@ -2,7 +2,9 @@ from django.test import TestCase from django.forms.models import inlineformset_factory from regressiontests.inline_formsets.models import Poet, Poem, School, Parent, Child + class DeletionTests(TestCase): + def test_deletion(self): PoemFormSet = inlineformset_factory(Poet, Poem, can_delete=True) poet = Poet.objects.create(name='test') @@ -103,3 +105,51 @@ class DeletionTests(TestCase): obj.save() self.assertEqual(school.child_set.count(), 1) + +class InlineFormsetFactoryTest(TestCase): + def test_inline_formset_factory(self): + """ + These should both work without a problem. + """ + inlineformset_factory(Parent, Child, fk_name='mother') + inlineformset_factory(Parent, Child, fk_name='father') + + def test_exception_on_unspecified_foreign_key(self): + """ + Child has two ForeignKeys to Parent, so if we don't specify which one + to use for the inline formset, we should get an exception. + """ + self.assertRaisesRegexp(Exception, + " has more than 1 ForeignKey to ", + inlineformset_factory, Parent, Child + ) + + def test_fk_name_not_foreign_key_field_from_child(self): + """ + If we specify fk_name, but it isn't a ForeignKey from the child model + to the parent model, we should get an exception. + """ + self.assertRaises(Exception, + "fk_name 'school' is not a ForeignKey to ", + inlineformset_factory, Parent, Child, fk_name='school' + ) + + def test_non_foreign_key_field(self): + """ + If the field specified in fk_name is not a ForeignKey, we should get an + exception. + """ + self.assertRaisesRegexp(Exception, + " has no field named 'test'", + inlineformset_factory, Parent, Child, fk_name='test' + ) + + def test_any_iterable_allowed_as_argument_to_exclude(self): + # Regression test for #9171. + inlineformset_factory( + Parent, Child, exclude=['school'], fk_name='mother' + ) + + inlineformset_factory( + Parent, Child, exclude=('school',), fk_name='mother' + )