Ticket #10928: 10928-r11178.diff

tests/regressiontests/model_forms_regress/tests.py

@@ -6 +6 @@
 from django.conf import settings
 from django.test import TestCase
 
-from models import Person, Triple, FilePathModel, Article, Publication, CustomFF
+from models import Person, Triple, FilePathModel, Article, Publication, CustomFF, DirectDefaultBoolean, CallableDefaultBoolean
 
 class ModelMultipleChoiceFieldTests(TestCase):
 
@@ -100 +100 @@
         # It's enough that the form saves without error -- the custom save routine will
         # generate an AssertionError if it is called more than once during save.
         form = CFFForm(data = {'f': None})
-        form.save()
- No newline at end of file
+        form.save()
+        
+class DirectDefaultBooleanForm(forms.ModelForm):
+    class Meta:
+        model = DirectDefaultBoolean
+
+class CallableDefaultBooleanForm(forms.ModelForm):
+    class Meta:
+        model = CallableDefaultBoolean
+        
+class CallableVersusDirectDefaultTests(TestCase):
+    def test_equality(self):
+        "Regression for #10928: BooleanField: different behaviour when default=callable"
+        
+        self.assertEquals(DirectDefaultBooleanForm().as_p(), CallableDefaultBooleanForm().as_p()) 
+        
+ No newline at end of file

tests/regressiontests/model_forms_regress/models.py

@@ -37 +37 @@
 
 class CustomFF(models.Model):
     f = CustomFileField(upload_to='unused', blank=True)
+    
+class DirectDefaultBoolean(models.Model):
+    b = models.BooleanField(default=False)
+
+class CallableDefaultBoolean(models.Model):
+    b = models.BooleanField(default=lambda: False)
+
+