From 89c57ff5366e03e1c763c7f0efb59ee91445fed0 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Tue, 20 Mar 2018 20:51:33 +0000 Subject: [PATCH 1/5] parameterize test_formats.py --- pandas/tests/scalar/timedelta/test_formats.py | 79 ++++++++----------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/pandas/tests/scalar/timedelta/test_formats.py b/pandas/tests/scalar/timedelta/test_formats.py index 8a877c7d1c0fa..ec9199873136f 100644 --- a/pandas/tests/scalar/timedelta/test_formats.py +++ b/pandas/tests/scalar/timedelta/test_formats.py @@ -1,48 +1,39 @@ # -*- coding: utf-8 -*- -from pandas import Timedelta - - -def test_repr(): - assert (repr(Timedelta(10, unit='d')) == - "Timedelta('10 days 00:00:00')") - assert (repr(Timedelta(10, unit='s')) == - "Timedelta('0 days 00:00:10')") - assert (repr(Timedelta(10, unit='ms')) == - "Timedelta('0 days 00:00:00.010000')") - assert (repr(Timedelta(-10, unit='ms')) == - "Timedelta('-1 days +23:59:59.990000')") - +import pytest -def test_isoformat(): - td = Timedelta(days=6, minutes=50, seconds=3, - milliseconds=10, microseconds=10, nanoseconds=12) - expected = 'P6DT0H50M3.010010012S' - result = td.isoformat() - assert result == expected - - td = Timedelta(days=4, hours=12, minutes=30, seconds=5) - result = td.isoformat() - expected = 'P4DT12H30M5S' - assert result == expected - - td = Timedelta(nanoseconds=123) - result = td.isoformat() - expected = 'P0DT0H0M0.000000123S' - assert result == expected - - # trim nano - td = Timedelta(microseconds=10) - result = td.isoformat() - expected = 'P0DT0H0M0.00001S' - assert result == expected +from pandas import Timedelta - # trim micro - td = Timedelta(milliseconds=1) - result = td.isoformat() - expected = 'P0DT0H0M0.001S' - assert result == expected - # don't strip every 0 - result = Timedelta(minutes=1).isoformat() - expected = 'P0DT0H1M0S' - assert result == expected +@pytest.mark.parametrize('td, expected_repr', + [(Timedelta(10, unit='d'), + "Timedelta('10 days 00:00:00')"), + (Timedelta(10, unit='s'), + "Timedelta('0 days 00:00:10')"), + (Timedelta(10, unit='ms'), + "Timedelta('0 days 00:00:00.010000')"), + (Timedelta(-10, unit='ms'), + "Timedelta('-1 days +23:59:59.990000')")]) +def test_repr(td, expected_repr): + assert repr(td) == expected_repr + + +@pytest.mark.parametrize('td, expected_iso', + [(Timedelta(days=6, minutes=50, seconds=3, + milliseconds=10, microseconds=10, + nanoseconds=12), + 'P6DT0H50M3.010010012S'), + (Timedelta(days=4, hours=12, minutes=30, seconds=5), + 'P4DT12H30M5S'), + (Timedelta(nanoseconds=123), + 'P0DT0H0M0.000000123S'), + # trim nano + (Timedelta(microseconds=10), + 'P0DT0H0M0.00001S'), + # trim micro + (Timedelta(milliseconds=1), + 'P0DT0H0M0.001S'), + # don't strip every 0 + (Timedelta(minutes=1), + 'P0DT0H1M0S')]) +def test_isoformat(td, expected_iso): + assert td.isoformat() == expected_iso From f5f220bba8137cadbf0f4d9f67fe038ce7183d42 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Tue, 20 Mar 2018 21:21:17 +0000 Subject: [PATCH 2/5] parametrize test_td_constructor_on_nanoseconds in test_construction --- .../scalar/timedelta/test_construction.py | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pandas/tests/scalar/timedelta/test_construction.py b/pandas/tests/scalar/timedelta/test_construction.py index 5ccad9e6b4e3c..b0cf6865e45fb 100644 --- a/pandas/tests/scalar/timedelta/test_construction.py +++ b/pandas/tests/scalar/timedelta/test_construction.py @@ -195,28 +195,20 @@ def test_iso_constructor_raises(fmt): Timedelta(fmt) -def test_td_constructor_on_nanoseconds(): +@pytest.mark.parametrize('constructed_td, conversion', + [(Timedelta(nanoseconds=100), '100ns'), + (Timedelta(days=1, hours=1, minutes=1, weeks=1, + seconds=1, milliseconds=1, microseconds=1, + nanoseconds=1), 694861001001001), + (Timedelta(microseconds=1) + + Timedelta(nanoseconds=1), '1us1ns'), + (Timedelta(microseconds=1) - + Timedelta(nanoseconds=1), '999ns'), + (Timedelta(microseconds=1) + + 5 * Timedelta(nanoseconds=-2), '990ns')]) +def test_td_constructor_on_nanoseconds(constructed_td, conversion): # GH#9273 - result = Timedelta(nanoseconds=100) - expected = Timedelta('100ns') - assert result == expected - - result = Timedelta(days=1, hours=1, minutes=1, weeks=1, seconds=1, - milliseconds=1, microseconds=1, nanoseconds=1) - expected = Timedelta(694861001001001) - assert result == expected - - result = Timedelta(microseconds=1) + Timedelta(nanoseconds=1) - expected = Timedelta('1us1ns') - assert result == expected - - result = Timedelta(microseconds=1) - Timedelta(nanoseconds=1) - expected = Timedelta('999ns') - assert result == expected - - result = Timedelta(microseconds=1) + 5 * Timedelta(nanoseconds=-2) - expected = Timedelta('990ns') - assert result == expected + assert constructed_td == Timedelta(conversion) with pytest.raises(TypeError): Timedelta(nanoseconds='abc') From 29db679b309d110d384dff207a1a662e10f3b6db Mon Sep 17 00:00:00 2001 From: Ming Li Date: Tue, 20 Mar 2018 21:33:35 +0000 Subject: [PATCH 3/5] separate td_constructor_value_error --- pandas/tests/scalar/timedelta/test_construction.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandas/tests/scalar/timedelta/test_construction.py b/pandas/tests/scalar/timedelta/test_construction.py index b0cf6865e45fb..5c6808adaab90 100644 --- a/pandas/tests/scalar/timedelta/test_construction.py +++ b/pandas/tests/scalar/timedelta/test_construction.py @@ -210,5 +210,7 @@ def test_td_constructor_on_nanoseconds(constructed_td, conversion): # GH#9273 assert constructed_td == Timedelta(conversion) + +def test_td_constructor_value_error(): with pytest.raises(TypeError): Timedelta(nanoseconds='abc') From ea192267e62dc7b0a451d6e0039ca743f6e008db Mon Sep 17 00:00:00 2001 From: minggli Date: Wed, 21 Mar 2018 16:02:35 +0000 Subject: [PATCH 4/5] more compact styling of parameters --- .../scalar/timedelta/test_construction.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pandas/tests/scalar/timedelta/test_construction.py b/pandas/tests/scalar/timedelta/test_construction.py index 5c6808adaab90..d648140aa7347 100644 --- a/pandas/tests/scalar/timedelta/test_construction.py +++ b/pandas/tests/scalar/timedelta/test_construction.py @@ -195,17 +195,13 @@ def test_iso_constructor_raises(fmt): Timedelta(fmt) -@pytest.mark.parametrize('constructed_td, conversion', - [(Timedelta(nanoseconds=100), '100ns'), - (Timedelta(days=1, hours=1, minutes=1, weeks=1, - seconds=1, milliseconds=1, microseconds=1, - nanoseconds=1), 694861001001001), - (Timedelta(microseconds=1) + - Timedelta(nanoseconds=1), '1us1ns'), - (Timedelta(microseconds=1) - - Timedelta(nanoseconds=1), '999ns'), - (Timedelta(microseconds=1) + - 5 * Timedelta(nanoseconds=-2), '990ns')]) +@pytest.mark.parametrize('constructed_td, conversion', [ + (Timedelta(nanoseconds=100), '100ns'), + (Timedelta(days=1, hours=1, minutes=1, weeks=1, seconds=1, milliseconds=1, + microseconds=1, nanoseconds=1), 694861001001001), + (Timedelta(microseconds=1) + Timedelta(nanoseconds=1), '1us1ns'), + (Timedelta(microseconds=1) - Timedelta(nanoseconds=1), '999ns'), + (Timedelta(microseconds=1) + 5 * Timedelta(nanoseconds=-2), '990ns')]) def test_td_constructor_on_nanoseconds(constructed_td, conversion): # GH#9273 assert constructed_td == Timedelta(conversion) From e5df1dd3ae6ff70b3a98f80f2a41bf76512d6d60 Mon Sep 17 00:00:00 2001 From: minggli Date: Wed, 21 Mar 2018 16:05:55 +0000 Subject: [PATCH 5/5] more compact styling of parameters --- pandas/tests/scalar/timedelta/test_formats.py | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/pandas/tests/scalar/timedelta/test_formats.py b/pandas/tests/scalar/timedelta/test_formats.py index ec9199873136f..0d0b24f192f96 100644 --- a/pandas/tests/scalar/timedelta/test_formats.py +++ b/pandas/tests/scalar/timedelta/test_formats.py @@ -4,36 +4,25 @@ from pandas import Timedelta -@pytest.mark.parametrize('td, expected_repr', - [(Timedelta(10, unit='d'), - "Timedelta('10 days 00:00:00')"), - (Timedelta(10, unit='s'), - "Timedelta('0 days 00:00:10')"), - (Timedelta(10, unit='ms'), - "Timedelta('0 days 00:00:00.010000')"), - (Timedelta(-10, unit='ms'), - "Timedelta('-1 days +23:59:59.990000')")]) +@pytest.mark.parametrize('td, expected_repr', [ + (Timedelta(10, unit='d'), "Timedelta('10 days 00:00:00')"), + (Timedelta(10, unit='s'), "Timedelta('0 days 00:00:10')"), + (Timedelta(10, unit='ms'), "Timedelta('0 days 00:00:00.010000')"), + (Timedelta(-10, unit='ms'), "Timedelta('-1 days +23:59:59.990000')")]) def test_repr(td, expected_repr): assert repr(td) == expected_repr -@pytest.mark.parametrize('td, expected_iso', - [(Timedelta(days=6, minutes=50, seconds=3, - milliseconds=10, microseconds=10, - nanoseconds=12), - 'P6DT0H50M3.010010012S'), - (Timedelta(days=4, hours=12, minutes=30, seconds=5), - 'P4DT12H30M5S'), - (Timedelta(nanoseconds=123), - 'P0DT0H0M0.000000123S'), - # trim nano - (Timedelta(microseconds=10), - 'P0DT0H0M0.00001S'), - # trim micro - (Timedelta(milliseconds=1), - 'P0DT0H0M0.001S'), - # don't strip every 0 - (Timedelta(minutes=1), - 'P0DT0H1M0S')]) +@pytest.mark.parametrize('td, expected_iso', [ + (Timedelta(days=6, minutes=50, seconds=3, milliseconds=10, microseconds=10, + nanoseconds=12), 'P6DT0H50M3.010010012S'), + (Timedelta(days=4, hours=12, minutes=30, seconds=5), 'P4DT12H30M5S'), + (Timedelta(nanoseconds=123), 'P0DT0H0M0.000000123S'), + # trim nano + (Timedelta(microseconds=10), 'P0DT0H0M0.00001S'), + # trim micro + (Timedelta(milliseconds=1), 'P0DT0H0M0.001S'), + # don't strip every 0 + (Timedelta(minutes=1), 'P0DT0H1M0S')]) def test_isoformat(td, expected_iso): assert td.isoformat() == expected_iso