Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Migrated admin_ordering doctests. Thanks to Sebastian Hillig.

Backport of r13881 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3a66f15a68c589de07251f3de6e155ddf0422af2 1 parent 3640abd
@freakboy3742 freakboy3742 authored
View
36 tests/regressiontests/admin_ordering/models.py
@@ -8,39 +8,3 @@ class Band(models.Model):
class Meta:
ordering = ('name',)
-
-__test__ = {'API_TESTS': """
-
-Let's make sure that ModelAdmin.queryset uses the ordering we define in
-ModelAdmin rather that ordering defined in the model's inner Meta
-class.
-
->>> from django.contrib.admin.options import ModelAdmin
-
->>> b1 = Band(name='Aerosmith', bio='', rank=3)
->>> b1.save()
->>> b2 = Band(name='Radiohead', bio='', rank=1)
->>> b2.save()
->>> b3 = Band(name='Van Halen', bio='', rank=2)
->>> b3.save()
-
-The default ordering should be by name, as specified in the inner Meta class.
-
->>> ma = ModelAdmin(Band, None)
->>> [b.name for b in ma.queryset(None)]
-[u'Aerosmith', u'Radiohead', u'Van Halen']
-
-
-Let's use a custom ModelAdmin that changes the ordering, and make sure it
-actually changes.
-
->>> class BandAdmin(ModelAdmin):
-... ordering = ('rank',) # default ordering is ('name',)
-...
-
->>> ma = BandAdmin(Band, None)
->>> [b.name for b in ma.queryset(None)]
-[u'Radiohead', u'Van Halen', u'Aerosmith']
-
-"""
-}
View
39 tests/regressiontests/admin_ordering/tests.py
@@ -0,0 +1,39 @@
+from django.test import TestCase
+from django.contrib.admin.options import ModelAdmin
+
+from models import Band
+
+class TestAdminOrdering(TestCase):
+ """
+ Let's make sure that ModelAdmin.queryset uses the ordering we define in
+ ModelAdmin rather that ordering defined in the model's inner Meta
+ class.
+ """
+
+ def setUp(self):
+ b1 = Band(name='Aerosmith', bio='', rank=3)
+ b1.save()
+ b2 = Band(name='Radiohead', bio='', rank=1)
+ b2.save()
+ b3 = Band(name='Van Halen', bio='', rank=2)
+ b3.save()
+
+ def test_default_ordering(self):
+ """
+ The default ordering should be by name, as specified in the inner Meta
+ class.
+ """
+ ma = ModelAdmin(Band, None)
+ names = [b.name for b in ma.queryset(None)]
+ self.assertEqual([u'Aerosmith', u'Radiohead', u'Van Halen'], names)
+
+ def test_specified_ordering(self):
+ """
+ Let's use a custom ModelAdmin that changes the ordering, and make sure
+ it actually changes.
+ """
+ class BandAdmin(ModelAdmin):
+ ordering = ('rank',) # default ordering is ('name',)
+ ma = BandAdmin(Band, None)
+ names = [b.name for b in ma.queryset(None)]
+ self.assertEqual([u'Radiohead', u'Van Halen', u'Aerosmith'], names)
Please sign in to comment.
Something went wrong with that request. Please try again.