From b772c06358953760eee711513cfbb72ddb1dc90a Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Tue, 1 Aug 2017 11:37:53 +0200 Subject: [PATCH] move contrib tests to separate file --- polymorphic/tests/test_contrib.py | 26 ++++++++++++++++++++++++++ polymorphic/tests/test_orm.py | 18 ------------------ 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 polymorphic/tests/test_contrib.py diff --git a/polymorphic/tests/test_contrib.py b/polymorphic/tests/test_contrib.py new file mode 100644 index 0000000..414e6bd --- /dev/null +++ b/polymorphic/tests/test_contrib.py @@ -0,0 +1,26 @@ +from polymorphic.contrib.guardian import get_polymorphic_base_content_type +from polymorphic.tests import * # all models + + +class ContribTests(TestCase): + """ + The test suite + """ + + + def test_contrib_guardian(self): + # Regular Django inheritance should return the child model content type. + obj = PlainC() + ctype = get_polymorphic_base_content_type(obj) + self.assertEqual(ctype.name, 'plain c') + + ctype = get_polymorphic_base_content_type(PlainC) + self.assertEqual(ctype.name, 'plain c') + + # Polymorphic inheritance should return the parent model content type. + obj = Model2D() + ctype = get_polymorphic_base_content_type(obj) + self.assertEqual(ctype.name, 'model2a') + + ctype = get_polymorphic_base_content_type(Model2D) + self.assertEqual(ctype.name, 'model2a') diff --git a/polymorphic/tests/test_orm.py b/polymorphic/tests/test_orm.py index 3489783..e190adc 100644 --- a/polymorphic/tests/test_orm.py +++ b/polymorphic/tests/test_orm.py @@ -4,7 +4,6 @@ import django from django.db.models import Case, Count, Q, When from django.test import TestCase from django.utils import six -from polymorphic.contrib.guardian import get_polymorphic_base_content_type from polymorphic.tests import * # all models @@ -766,23 +765,6 @@ class PolymorphicTests(TestCase): result = Model2B.objects.annotate(val=Concat('field1', 'field2')) self.assertEqual(list(result), []) - def test_contrib_guardian(self): - # Regular Django inheritance should return the child model content type. - obj = PlainC() - ctype = get_polymorphic_base_content_type(obj) - self.assertEqual(ctype.name, 'plain c') - - ctype = get_polymorphic_base_content_type(PlainC) - self.assertEqual(ctype.name, 'plain c') - - # Polymorphic inheritance should return the parent model content type. - obj = Model2D() - ctype = get_polymorphic_base_content_type(obj) - self.assertEqual(ctype.name, 'model2a') - - ctype = get_polymorphic_base_content_type(Model2D) - self.assertEqual(ctype.name, 'model2a') - def qrepr(data): """