From 52efbf97150410af3f7430d0a972ac061f80ca44 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 14 Oct 2010 01:17:14 +0000 Subject: [PATCH] Fixed #14460 -- converted managers_regress tests from doctests to unittests. We have always been at war with doctests. Patch from Gabriel Hurley. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14207 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../managers_regress/models.py | 53 ------------------ .../regressiontests/managers_regress/tests.py | 54 +++++++++++++++++++ 2 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 tests/regressiontests/managers_regress/tests.py diff --git a/tests/regressiontests/managers_regress/models.py b/tests/regressiontests/managers_regress/models.py index 41f6ec39a1..1e1b1c9981 100644 --- a/tests/regressiontests/managers_regress/models.py +++ b/tests/regressiontests/managers_regress/models.py @@ -98,56 +98,3 @@ class Child6(Child4): # Will not inherit default manager from parent. class Child7(Parent): pass - -__test__ = {"API_TESTS": """ ->>> a1 = Child1.objects.create(name='fred', data='a1') ->>> a2 = Child1.objects.create(name='barney', data='a2') ->>> b1 = Child2.objects.create(name='fred', data='b1', value=1) ->>> b2 = Child2.objects.create(name='barney', data='b2', value=42) ->>> c1 = Child3.objects.create(name='fred', data='c1', comment='yes') ->>> c2 = Child3.objects.create(name='barney', data='c2', comment='no') ->>> d1 = Child4.objects.create(name='fred', data='d1') ->>> d2 = Child4.objects.create(name='barney', data='d2') ->>> e1 = Child5.objects.create(name='fred', comment='yes') ->>> e2 = Child5.objects.create(name='barney', comment='no') ->>> f1 = Child6.objects.create(name='fred', data='f1', value=42) ->>> f2 = Child6.objects.create(name='barney', data='f2', value=42) ->>> g1 = Child7.objects.create(name='fred') ->>> g2 = Child7.objects.create(name='barney') - ->>> Child1.manager1.all() -[] ->>> Child1.manager2.all() -[] ->>> Child1._default_manager.all() -[] - ->>> Child2._default_manager.all() -[] ->>> Child2.restricted.all() -[] - ->>> Child3._default_manager.all() -[] ->>> Child3.manager1.all() -[] ->>> Child3.manager2.all() -[] - -# Since Child6 inherits from Child4, the corresponding rows from f1 and f2 also -# appear here. This is the expected result. ->>> Child4._default_manager.order_by('data') -[, , , ] ->>> Child4.manager1.all() -[, ] - ->>> Child5._default_manager.all() -[] - ->>> Child6._default_manager.all() -[] - ->>> Child7._default_manager.order_by('name') -[, ] - -"""} diff --git a/tests/regressiontests/managers_regress/tests.py b/tests/regressiontests/managers_regress/tests.py new file mode 100644 index 0000000000..9a6db61418 --- /dev/null +++ b/tests/regressiontests/managers_regress/tests.py @@ -0,0 +1,54 @@ +from django.test import TestCase + +from models import Child1, Child2, Child3, Child4, Child5, Child6, Child7 + + +class ManagersRegressionTests(TestCase): + def test_managers(self): + a1 = Child1.objects.create(name='fred', data='a1') + a2 = Child1.objects.create(name='barney', data='a2') + b1 = Child2.objects.create(name='fred', data='b1', value=1) + b2 = Child2.objects.create(name='barney', data='b2', value=42) + c1 = Child3.objects.create(name='fred', data='c1', comment='yes') + c2 = Child3.objects.create(name='barney', data='c2', comment='no') + d1 = Child4.objects.create(name='fred', data='d1') + d2 = Child4.objects.create(name='barney', data='d2') + e1 = Child5.objects.create(name='fred', comment='yes') + e2 = Child5.objects.create(name='barney', comment='no') + f1 = Child6.objects.create(name='fred', data='f1', value=42) + f2 = Child6.objects.create(name='barney', data='f2', value=42) + g1 = Child7.objects.create(name='fred') + g2 = Child7.objects.create(name='barney') + + self.assertQuerysetEqual(Child1.manager1.all(), [""]) + self.assertQuerysetEqual(Child1.manager2.all(), [""]) + self.assertQuerysetEqual(Child1._default_manager.all(), [""]) + + self.assertQuerysetEqual(Child2._default_manager.all(), [""]) + self.assertQuerysetEqual(Child2.restricted.all(), [""]) + + self.assertQuerysetEqual(Child3._default_manager.all(), [""]) + self.assertQuerysetEqual(Child3.manager1.all(), [""]) + self.assertQuerysetEqual(Child3.manager2.all(), [""]) + + # Since Child6 inherits from Child4, the corresponding rows from f1 and + # f2 also appear here. This is the expected result. + self.assertQuerysetEqual(Child4._default_manager.order_by('data'), [ + "", + "", + "", + "" + ] + ) + self.assertQuerysetEqual(Child4.manager1.all(), [ + "", + "" + ] + ) + self.assertQuerysetEqual(Child5._default_manager.all(), [""]) + self.assertQuerysetEqual(Child6._default_manager.all(), [""]) + self.assertQuerysetEqual(Child7._default_manager.order_by('name'), [ + "", + "" + ] + )