p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #27804 -- Used subTest() in dateparse tests.

This commit is contained in:
Matthew Schinckel 2017-07-04 06:38:58 +09:30 committed by Tim Graham
parent 2328f2faf8
commit 684c0a35f6
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
tests/utils_tests/test_dateparse.py
View File

@ -30,35 +30,19 @@ class DateParseTests(unittest.TestCase):
parse_time('09:15:90') parse_time('09:15:90')
def test_parse_datetime(self): def test_parse_datetime(self):
# Valid inputs valid_inputs = (
self.assertEqual( ('2012-04-23T09:15:00', datetime(2012, 4, 23, 9, 15)),
parse_datetime('2012-04-23T09:15:00'), ('2012-4-9 4:8:16', datetime(2012, 4, 9, 4, 8, 16)),
datetime(2012, 4, 23, 9, 15) ('2012-04-23T09:15:00Z', datetime(2012, 4, 23, 9, 15, 0, 0, get_fixed_timezone(0))),
) ('2012-4-9 4:8:16-0320', datetime(2012, 4, 9, 4, 8, 16, 0, get_fixed_timezone(-200))),
self.assertEqual( ('2012-04-23T10:20:30.400+02:30', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(150))),
parse_datetime('2012-4-9 4:8:16'), ('2012-04-23T10:20:30.400+02', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(120))),
datetime(2012, 4, 9, 4, 8, 16) ('2012-04-23T10:20:30.400-02', datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(-120))),
)
self.assertEqual(
parse_datetime('2012-04-23T09:15:00Z'),
datetime(2012, 4, 23, 9, 15, 0, 0, get_fixed_timezone(0))
)
self.assertEqual(
parse_datetime('2012-4-9 4:8:16-0320'),
datetime(2012, 4, 9, 4, 8, 16, 0, get_fixed_timezone(-200))
)
self.assertEqual(
parse_datetime('2012-04-23T10:20:30.400+02:30'),
datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(150))
)
self.assertEqual(
parse_datetime('2012-04-23T10:20:30.400+02'),
datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(120))
)
self.assertEqual(
parse_datetime('2012-04-23T10:20:30.400-02'),
datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(-120))
) )
for source, expected in valid_inputs:
with self.subTest(source=source):
self.assertEqual(parse_datetime(source), expected)
# Invalid inputs # Invalid inputs
self.assertIsNone(parse_datetime('20120423091500')) self.assertIsNone(parse_datetime('20120423091500'))
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
@ -78,7 +62,8 @@ class DurationParseTests(unittest.TestCase):
timedelta(seconds=30), # seconds timedelta(seconds=30), # seconds
] ]
for delta in timedeltas: for delta in timedeltas:
self.assertEqual(parse_duration(format(delta)), delta) with self.subTest(delta=delta):
self.assertEqual(parse_duration(format(delta)), delta)
def test_seconds(self): def test_seconds(self):
self.assertEqual(parse_duration('30'), timedelta(seconds=30)) self.assertEqual(parse_duration('30'), timedelta(seconds=30))
@ -97,27 +82,42 @@ class DurationParseTests(unittest.TestCase):
self.assertEqual(parse_duration('4 10:15:30'), timedelta(days=4, hours=10, minutes=15, seconds=30)) self.assertEqual(parse_duration('4 10:15:30'), timedelta(days=4, hours=10, minutes=15, seconds=30))
def test_fractions_of_seconds(self): def test_fractions_of_seconds(self):
self.assertEqual(parse_duration('15:30.1'), timedelta(minutes=15, seconds=30, milliseconds=100)) test_values = (
self.assertEqual(parse_duration('15:30.01'), timedelta(minutes=15, seconds=30, milliseconds=10)) ('15:30.1', timedelta(minutes=15, seconds=30, milliseconds=100)),
self.assertEqual(parse_duration('15:30.001'), timedelta(minutes=15, seconds=30, milliseconds=1)) ('15:30.01', timedelta(minutes=15, seconds=30, milliseconds=10)),
self.assertEqual(parse_duration('15:30.0001'), timedelta(minutes=15, seconds=30, microseconds=100)) ('15:30.001', timedelta(minutes=15, seconds=30, milliseconds=1)),
self.assertEqual(parse_duration('15:30.00001'), timedelta(minutes=15, seconds=30, microseconds=10)) ('15:30.0001', timedelta(minutes=15, seconds=30, microseconds=100)),
self.assertEqual(parse_duration('15:30.000001'), timedelta(minutes=15, seconds=30, microseconds=1)) ('15:30.00001', timedelta(minutes=15, seconds=30, microseconds=10)),
('15:30.000001', timedelta(minutes=15, seconds=30, microseconds=1)),
)
for source, expected in test_values:
with self.subTest(source=source):
self.assertEqual(parse_duration(source), expected)
def test_negative(self): def test_negative(self):
self.assertEqual(parse_duration('-4 15:30'), timedelta(days=-4, minutes=15, seconds=30)) test_values = (
self.assertEqual(parse_duration('-172800'), timedelta(days=-2)) ('-4 15:30', timedelta(days=-4, minutes=15, seconds=30)),
self.assertEqual(parse_duration('-15:30'), timedelta(minutes=-15, seconds=30)) ('-172800', timedelta(days=-2)),
self.assertEqual(parse_duration('-1:15:30'), timedelta(hours=-1, minutes=15, seconds=30)) ('-15:30', timedelta(minutes=-15, seconds=30)),
self.assertEqual(parse_duration('-30.1'), timedelta(seconds=-30, milliseconds=-100)) ('-1:15:30', timedelta(hours=-1, minutes=15, seconds=30)),
('-30.1', timedelta(seconds=-30, milliseconds=-100)),
)
for source, expected in test_values:
with self.subTest(source=source):
self.assertEqual(parse_duration(source), expected)
def test_iso_8601(self): def test_iso_8601(self):
self.assertIsNone(parse_duration('P4Y')) test_values = (
self.assertIsNone(parse_duration('P4M')) ('P4Y', None),
self.assertIsNone(parse_duration('P4W')) ('P4M', None),
self.assertEqual(parse_duration('P4D'), timedelta(days=4)) ('P4W', None),
self.assertEqual(parse_duration('P0.5D'), timedelta(hours=12)) ('P4D', timedelta(days=4)),
self.assertEqual(parse_duration('PT5H'), timedelta(hours=5)) ('P0.5D', timedelta(hours=12)),
self.assertEqual(parse_duration('PT5M'), timedelta(minutes=5)) ('PT5H', timedelta(hours=5)),
self.assertEqual(parse_duration('PT5S'), timedelta(seconds=5)) ('PT5M', timedelta(minutes=5)),
self.assertEqual(parse_duration('PT0.000005S'), timedelta(microseconds=5)) ('PT5S', timedelta(seconds=5)),
('PT0.000005S', timedelta(microseconds=5)),
)
for source, expected in test_values:
with self.subTest(source=source):
self.assertEqual(parse_duration(source), expected)