From 8cc38e2440b042697ae58540f0ee642ad1723322 Mon Sep 17 00:00:00 2001 From: Felix Dulys Date: Wed, 11 Aug 2021 13:05:31 -0700 Subject: [PATCH 1/2] TST: move easter to own file and parameterize (#27085) --- pandas/tests/tseries/offsets/test_easter.py | 36 ++++++++++++++++++++ pandas/tests/tseries/offsets/test_offsets.py | 17 --------- 2 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 pandas/tests/tseries/offsets/test_easter.py diff --git a/pandas/tests/tseries/offsets/test_easter.py b/pandas/tests/tseries/offsets/test_easter.py new file mode 100644 index 0000000000000..e8c36bf1ee8e8 --- /dev/null +++ b/pandas/tests/tseries/offsets/test_easter.py @@ -0,0 +1,36 @@ +""" +Tests for the following offsets: +- Easter +""" +from __future__ import annotations + +from datetime import datetime + +import pytest + +from pandas.tests.tseries.offsets.common import ( + Base, + assert_offset_equal, +) + +from pandas.tseries.offsets import Easter + + +class TestEaster(Base): + @pytest.mark.parametrize( + "offset,date,expected", + [ + (Easter(), datetime(2010, 1, 1), datetime(2010, 4, 4)), + (Easter(), datetime(2010, 4, 5), datetime(2011, 4, 24)), + (Easter(2), datetime(2010, 1, 1), datetime(2011, 4, 24)), + (Easter(), datetime(2010, 4, 4), datetime(2011, 4, 24)), + (Easter(2), datetime(2010, 4, 4), datetime(2012, 4, 8)), + (-Easter(), datetime(2011, 1, 1), datetime(2010, 4, 4)), + (-Easter(), datetime(2010, 4, 5), datetime(2010, 4, 4)), + (-Easter(2), datetime(2011, 1, 1), datetime(2009, 4, 12)), + (-Easter(), datetime(2010, 4, 4), datetime(2009, 4, 12)), + (-Easter(2), datetime(2010, 4, 4), datetime(2008, 3, 23)) + ], + ) + def test_offset(self, offset, date, expected): + assert_offset_equal(offset, date, expected) diff --git a/pandas/tests/tseries/offsets/test_offsets.py b/pandas/tests/tseries/offsets/test_offsets.py index 08dbc1345b9d4..f332470ef4704 100644 --- a/pandas/tests/tseries/offsets/test_offsets.py +++ b/pandas/tests/tseries/offsets/test_offsets.py @@ -36,7 +36,6 @@ from pandas.tests.tseries.offsets.common import ( Base, WeekDay, - assert_offset_equal, ) import pandas.tseries.offsets as offsets @@ -565,22 +564,6 @@ def test_eq(self): assert offset1 != offset2 -def test_Easter(): - assert_offset_equal(Easter(), datetime(2010, 1, 1), datetime(2010, 4, 4)) - assert_offset_equal(Easter(), datetime(2010, 4, 5), datetime(2011, 4, 24)) - assert_offset_equal(Easter(2), datetime(2010, 1, 1), datetime(2011, 4, 24)) - - assert_offset_equal(Easter(), datetime(2010, 4, 4), datetime(2011, 4, 24)) - assert_offset_equal(Easter(2), datetime(2010, 4, 4), datetime(2012, 4, 8)) - - assert_offset_equal(-Easter(), datetime(2011, 1, 1), datetime(2010, 4, 4)) - assert_offset_equal(-Easter(), datetime(2010, 4, 5), datetime(2010, 4, 4)) - assert_offset_equal(-Easter(2), datetime(2011, 1, 1), datetime(2009, 4, 12)) - - assert_offset_equal(-Easter(), datetime(2010, 4, 4), datetime(2009, 4, 12)) - assert_offset_equal(-Easter(2), datetime(2010, 4, 4), datetime(2008, 3, 23)) - - class TestOffsetNames: def test_get_offset_name(self): assert BDay().freqstr == "B" From 951c434f3a7994459e6b95512ded97bde2cc7bcd Mon Sep 17 00:00:00 2001 From: Felix Dulys Date: Wed, 11 Aug 2021 13:17:38 -0700 Subject: [PATCH 2/2] TST: flake (#27045) --- pandas/tests/tseries/offsets/test_easter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/tseries/offsets/test_easter.py b/pandas/tests/tseries/offsets/test_easter.py index e8c36bf1ee8e8..90ee7c7f69d5e 100644 --- a/pandas/tests/tseries/offsets/test_easter.py +++ b/pandas/tests/tseries/offsets/test_easter.py @@ -29,7 +29,7 @@ class TestEaster(Base): (-Easter(), datetime(2010, 4, 5), datetime(2010, 4, 4)), (-Easter(2), datetime(2011, 1, 1), datetime(2009, 4, 12)), (-Easter(), datetime(2010, 4, 4), datetime(2009, 4, 12)), - (-Easter(2), datetime(2010, 4, 4), datetime(2008, 3, 23)) + (-Easter(2), datetime(2010, 4, 4), datetime(2008, 3, 23)), ], ) def test_offset(self, offset, date, expected):