Skip to content

Commit 115c92a

Browse files
committed
split tests
1 parent 5b7f396 commit 115c92a

File tree

2 files changed

+32
-24
lines changed

2 files changed

+32
-24
lines changed

pandas/core/generic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8328,8 +8328,8 @@ def resample(
83288328
You can also specify the backward origin:
83298329
83308330
>>> ts.groupby(pd.Grouper(freq='17min',
8331-
origin='2000-10-02 00:30:00',
8332-
backward=True)).sum()
8331+
... origin='2000-10-02 00:30:00',
8332+
... backward=True)).sum()
83338333
2000-10-01 23:39:00 3
83348334
2000-10-01 23:56:00 15
83358335
2000-10-02 00:13:00 45

pandas/tests/resample/test_resample_api.py

+30-22
Original file line numberDiff line numberDiff line change
@@ -613,22 +613,24 @@ def test_resample_agg_readonly():
613613
tm.assert_series_equal(result, expected)
614614

615615

616-
def test_backward_resample():
617-
# GH#37804
616+
# test data for backward resample GH#37804
617+
start, end = "2000-10-01 23:30:00", "2000-10-02 00:26:00"
618+
rng = date_range(start, end, freq="7min")
619+
ts = Series(np.arange(len(rng)) * 3, index=rng)
618620

619-
start, end = "2000-10-01 23:30:00", "2000-10-02 00:26:00"
620-
rng = date_range(start, end, freq="7min")
621-
ts = Series(np.arange(len(rng)) * 3, index=rng)
622621

623-
# test consistency of backward and origin
622+
def test_backward_origin_consistency():
623+
624624
msg = "`start` or `start_day` origin isn't allowed when `backward` is True"
625625
with pytest.raises(ValueError, match=msg):
626626
ts.resample("1min", origin="start", backward=True)
627627
msg = "`end` or `end_day` origin isn't allowed when `backward` is False"
628628
with pytest.raises(ValueError, match=msg):
629629
ts.resample("1min", origin="end", backward=False)
630630

631-
# test end origin
631+
632+
def test_end_origin():
633+
632634
res = ts.resample("17min", origin="end").sum().astype("int64")
633635
data = [0, 18, 27, 63]
634636
expected = Series(
@@ -642,7 +644,21 @@ def test_backward_resample():
642644

643645
tm.assert_series_equal(res, expected)
644646

645-
# test end_day origin
647+
# an extra test case
648+
idx = date_range("20200101 8:26:35", "20200101 9:31:58", freq="77s")
649+
data = np.ones(len(idx))
650+
s = Series(data, index=idx)
651+
result = s.resample("7min", origin="end", closed="right").sum()
652+
653+
exp_idx = date_range("2020-01-01 08:27:45", "2020-01-01 09:30:45", freq="7T")
654+
exp_data = [1.0, 6.0, 5.0, 6.0, 5.0, 6.0, 5.0, 6.0, 5.0, 6.0]
655+
expected = Series(exp_data, index=exp_idx)
656+
657+
tm.assert_series_equal(result, expected)
658+
659+
660+
def test_end_day_origin():
661+
646662
# 12 == 24 * 60 - 84 * 17 <= 26 (last value) <= 24 * 60 - 83 * 17 == 29
647663
res = ts.resample("17min", origin="end_day").sum().astype("int64")
648664
data = [3, 15, 45, 45]
@@ -657,7 +673,9 @@ def test_backward_resample():
657673

658674
tm.assert_series_equal(res, expected)
659675

660-
# test datetime origin with backward resample
676+
677+
def test_backward_resample_with_datetime_origin():
678+
661679
res = (
662680
ts.resample(
663681
"17min",
@@ -700,7 +718,9 @@ def test_backward_resample():
700718

701719
tm.assert_series_equal(res, expected)
702720

703-
# test right and left close
721+
722+
def test_left_and_right_close_in_backward_resample():
723+
704724
res = (
705725
ts.resample(
706726
"17min",
@@ -742,15 +762,3 @@ def test_backward_resample():
742762
)
743763

744764
tm.assert_series_equal(res, expected)
745-
746-
# original test case
747-
idx = date_range("20200101 8:26:35", "20200101 9:31:58", freq="77s")
748-
data = np.ones(len(idx))
749-
s = Series(data, index=idx)
750-
result = s.resample("7min", origin="end", closed="right").sum()
751-
752-
exp_idx = date_range("2020-01-01 08:27:45", "2020-01-01 09:30:45", freq="7T")
753-
exp_data = [1.0, 6.0, 5.0, 6.0, 5.0, 6.0, 5.0, 6.0, 5.0, 6.0]
754-
expected = Series(exp_data, index=exp_idx)
755-
756-
tm.assert_series_equal(result, expected)

0 commit comments

Comments
 (0)