Ticket #12654: test.diff

tests/regressiontests/admin_util/tests.py

@@ -3 +3 @@
 from django.db import models
 
 from django.contrib import admin
-from django.contrib.admin.util import display_for_field, label_for_field
+from django.contrib.admin.util import display_for_field, label_for_field, lookup_field
 from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
 
 from models import Article
@@ -11 +11 @@
 
 
 class UtilTests(unittest.TestCase):
+    def test_values_from_lookup_field(self):
+        """
+        Regression test for #12654: lookup_field
+        """
+        from django.contrib.sites.models import Site
+        from django.utils.formats import localize
+        from datetime import datetime
 
+        SITE_NAME = 'example.com'
+        TITLE_TEXT = 'Some title'
+        CREATED_DATE = datetime.min
+        ADMIN_METHOD = 'admin method'
+        SIMPLE_FUNCTION = 'function'
+        INSTANCE_ATTRIBUTE = 'attr'
+
+        class FakeModelAdmin(object):
+            def get_admin_value(self, obj):
+                return ADMIN_METHOD
+
+        simple_function = lambda obj: SIMPLE_FUNCTION
+
+        article = Article(
+            site=Site(domain=SITE_NAME),
+            title=TITLE_TEXT,
+            created=CREATED_DATE,
+        )
+        article.non_field = INSTANCE_ATTRIBUTE
+
+        verifications = (
+            ('site', SITE_NAME),
+            ('created', localize(CREATED_DATE)),
+            ('title', TITLE_TEXT),
+            ('get_admin_value', ADMIN_METHOD),
+            (simple_function, SIMPLE_FUNCTION),
+            ('test_from_model', article.test_from_model()),
+            ('non_field', INSTANCE_ATTRIBUTE)
+        )
+
+        for name, value in verifications:
+            field, attr, resolved_value = lookup_field(
+                name,
+                article,
+                FakeModelAdmin()
+            )
+
+            if field is not None:
+                resolved_value = display_for_field(resolved_value, field)
+
+            self.assertEqual(value, resolved_value)
+
     def test_null_display_for_field(self):
         """
         Regression test for #12550: display_for_field should handle None

tests/regressiontests/admin_util/models.py

@@ -6 +6 @@
     """
     A simple Article model for testing
     """
+    site = models.ForeignKey('sites.Site')
     title = models.CharField(max_length=100)
     title2 = models.CharField(max_length=100, verbose_name="another name")
     created = models.DateTimeField()