Refs #31369 -- Removed models.NullBooleanField per deprecation timeline.

4 files changed, 17 insertions, 38 deletions

diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index c8867834da..9e8baeb565 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -135,7 +135,6 @@ class Post(models.Model):
 
 class NullBooleanModel(models.Model):
     nbfield = models.BooleanField(null=True, blank=True)
-    nbfield_old = models.NullBooleanField()
 
 
 class BooleanModel(models.Model):
@@ -192,16 +191,15 @@ class VerboseNameField(models.Model):
     # field_image = models.ImageField("verbose field")
     field11 = models.IntegerField("verbose field11")
     field12 = models.GenericIPAddressField("verbose field12", protocol="ipv4")
-    field13 = models.NullBooleanField("verbose field13")
-    field14 = models.PositiveIntegerField("verbose field14")
-    field15 = models.PositiveSmallIntegerField("verbose field15")
-    field16 = models.SlugField("verbose field16")
-    field17 = models.SmallIntegerField("verbose field17")
-    field18 = models.TextField("verbose field18")
-    field19 = models.TimeField("verbose field19")
-    field20 = models.URLField("verbose field20")
-    field21 = models.UUIDField("verbose field21")
-    field22 = models.DurationField("verbose field22")
+    field13 = models.PositiveIntegerField("verbose field13")
+    field14 = models.PositiveSmallIntegerField("verbose field14")
+    field15 = models.SlugField("verbose field15")
+    field16 = models.SmallIntegerField("verbose field16")
+    field17 = models.TextField("verbose field17")
+    field18 = models.TimeField("verbose field18")
+    field19 = models.URLField("verbose field19")
+    field20 = models.UUIDField("verbose field20")
+    field21 = models.DurationField("verbose field21")
 
 
 class GenericIPAddress(models.Model):
@@ -385,7 +383,6 @@ class AllFieldsModel(models.Model):
     floatf = models.FloatField()
     integer = models.IntegerField()
     generic_ip = models.GenericIPAddressField()
-    null_boolean = models.NullBooleanField()
     positive_integer = models.PositiveIntegerField()
     positive_small_integer = models.PositiveSmallIntegerField()
     slug = models.SlugField()
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()
diff --git a/tests/model_fields/test_promises.py b/tests/model_fields/test_promises.py
index 8e7f54b194..f48a4cc34a 100644
--- a/tests/model_fields/test_promises.py
+++ b/tests/model_fields/test_promises.py
@@ -5,9 +5,8 @@ from django.db.models import (
     AutoField, BinaryField, BooleanField, CharField, DateField, DateTimeField,
     DecimalField, EmailField, FileField, FilePathField, FloatField,
     GenericIPAddressField, ImageField, IntegerField, IPAddressField,
-    NullBooleanField, PositiveBigIntegerField, PositiveIntegerField,
-    PositiveSmallIntegerField, SlugField, SmallIntegerField, TextField,
-    TimeField, URLField,
+    PositiveBigIntegerField, PositiveIntegerField, PositiveSmallIntegerField,
+    SlugField, SmallIntegerField, TextField, TimeField, URLField,
 )
 from django.test import SimpleTestCase
 from django.utils.functional import lazy
@@ -85,10 +84,6 @@ class PromiseTest(SimpleTestCase):
         lazy_func = lazy(lambda: 0, int)
         self.assertIsInstance(GenericIPAddressField().get_prep_value(lazy_func()), str)
 
-    def test_NullBooleanField(self):
-        lazy_func = lazy(lambda: True, bool)
-        self.assertIsInstance(NullBooleanField().get_prep_value(lazy_func()), bool)
-
     def test_PositiveIntegerField(self):
         lazy_func = lazy(lambda: 1, int)
         self.assertIsInstance(PositiveIntegerField().get_prep_value(lazy_func()), int)
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index af2634dd63..5208b40dc9 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -56,7 +56,7 @@ class BasicFieldTests(SimpleTestCase):
 
     def test_field_verbose_name(self):
         m = VerboseNameField
-        for i in range(1, 23):
+        for i in range(1, 22):
             self.assertEqual(m._meta.get_field('field%d' % i).verbose_name, 'verbose field%d' % i)
 
         self.assertEqual(m._meta.get_field('id').verbose_name, 'verbose pk')