diff --git a/tests/forms_tests/field_tests/test_datetimefield.py b/tests/forms_tests/field_tests/test_datetimefield.py index a1cfd22053..5cb527b3f6 100644 --- a/tests/forms_tests/field_tests/test_datetimefield.py +++ b/tests/forms_tests/field_tests/test_datetimefield.py @@ -1,4 +1,4 @@ -import datetime +from datetime import date, datetime from django.forms import DateTimeField, ValidationError from django.test import SimpleTestCase @@ -6,81 +6,95 @@ from django.test import SimpleTestCase class DateTimeFieldTest(SimpleTestCase): - def test_datetimefield_1(self): + def test_datetimefield_clean(self): + tests = [ + (date(2006, 10, 25), datetime(2006, 10, 25, 0, 0)), + (datetime(2006, 10, 25, 14, 30), datetime(2006, 10, 25, 14, 30)), + (datetime(2006, 10, 25, 14, 30, 59), datetime(2006, 10, 25, 14, 30, 59)), + ( + datetime(2006, 10, 25, 14, 30, 59, 200), + datetime(2006, 10, 25, 14, 30, 59, 200), + ), + ('2006-10-25 14:30:45.000200', datetime(2006, 10, 25, 14, 30, 45, 200)), + ('2006-10-25 14:30:45.0002', datetime(2006, 10, 25, 14, 30, 45, 200)), + ('2006-10-25 14:30:45', datetime(2006, 10, 25, 14, 30, 45)), + ('2006-10-25 14:30:00', datetime(2006, 10, 25, 14, 30)), + ('2006-10-25 14:30', datetime(2006, 10, 25, 14, 30)), + ('2006-10-25', datetime(2006, 10, 25, 0, 0)), + ('10/25/2006 14:30:45.000200', datetime(2006, 10, 25, 14, 30, 45, 200)), + ('10/25/2006 14:30:45', datetime(2006, 10, 25, 14, 30, 45)), + ('10/25/2006 14:30:00', datetime(2006, 10, 25, 14, 30)), + ('10/25/2006 14:30', datetime(2006, 10, 25, 14, 30)), + ('10/25/2006', datetime(2006, 10, 25, 0, 0)), + ('10/25/06 14:30:45.000200', datetime(2006, 10, 25, 14, 30, 45, 200)), + ('10/25/06 14:30:45', datetime(2006, 10, 25, 14, 30, 45)), + ('10/25/06 14:30:00', datetime(2006, 10, 25, 14, 30)), + ('10/25/06 14:30', datetime(2006, 10, 25, 14, 30)), + ('10/25/06', datetime(2006, 10, 25, 0, 0)), + # Whitespace stripping. + (' 2006-10-25 14:30:45 ', datetime(2006, 10, 25, 14, 30, 45)), + (' 2006-10-25 ', datetime(2006, 10, 25, 0, 0)), + (' 10/25/2006 14:30:45 ', datetime(2006, 10, 25, 14, 30, 45)), + (' 10/25/2006 14:30 ', datetime(2006, 10, 25, 14, 30)), + (' 10/25/2006 ', datetime(2006, 10, 25, 0, 0)), + (' 10/25/06 14:30:45 ', datetime(2006, 10, 25, 14, 30, 45)), + (' 10/25/06 ', datetime(2006, 10, 25, 0, 0)), + ] f = DateTimeField() - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(datetime.date(2006, 10, 25))) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean(datetime.datetime(2006, 10, 25, 14, 30))) - self.assertEqual( - datetime.datetime(2006, 10, 25, 14, 30, 59), - f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59)) - ) - self.assertEqual( - datetime.datetime(2006, 10, 25, 14, 30, 59, 200), - f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59, 200)) - ) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006-10-25 14:30:45.000200')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006-10-25 14:30:45.0002')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('2006-10-25 14:30:45')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30:00')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30')) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('2006-10-25')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('10/25/2006 14:30:45.000200')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('10/25/2006 14:30:45')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/2006 14:30:00')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/2006 14:30')) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('10/25/2006')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('10/25/06 14:30:45.000200')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('10/25/06 14:30:45')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/06 14:30:00')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/06 14:30')) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('10/25/06')) - with self.assertRaisesMessage(ValidationError, "'Enter a valid date/time.'"): - f.clean('hello') - with self.assertRaisesMessage(ValidationError, "'Enter a valid date/time.'"): - f.clean('2006-10-25 4:30 p.m.') + for value, expected_datetime in tests: + with self.subTest(value=value): + self.assertEqual(f.clean(value), expected_datetime) - def test_datetimefield_2(self): + def test_datetimefield_clean_invalid(self): + f = DateTimeField() + msg = "'Enter a valid date/time.'" + with self.assertRaisesMessage(ValidationError, msg): + f.clean('hello') + with self.assertRaisesMessage(ValidationError, msg): + f.clean('2006-10-25 4:30 p.m.') + with self.assertRaisesMessage(ValidationError, msg): + f.clean(' ') f = DateTimeField(input_formats=['%Y %m %d %I:%M %p']) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(datetime.date(2006, 10, 25))) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean(datetime.datetime(2006, 10, 25, 14, 30))) - self.assertEqual( - datetime.datetime(2006, 10, 25, 14, 30, 59), - f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59)) - ) - self.assertEqual( - datetime.datetime(2006, 10, 25, 14, 30, 59, 200), - f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59, 200)) - ) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006 10 25 2:30 PM')) - with self.assertRaisesMessage(ValidationError, "'Enter a valid date/time.'"): + with self.assertRaisesMessage(ValidationError, msg): f.clean('2006-10-25 14:30:45') - def test_datetimefield_3(self): + def test_datetimefield_clean_input_formats(self): + tests = [ + ('%Y %m %d %I:%M %p', ( + (date(2006, 10, 25), datetime(2006, 10, 25, 0, 0)), + (datetime(2006, 10, 25, 14, 30), datetime(2006, 10, 25, 14, 30)), + ( + datetime(2006, 10, 25, 14, 30, 59), + datetime(2006, 10, 25, 14, 30, 59), + ), + ( + datetime(2006, 10, 25, 14, 30, 59, 200), + datetime(2006, 10, 25, 14, 30, 59, 200), + ), + ('2006 10 25 2:30 PM', datetime(2006, 10, 25, 14, 30)), + )), + ('%Y.%m.%d %H:%M:%S.%f', ( + ( + '2006.10.25 14:30:45.0002', + datetime(2006, 10, 25, 14, 30, 45, 200), + ), + )), + ] + f = DateTimeField() + for input_format, values in tests: + f = DateTimeField(input_formats=[input_format]) + for value, expected_datetime in values: + with self.subTest(value=value, input_format=input_format): + self.assertEqual(f.clean(value), expected_datetime) + + def test_datetimefield_not_required(self): f = DateTimeField(required=False) self.assertIsNone(f.clean(None)) self.assertEqual('None', repr(f.clean(None))) self.assertIsNone(f.clean('')) self.assertEqual('None', repr(f.clean(''))) - def test_datetimefield_4(self): - f = DateTimeField() - # Test whitespace stripping behavior (#5714) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean(' 2006-10-25 14:30:45 ')) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(' 2006-10-25 ')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean(' 10/25/2006 14:30:45 ')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean(' 10/25/2006 14:30 ')) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(' 10/25/2006 ')) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean(' 10/25/06 14:30:45 ')) - self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(' 10/25/06 ')) - with self.assertRaisesMessage(ValidationError, "'Enter a valid date/time.'"): - f.clean(' ') - - def test_datetimefield_5(self): - f = DateTimeField(input_formats=['%Y.%m.%d %H:%M:%S.%f']) - self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006.10.25 14:30:45.0002')) - def test_datetimefield_changed(self): - format = '%Y %m %d %I:%M %p' - f = DateTimeField(input_formats=[format]) - d = datetime.datetime(2006, 9, 17, 14, 30, 0) + f = DateTimeField(input_formats=['%Y %m %d %I:%M %p']) + d = datetime(2006, 9, 17, 14, 30, 0) self.assertFalse(f.has_changed(d, '2006 09 17 2:30 PM'))