diff options
Diffstat (limited to 'tests/model_fields/test_booleanfield.py')
| -rw-r--r-- | tests/model_fields/test_booleanfield.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/tests/model_fields/test_booleanfield.py b/tests/model_fields/test_booleanfield.py index 89e0ecfa2a..907385534b 100644 --- a/tests/model_fields/test_booleanfield.py +++ b/tests/model_fields/test_booleanfield.py @@ -26,18 +26,12 @@ class BooleanFieldTests(TestCase): def test_nullbooleanfield_get_prep_value(self): self._test_get_prep_value(models.BooleanField(null=True)) - def test_nullbooleanfield_old_get_prep_value(self): - self._test_get_prep_value(models.NullBooleanField()) - def test_booleanfield_to_python(self): self._test_to_python(models.BooleanField()) def test_nullbooleanfield_to_python(self): self._test_to_python(models.BooleanField(null=True)) - def test_nullbooleanfield_old_to_python(self): - self._test_to_python(models.NullBooleanField()) - def test_booleanfield_choices_blank(self): """ BooleanField with choices and defaults doesn't generate a formfield @@ -59,8 +53,6 @@ class BooleanFieldTests(TestCase): def test_nullbooleanfield_formfield(self): f = models.BooleanField(null=True) self.assertIsInstance(f.formfield(), forms.NullBooleanField) - f = models.NullBooleanField() - self.assertIsInstance(f.formfield(), forms.NullBooleanField) def test_return_type(self): b = BooleanModel.objects.create(bfield=True) @@ -71,15 +63,13 @@ class BooleanFieldTests(TestCase): b2.refresh_from_db() self.assertIs(b2.bfield, False) - b3 = NullBooleanModel.objects.create(nbfield=True, nbfield_old=True) + b3 = NullBooleanModel.objects.create(nbfield=True) b3.refresh_from_db() self.assertIs(b3.nbfield, True) - self.assertIs(b3.nbfield_old, True) - b4 = NullBooleanModel.objects.create(nbfield=False, nbfield_old=False) + b4 = NullBooleanModel.objects.create(nbfield=False) b4.refresh_from_db() self.assertIs(b4.nbfield, False) - self.assertIs(b4.nbfield_old, False) # When an extra clause exists, the boolean conversions are applied with # an offset (#13293). @@ -92,8 +82,8 @@ class BooleanFieldTests(TestCase): """ bmt = BooleanModel.objects.create(bfield=True) bmf = BooleanModel.objects.create(bfield=False) - nbmt = NullBooleanModel.objects.create(nbfield=True, nbfield_old=True) - nbmf = NullBooleanModel.objects.create(nbfield=False, nbfield_old=False) + nbmt = NullBooleanModel.objects.create(nbfield=True) + nbmf = NullBooleanModel.objects.create(nbfield=False) m1 = FksToBooleans.objects.create(bf=bmt, nbf=nbmt) m2 = FksToBooleans.objects.create(bf=bmf, nbf=nbmf) @@ -107,10 +97,8 @@ class BooleanFieldTests(TestCase): mc = FksToBooleans.objects.select_related().get(pk=m2.id) self.assertIs(mb.bf.bfield, True) self.assertIs(mb.nbf.nbfield, True) - self.assertIs(mb.nbf.nbfield_old, True) self.assertIs(mc.bf.bfield, False) self.assertIs(mc.nbf.nbfield, False) - self.assertIs(mc.nbf.nbfield_old, False) def test_null_default(self): """ @@ -126,7 +114,6 @@ class BooleanFieldTests(TestCase): nb = NullBooleanModel() self.assertIsNone(nb.nbfield) - self.assertIsNone(nb.nbfield_old) nb.save() # no error @@ -142,5 +129,5 @@ class ValidationTest(SimpleTestCase): NullBooleanField shouldn't throw a validation error when given a value of None. """ - nullboolean = NullBooleanModel(nbfield=None, nbfield_old=None) + nullboolean = NullBooleanModel(nbfield=None) nullboolean.full_clean() |