summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHonza Král <honza.kral@gmail.com>2009-07-05 13:28:07 +0000
committerHonza Král <honza.kral@gmail.com>2009-07-05 13:28:07 +0000
commitce98a00987adbfc34c5155af434528e6fb3384bf (patch)
tree92b484f1558246907e1d6f67db9e4e3a73fb1ca0
parent2dcc99e3958be44f397194dd5d22ff1b50f53e13 (diff)
[soc2009/model-validation] use assertEqual(a, b) instead of assertEqual(True, a == b) in unit tests
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@11188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--tests/regressiontests/forms/fields.py44
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/regressiontests/forms/fields.py b/tests/regressiontests/forms/fields.py
index 9a28cc1495..39a91fb73f 100644
--- a/tests/regressiontests/forms/fields.py
+++ b/tests/regressiontests/forms/fields.py
@@ -169,26 +169,26 @@ class TestFields(TestCase):
f = DecimalField(max_digits=4, decimal_places=2)
self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
- self.assertEqual(True, f.clean('1') == Decimal("1"))
+ self.assertEqual(f.clean('1'), Decimal("1"))
self.assertEqual(True, isinstance(f.clean('1'), Decimal))
- self.assertEqual(True, f.clean('23') == Decimal("23"))
- self.assertEqual(True, f.clean('3.14') == Decimal("3.14"))
- self.assertEqual(True, f.clean(3.14) == Decimal("3.14"))
- self.assertEqual(True, f.clean(Decimal('3.14')) == Decimal("3.14"))
+ self.assertEqual(f.clean('23'), Decimal("23"))
+ self.assertEqual(f.clean('3.14'), Decimal("3.14"))
+ self.assertEqual(f.clean(3.14), Decimal("3.14"))
+ self.assertEqual(f.clean(Decimal('3.14')), Decimal("3.14"))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, 'a')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, u'łąść')
- self.assertEqual(True, f.clean('1.0 ') == Decimal("1.0"))
- self.assertEqual(True, f.clean(' 1.0') == Decimal("1.0"))
- self.assertEqual(True, f.clean(' 1.0 ') == Decimal("1.0"))
+ self.assertEqual(f.clean('1.0 '), Decimal("1.0"))
+ self.assertEqual(f.clean(' 1.0'), Decimal("1.0"))
+ self.assertEqual(f.clean(' 1.0 '), Decimal("1.0"))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, '1.0a')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 4 digits in total.']", f.clean, '123.45')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 decimal places.']", f.clean, '1.234')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 digits before the decimal point.']", f.clean, '123.4')
- self.assertEqual(True, f.clean('-12.34') == Decimal("-12.34"))
+ self.assertEqual(f.clean('-12.34'), Decimal("-12.34"))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 4 digits in total.']", f.clean, '-123.45')
- self.assertEqual(True, f.clean('-.12') == Decimal("-0.12"))
- self.assertEqual(True, f.clean('-00.12') == Decimal("-0.12"))
- self.assertEqual(True, f.clean('-000.12') == Decimal("-0.12"))
+ self.assertEqual(f.clean('-.12'), Decimal("-0.12"))
+ self.assertEqual(f.clean('-00.12'), Decimal("-0.12"))
+ self.assertEqual(f.clean('-000.12'), Decimal("-0.12"))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 decimal places.']", f.clean, '-000.123')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 4 digits in total.']", f.clean, '-000.12345')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, '--0.12')
@@ -197,16 +197,16 @@ class TestFields(TestCase):
f = DecimalField(max_digits=4, decimal_places=2, required=False)
self.assertEqual(None, f.clean(''))
self.assertEqual(None, f.clean(None))
- self.assertEqual(True, f.clean('1') == Decimal("1"))
+ self.assertEqual(f.clean('1'), Decimal("1"))
def test_converted_15(self):
f = DecimalField(max_digits=4, decimal_places=2, max_value=Decimal('1.5'), min_value=Decimal('0.5'))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is less than or equal to 1.5.']", f.clean, '1.6')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is greater than or equal to 0.5.']", f.clean, '0.4')
- self.assertEqual(True, f.clean('1.5') == Decimal("1.5"))
- self.assertEqual(True, f.clean('0.5') == Decimal("0.5"))
- self.assertEqual(True, f.clean('.5') == Decimal("0.5"))
- self.assertEqual(True, f.clean('00.50') == Decimal("0.50"))
+ self.assertEqual(f.clean('1.5'), Decimal("1.5"))
+ self.assertEqual(f.clean('0.5'), Decimal("0.5"))
+ self.assertEqual(f.clean('.5'), Decimal("0.5"))
+ self.assertEqual(f.clean('00.50'), Decimal("0.50"))
def test_converted_16(self):
f = DecimalField(decimal_places=2)
@@ -215,17 +215,17 @@ class TestFields(TestCase):
def test_converted_17(self):
f = DecimalField(max_digits=3)
# Leading whole zeros "collapse" to one digit.
- self.assertEqual(True, f.clean('0000000.10') == Decimal("0.1"))
+ self.assertEqual(f.clean('0000000.10'), Decimal("0.1"))
# But a leading 0 before the . doesn't count towards max_digits
- self.assertEqual(True, f.clean('0000000.100') == Decimal("0.100"))
+ self.assertEqual(f.clean('0000000.100'), Decimal("0.100"))
# Only leading whole zeros "collapse" to one digit.
- self.assertEqual(True, f.clean('000000.02') == Decimal('0.02'))
+ self.assertEqual(f.clean('000000.02'), Decimal('0.02'))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 3 digits in total.']", f.clean, '000000.0002')
- self.assertEqual(True, f.clean('.002') == Decimal("0.002"))
+ self.assertEqual(f.clean('.002'), Decimal("0.002"))
def test_converted_18(self):
f = DecimalField(max_digits=2, decimal_places=2)
- self.assertEqual(True, f.clean('.01') == Decimal(".01"))
+ self.assertEqual(f.clean('.01'), Decimal(".01"))
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 0 digits before the decimal point.']", f.clean, '1.1')
# DateField ###################################################################