Ticket #11058: tests.2.diff

django/contrib/admin/tests/__init__.py

@@ +1 @@
+from django.contrib.admin.tests.display import AdminTest
+

django/contrib/admin/tests/admin.py

@@ +1 @@
+from django.contrib import admin
+from django.contrib.admin.tests.models import TestModel
+
+def admin_callable(obj):
+    return 'test'
+
+class TestModelAdmin(admin.ModelAdmin):
+    list_display = ('string_field', 'model_admin_attr', 'model_attribute', admin_callable)
+    list_display_links = ('string_field', 'model_admin_attr', 'model_attribute', admin_callable)
+
+    def model_admin_attr(self, obj):
+        return obj.id
+
+
+class BadTestModelAdmin(admin.ModelAdmin):
+    list_display = ('string_field', 'model_admin_attr', 'model_attribute', admin_callable)
+    list_display_links = ('bad_item',)
+

django/contrib/admin/tests/display.py

@@ +1 @@
+from django.test import TestCase
+from django.contrib.admin.validation import validate
+from django.contrib.admin.tests.models import TestModel
+from django.contrib.admin.tests.admin import TestModelAdmin, BadTestModelAdmin
+from django.core.exceptions import ImproperlyConfigured
+
+class AdminTest(TestCase):
+    def test_list_display(self):
+        """
+        This tests that the validate method does not return an
+        exception on a properly configured model and admin class.
+        The focus of the test is around the configration of the
+        list_display and list_display_links variables.
+        """
+        try:
+            validate(TestModelAdmin, TestModel)
+        except ImproperlyConfigured, msg:
+            self.fail(msg)
+
+    def test_invalid_list_display_links(self):
+        """
+        This test confirms that if you have an item in the list_display_links
+        that is not also in list_display you will get an exception.
+        """
+
+        self.assertRaises(ImproperlyConfigured, validate, BadTestModelAdmin, TestModel)

django/contrib/admin/tests/models.py

@@ +1 @@
+from django.db import models
+
+class TestModel(models.Model):
+    string_field = models.CharField(max_length=50)
+
+    def model_attribute(self):
+        return self.string_field.toupper()