Commit c37eb3c8 authored by Alasdair Nicol's avatar Alasdair Nicol Committed by Tim Graham
Browse files

[1.8.x] Fixed #24714 -- Used more specific assertions than assertEqual in tests. 

Backport of eaeea6f9 from master
parent 5105c162

tests/delete/tests.py

+7 −7
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class OnDeleteTests(TestCase): 
        a = create_a('setnull')

        a.setnull.delete()

        a = A.objects.get(pk=a.pk)

        self.assertEqual(None, a.setnull)

        self.assertIsNone(a.setnull)



    def test_setdefault(self):

        a = create_a('setdefault')
@@ -49,7 +49,7 @@ class OnDeleteTests(TestCase): 
        a = create_a('setdefault_none')

        a.setdefault_none.delete()

        a = A.objects.get(pk=a.pk)

        self.assertEqual(None, a.setdefault_none)

        self.assertIsNone(a.setdefault_none)



    def test_cascade(self):

        a = create_a('cascade')
@@ -119,7 +119,7 @@ class OnDeleteTests(TestCase): 
        self.assertFalse(R.objects.filter(pk=a.child_setnull_id).exists())



        a = A.objects.get(pk=a.pk)

        self.assertEqual(None, a.child_setnull)

        self.assertIsNone(a.child_setnull)



    def test_setnull_from_parent(self):

        a = create_a('child_setnull')
@@ -127,13 +127,13 @@ class OnDeleteTests(TestCase): 
        self.assertFalse(RChild.objects.filter(pk=a.child_setnull_id).exists())



        a = A.objects.get(pk=a.pk)

        self.assertEqual(None, a.child_setnull)

        self.assertIsNone(a.child_setnull)



    def test_o2o_setnull(self):

        a = create_a('o2o_setnull')

        a.o2o_setnull.delete()

        a = A.objects.get(pk=a.pk)

        self.assertEqual(None, a.o2o_setnull)

        self.assertIsNone(a.o2o_setnull)





class DeletionTests(TestCase):
@@ -197,11 +197,11 @@ class DeletionTests(TestCase): 
        a.cascade.delete()



        for obj in deleted:

            self.assertEqual(None, obj.pk)

            self.assertIsNone(obj.pk)



        for pk_list in related_setnull_sets:

            for a in A.objects.filter(id__in=pk_list):

                self.assertEqual(None, a.setnull)

                self.assertIsNone(a.setnull)



        models.signals.pre_delete.disconnect(pre_delete)

tests/forms_tests/tests/test_fields.py

+24 −24
Original line number Diff line number Diff line
@@ -186,9 +186,9 @@ class FieldsTests(SimpleTestCase): 


    def test_integerfield_2(self):

        f = IntegerField(required=False)

        self.assertEqual(None, f.clean(''))

        self.assertIsNone(f.clean(''))

        self.assertEqual('None', repr(f.clean('')))

        self.assertEqual(None, f.clean(None))

        self.assertIsNone(f.clean(None))

        self.assertEqual('None', repr(f.clean(None)))

        self.assertEqual(1, f.clean('1'))

        self.assertIsInstance(f.clean('1'), int)
@@ -285,8 +285,8 @@ class FieldsTests(SimpleTestCase): 


    def test_floatfield_2(self):

        f = FloatField(required=False)

        self.assertEqual(None, f.clean(''))

        self.assertEqual(None, f.clean(None))

        self.assertIsNone(f.clean(''))

        self.assertIsNone(f.clean(None))

        self.assertEqual(1.0, f.clean('1'))

        self.assertEqual(f.max_value, None)

        self.assertEqual(f.min_value, None)
@@ -363,8 +363,8 @@ class FieldsTests(SimpleTestCase): 


    def test_decimalfield_2(self):

        f = DecimalField(max_digits=4, decimal_places=2, required=False)

        self.assertEqual(None, f.clean(''))

        self.assertEqual(None, f.clean(None))

        self.assertIsNone(f.clean(''))

        self.assertIsNone(f.clean(None))

        self.assertEqual(f.clean('1'), Decimal("1"))

        self.assertEqual(f.max_digits, 4)

        self.assertEqual(f.decimal_places, 2)
@@ -460,9 +460,9 @@ class FieldsTests(SimpleTestCase): 


    def test_datefield_2(self):

        f = DateField(required=False)

        self.assertEqual(None, f.clean(None))

        self.assertIsNone(f.clean(None))

        self.assertEqual('None', repr(f.clean(None)))

        self.assertEqual(None, f.clean(''))

        self.assertIsNone(f.clean(''))

        self.assertEqual('None', repr(f.clean('')))



    def test_datefield_3(self):
@@ -581,9 +581,9 @@ class FieldsTests(SimpleTestCase): 


    def test_datetimefield_3(self):

        f = DateTimeField(required=False)

        self.assertEqual(None, f.clean(None))

        self.assertIsNone(f.clean(None))

        self.assertEqual('None', repr(f.clean(None)))

        self.assertEqual(None, f.clean(''))

        self.assertIsNone(f.clean(''))

        self.assertEqual('None', repr(f.clean('')))



    def test_datetimefield_4(self):
@@ -1048,7 +1048,7 @@ class FieldsTests(SimpleTestCase): 


    def test_typedchoicefield_6(self):

        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=False, empty_value=None)

        self.assertEqual(None, f.clean(''))

        self.assertIsNone(f.clean(''))



    def test_typedchoicefield_has_changed(self):

        # has_changed should not trigger required validation
@@ -1076,15 +1076,15 @@ class FieldsTests(SimpleTestCase): 


    def test_nullbooleanfield_1(self):

        f = NullBooleanField()

        self.assertEqual(None, f.clean(''))

        self.assertIsNone(f.clean(''))

        self.assertEqual(True, f.clean(True))

        self.assertEqual(False, f.clean(False))

        self.assertEqual(None, f.clean(None))

        self.assertIsNone(f.clean(None))

        self.assertEqual(False, f.clean('0'))

        self.assertEqual(True, f.clean('1'))

        self.assertEqual(None, f.clean('2'))

        self.assertEqual(None, f.clean('3'))

        self.assertEqual(None, f.clean('hello'))

        self.assertIsNone(f.clean('2'))

        self.assertIsNone(f.clean('3'))

        self.assertIsNone(f.clean('hello'))

        self.assertEqual(True, f.clean('true'))

        self.assertEqual(False, f.clean('false'))
@@ -1101,7 +1101,7 @@ class FieldsTests(SimpleTestCase): 
            hidden_nullbool1 = NullBooleanField(widget=HiddenInput, initial=True)

            hidden_nullbool2 = NullBooleanField(widget=HiddenInput, initial=False)

        f = HiddenNullBooleanForm({'hidden_nullbool1': 'True', 'hidden_nullbool2': 'False'})

        self.assertEqual(None, f.full_clean())

        self.assertIsNone(f.full_clean())

        self.assertEqual(True, f.cleaned_data['hidden_nullbool1'])

        self.assertEqual(False, f.cleaned_data['hidden_nullbool2'])
@@ -1115,10 +1115,10 @@ class FieldsTests(SimpleTestCase): 
            nullbool1 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))

            nullbool2 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))

        f = MySQLNullBooleanForm({'nullbool0': '1', 'nullbool1': '0', 'nullbool2': ''})

        self.assertEqual(None, f.full_clean())

        self.assertIsNone(f.full_clean())

        self.assertEqual(True, f.cleaned_data['nullbool0'])

        self.assertEqual(False, f.cleaned_data['nullbool1'])

        self.assertEqual(None, f.cleaned_data['nullbool2'])

        self.assertIsNone(f.cleaned_data['nullbool2'])



    def test_nullbooleanfield_changed(self):

        f = NullBooleanField()
@@ -1221,7 +1221,7 @@ class FieldsTests(SimpleTestCase): 
    def test_typedmultiplechoicefield_7(self):

        # If you want cleaning an empty value to return a different type, tell the field

        f = TypedMultipleChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=False, empty_value=None)

        self.assertEqual(None, f.clean([]))

        self.assertIsNone(f.clean([]))



    def test_typedmultiplechoicefield_has_changed(self):

        # has_changed should not trigger required validation
@@ -1377,10 +1377,10 @@ class FieldsTests(SimpleTestCase): 
        f = SplitDateTimeField(required=False)

        self.assertEqual(datetime.datetime(2006, 1, 10, 7, 30), f.clean([datetime.date(2006, 1, 10), datetime.time(7, 30)]))

        self.assertEqual(datetime.datetime(2006, 1, 10, 7, 30), f.clean(['2006-01-10', '07:30']))

        self.assertEqual(None, f.clean(None))

        self.assertEqual(None, f.clean(''))

        self.assertEqual(None, f.clean(['']))

        self.assertEqual(None, f.clean(['', '']))

        self.assertIsNone(f.clean(None))

        self.assertIsNone(f.clean(''))

        self.assertIsNone(f.clean(['']))

        self.assertIsNone(f.clean(['', '']))

        self.assertRaisesMessage(ValidationError, "'Enter a list of values.'", f.clean, 'hello')

        six.assertRaisesRegex(self, ValidationError, "'Enter a valid date\.', u?'Enter a valid time\.'", f.clean, ['hello', 'there'])

        self.assertRaisesMessage(ValidationError, "'Enter a valid time.'", f.clean, ['2006-01-10', 'there'])

tests/forms_tests/tests/test_forms.py

+6 −6
Original line number Diff line number Diff line
@@ -2068,9 +2068,9 @@ class FormsTestCase(TestCase): 
        # Empty values for fields will NOT raise a `required` error on an

        # optional `MultiValueField`

        f = PhoneField(required=False)

        self.assertEqual(None, f.clean(''))

        self.assertEqual(None, f.clean(None))

        self.assertEqual(None, f.clean([]))

        self.assertIsNone(f.clean(''))

        self.assertIsNone(f.clean(None))

        self.assertIsNone(f.clean([]))

        self.assertEqual('+61. ext.  (label: )', f.clean(['+61']))

        self.assertEqual('+61.287654321 ext. 123 (label: )', f.clean(['+61', '287654321', '123']))

        self.assertEqual('+61.287654321 ext. 123 (label: Home)', f.clean(['+61', '287654321', '123', 'Home']))
@@ -2095,9 +2095,9 @@ class FormsTestCase(TestCase): 
        # For an optional `MultiValueField` with `require_all_fields=False`, we

        # don't get any `required` error but we still get `incomplete` errors.

        f = PhoneField(required=False, require_all_fields=False)

        self.assertEqual(None, f.clean(''))

        self.assertEqual(None, f.clean(None))

        self.assertEqual(None, f.clean([]))

        self.assertIsNone(f.clean(''))

        self.assertIsNone(f.clean(None))

        self.assertIsNone(f.clean([]))

        self.assertRaisesMessage(ValidationError, "'Enter a complete value.'", f.clean, ['+61'])

        self.assertEqual('+61.287654321 ext. 123 (label: )', f.clean(['+61', '287654321', '123']))

        six.assertRaisesRegex(self, ValidationError,

tests/forms_tests/tests/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ class EmptyLabelTestCase(TestCase): 


    def test_get_display_value_on_none(self):

        m = ChoiceModel.objects.create(name='test', choice='', choice_integer=None)

        self.assertEqual(None, m.choice_integer)

        self.assertIsNone(m.choice_integer)

        self.assertEqual('No Preference', m.get_choice_integer_display())



    def test_html_rendering_of_prepopulated_models(self):

tests/generic_views/test_edit.py

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class FormMixinTests(TestCase): 
            request = get_request



        default_kwargs = TestFormMixin().get_form_kwargs()

        self.assertEqual(None, default_kwargs.get('prefix'))

        self.assertIsNone(default_kwargs.get('prefix'))



        set_mixin = TestFormMixin()

        set_mixin.prefix = test_string