Skip to content

Commit c3fc6df

Browse files
SaturnFromTitangfyoung
authored andcommitted
Fixed test util imports in pandas/tests/resample (#29286)
xref: #29272
1 parent ce3d7e0 commit c3fc6df

7 files changed

+209
-229
lines changed

pandas/tests/resample/test_base.py

+14-20
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
from pandas.core.indexes.period import PeriodIndex, period_range
1212
from pandas.core.indexes.timedeltas import TimedeltaIndex, timedelta_range
1313
import pandas.util.testing as tm
14-
from pandas.util.testing import (
15-
assert_almost_equal,
16-
assert_frame_equal,
17-
assert_index_equal,
18-
assert_series_equal,
19-
)
2014

2115
# a fixture value can be overridden by the test parameter value. Note that the
2216
# value of the fixture can be overridden this way even if the test doesn't use
@@ -53,7 +47,7 @@ def test_asfreq(series_and_frame, freq, create_index):
5347
result = obj.resample(freq).asfreq()
5448
new_index = create_index(obj.index[0], obj.index[-1], freq=freq)
5549
expected = obj.reindex(new_index)
56-
assert_almost_equal(result, expected)
50+
tm.assert_almost_equal(result, expected)
5751

5852

5953
@pytest.mark.parametrize(
@@ -67,21 +61,21 @@ def test_asfreq_fill_value(series, create_index):
6761
result = s.resample("1H").asfreq()
6862
new_index = create_index(s.index[0], s.index[-1], freq="1H")
6963
expected = s.reindex(new_index)
70-
assert_series_equal(result, expected)
64+
tm.assert_series_equal(result, expected)
7165

7266
frame = s.to_frame("value")
7367
frame.iloc[1] = None
7468
result = frame.resample("1H").asfreq(fill_value=4.0)
7569
new_index = create_index(frame.index[0], frame.index[-1], freq="1H")
7670
expected = frame.reindex(new_index, fill_value=4.0)
77-
assert_frame_equal(result, expected)
71+
tm.assert_frame_equal(result, expected)
7872

7973

8074
@all_ts
8175
def test_resample_interpolate(frame):
8276
# # 12925
8377
df = frame
84-
assert_frame_equal(
78+
tm.assert_frame_equal(
8579
df.resample("1T").asfreq().interpolate(), df.resample("1T").interpolate()
8680
)
8781

@@ -113,9 +107,9 @@ def test_resample_empty_series(freq, empty_series, resample_method):
113107
expected.index = s.index.asfreq(freq=freq)
114108
else:
115109
expected.index = s.index._shallow_copy(freq=freq)
116-
assert_index_equal(result.index, expected.index)
110+
tm.assert_index_equal(result.index, expected.index)
117111
assert result.index.freq == expected.index.freq
118-
assert_series_equal(result, expected, check_dtype=False)
112+
tm.assert_series_equal(result, expected, check_dtype=False)
119113

120114

121115
@all_ts
@@ -135,9 +129,9 @@ def test_resample_empty_dataframe(empty_frame, freq, resample_method):
135129
expected.index = df.index.asfreq(freq=freq)
136130
else:
137131
expected.index = df.index._shallow_copy(freq=freq)
138-
assert_index_equal(result.index, expected.index)
132+
tm.assert_index_equal(result.index, expected.index)
139133
assert result.index.freq == expected.index.freq
140-
assert_almost_equal(result, expected, check_dtype=False)
134+
tm.assert_almost_equal(result, expected, check_dtype=False)
141135

142136
# test size for GH13212 (currently stays as df)
143137

@@ -186,12 +180,12 @@ def test_resample_loffset_arg_type(frame, create_index):
186180
if isinstance(expected.index, TimedeltaIndex):
187181
msg = "DataFrame are different"
188182
with pytest.raises(AssertionError, match=msg):
189-
assert_frame_equal(result_agg, expected)
183+
tm.assert_frame_equal(result_agg, expected)
190184
with pytest.raises(AssertionError, match=msg):
191-
assert_frame_equal(result_how, expected)
185+
tm.assert_frame_equal(result_how, expected)
192186
else:
193-
assert_frame_equal(result_agg, expected)
194-
assert_frame_equal(result_how, expected)
187+
tm.assert_frame_equal(result_agg, expected)
188+
tm.assert_frame_equal(result_how, expected)
195189

196190

197191
@all_ts
@@ -202,7 +196,7 @@ def test_apply_to_empty_series(empty_series):
202196
result = s.resample(freq).apply(lambda x: 1)
203197
expected = s.resample(freq).apply(np.sum)
204198

205-
assert_series_equal(result, expected, check_dtype=False)
199+
tm.assert_series_equal(result, expected, check_dtype=False)
206200

207201

208202
@all_ts
@@ -214,7 +208,7 @@ def test_resampler_is_iterable(series):
214208
resampled = series.resample(freq)
215209
for (rk, rv), (gk, gv) in zip(resampled, grouped):
216210
assert rk == gk
217-
assert_series_equal(rv, gv)
211+
tm.assert_series_equal(rv, gv)
218212

219213

220214
@all_ts

0 commit comments

Comments
 (0)