From dd441701ced9621f184f8e601339cfb9c16a844b Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sat, 3 Mar 2012 21:34:51 +0000 Subject: Fixed #17717 (again) -- Used the new API for concrete models added in r17573. Many thanks to Simon Charette and Anssi Kääriäinen. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.djangoproject.com/svn/django/trunk@17643 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/serializers_regress/models.py | 4 ++++ tests/regressiontests/serializers_regress/tests.py | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/regressiontests/serializers_regress/models.py b/tests/regressiontests/serializers_regress/models.py index 9381349a61..f366f90806 100644 --- a/tests/regressiontests/serializers_regress/models.py +++ b/tests/regressiontests/serializers_regress/models.py @@ -263,6 +263,10 @@ class ProxyBaseModel(BaseModel): class Meta: proxy = True +class ProxyProxyBaseModel(ProxyBaseModel): + class Meta: + proxy = True + class LengthModel(models.Model): data = models.IntegerField() diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/regressiontests/serializers_regress/tests.py index d8c5faba14..704e34b8ba 100644 --- a/tests/regressiontests/serializers_regress/tests.py +++ b/tests/regressiontests/serializers_regress/tests.py @@ -41,8 +41,8 @@ from .models import (BooleanData, CharData, DateData, DateTimeData, EmailData, GenericIPAddressPKData, PhonePKData, PositiveIntegerPKData, PositiveSmallIntegerPKData, SlugPKData, SmallPKData, USStatePKData, AutoNowDateTimeData, ModifyingSaveData, InheritAbstractModel, BaseModel, - ExplicitInheritBaseModel, InheritBaseModel, ProxyBaseModel, BigIntegerData, - LengthModel, Tag, ComplexModel) + ExplicitInheritBaseModel, InheritBaseModel, ProxyBaseModel, + ProxyProxyBaseModel, BigIntegerData, LengthModel, Tag, ComplexModel) # A set of functions that can be used to recreate # test data objects of various kinds. @@ -410,11 +410,14 @@ class SerializerTests(TestCase): def test_serialize_proxy_model(self): BaseModel.objects.create(parent_data=1) - base_objects = BaseModel.objects.all() + base_objects = BaseModel.objects.all() proxy_objects = ProxyBaseModel.objects.all() - base_data = serializers.serialize("json", base_objects) + proxy_proxy_objects = ProxyProxyBaseModel.objects.all() + base_data = serializers.serialize("json", base_objects) proxy_data = serializers.serialize("json", proxy_objects) + proxy_proxy_data = serializers.serialize("json", proxy_proxy_objects) self.assertEqual(base_data, proxy_data.replace('proxy', '')) + self.assertEqual(base_data, proxy_proxy_data.replace('proxy', '')) def serializerTest(format, self): -- cgit v1.3