Skip to content

Commit 5b0a8b4

Browse files
jbrockmendelrhshadrach
authored andcommitted
TST: make expected DTI/TDI results more specific (pandas-dev#33609)
1 parent ce9e662 commit 5b0a8b4

File tree

9 files changed

+69
-35
lines changed

9 files changed

+69
-35
lines changed

pandas/tests/indexes/datetimes/test_misc.py

+17-9
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ def test_range_edges(self):
2525
"1970-01-01 00:00:00.000000002",
2626
"1970-01-01 00:00:00.000000003",
2727
"1970-01-01 00:00:00.000000004",
28-
]
28+
],
29+
freq="N",
2930
)
3031
tm.assert_index_equal(idx, exp)
3132

@@ -34,15 +35,15 @@ def test_range_edges(self):
3435
end=Timestamp("1970-01-01 00:00:00.000000001"),
3536
freq="N",
3637
)
37-
exp = DatetimeIndex([])
38+
exp = DatetimeIndex([], freq="N")
3839
tm.assert_index_equal(idx, exp)
3940

4041
idx = pd.date_range(
4142
start=Timestamp("1970-01-01 00:00:00.000000001"),
4243
end=Timestamp("1970-01-01 00:00:00.000000001"),
4344
freq="N",
4445
)
45-
exp = DatetimeIndex(["1970-01-01 00:00:00.000000001"])
46+
exp = DatetimeIndex(["1970-01-01 00:00:00.000000001"], freq="N")
4647
tm.assert_index_equal(idx, exp)
4748

4849
idx = pd.date_range(
@@ -56,7 +57,8 @@ def test_range_edges(self):
5657
"1970-01-01 00:00:00.000002",
5758
"1970-01-01 00:00:00.000003",
5859
"1970-01-01 00:00:00.000004",
59-
]
60+
],
61+
freq="U",
6062
)
6163
tm.assert_index_equal(idx, exp)
6264

@@ -71,7 +73,8 @@ def test_range_edges(self):
7173
"1970-01-01 00:00:00.002",
7274
"1970-01-01 00:00:00.003",
7375
"1970-01-01 00:00:00.004",
74-
]
76+
],
77+
freq="L",
7578
)
7679
tm.assert_index_equal(idx, exp)
7780

@@ -86,7 +89,8 @@ def test_range_edges(self):
8689
"1970-01-01 00:00:02",
8790
"1970-01-01 00:00:03",
8891
"1970-01-01 00:00:04",
89-
]
92+
],
93+
freq="S",
9094
)
9195
tm.assert_index_equal(idx, exp)
9296

@@ -101,7 +105,8 @@ def test_range_edges(self):
101105
"1970-01-01 00:02",
102106
"1970-01-01 00:03",
103107
"1970-01-01 00:04",
104-
]
108+
],
109+
freq="T",
105110
)
106111
tm.assert_index_equal(idx, exp)
107112

@@ -116,14 +121,17 @@ def test_range_edges(self):
116121
"1970-01-01 02:00",
117122
"1970-01-01 03:00",
118123
"1970-01-01 04:00",
119-
]
124+
],
125+
freq="H",
120126
)
121127
tm.assert_index_equal(idx, exp)
122128

123129
idx = pd.date_range(
124130
start=Timestamp("1970-01-01"), end=Timestamp("1970-01-04"), freq="D"
125131
)
126-
exp = DatetimeIndex(["1970-01-01", "1970-01-02", "1970-01-03", "1970-01-04"])
132+
exp = DatetimeIndex(
133+
["1970-01-01", "1970-01-02", "1970-01-03", "1970-01-04"], freq="D"
134+
)
127135
tm.assert_index_equal(idx, exp)
128136

129137

pandas/tests/indexes/datetimes/test_partial_slicing.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ def test_slice_with_negative_step(self):
2626
SLC = pd.IndexSlice
2727

2828
def assert_slices_equivalent(l_slc, i_slc):
29-
tm.assert_series_equal(ts[l_slc], ts.iloc[i_slc])
30-
tm.assert_series_equal(ts.loc[l_slc], ts.iloc[i_slc])
31-
tm.assert_series_equal(ts.loc[l_slc], ts.iloc[i_slc])
29+
expected = ts.iloc[i_slc]
30+
31+
tm.assert_series_equal(ts[l_slc], expected)
32+
tm.assert_series_equal(ts.loc[l_slc], expected)
33+
tm.assert_series_equal(ts.loc[l_slc], expected)
3234

3335
assert_slices_equivalent(SLC[Timestamp("2014-10-01") :: -1], SLC[9::-1])
3436
assert_slices_equivalent(SLC["2014-10-01"::-1], SLC[9::-1])
@@ -47,7 +49,7 @@ def assert_slices_equivalent(l_slc, i_slc):
4749
SLC[Timestamp("2015-02-01") : "2014-10-01" : -1], SLC[13:8:-1]
4850
)
4951

50-
assert_slices_equivalent(SLC["2014-10-01":"2015-02-01":-1], SLC[:0])
52+
assert_slices_equivalent(SLC["2014-10-01":"2015-02-01":-1], SLC[0:0:-1])
5153

5254
def test_slice_with_zero_step_raises(self):
5355
ts = Series(np.arange(20), date_range("2014-01-01", periods=20, freq="MS"))
@@ -79,7 +81,9 @@ def test_monotone_DTI_indexing_bug(self):
7981
df = pd.DataFrame(
8082
{"A": [1, 2, 3]}, index=pd.date_range("20170101", periods=3)[::-1]
8183
)
82-
expected = pd.DataFrame({"A": 1}, index=pd.date_range("20170103", periods=1))
84+
expected = pd.DataFrame(
85+
{"A": 1}, index=pd.date_range("20170103", periods=1)[::-1]
86+
)
8387
tm.assert_frame_equal(df.loc["2017-01-03"], expected)
8488

8589
def test_slice_year(self):

pandas/tests/indexes/datetimes/test_shift.py

+3
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,21 @@ def test_dti_shift_tzaware(self, tz_naive_fixture):
2828
["2011-01-01 10:00", "2011-01-01 11:00", "2011-01-01 12:00"],
2929
name="xxx",
3030
tz=tz,
31+
freq="H",
3132
)
3233
tm.assert_index_equal(idx.shift(0, freq="H"), idx)
3334
exp = pd.DatetimeIndex(
3435
["2011-01-01 13:00", "2011-01-01 14:00", "2011-01-01 15:00"],
3536
name="xxx",
3637
tz=tz,
38+
freq="H",
3739
)
3840
tm.assert_index_equal(idx.shift(3, freq="H"), exp)
3941
exp = pd.DatetimeIndex(
4042
["2011-01-01 07:00", "2011-01-01 08:00", "2011-01-01 09:00"],
4143
name="xxx",
4244
tz=tz,
45+
freq="H",
4346
)
4447
tm.assert_index_equal(idx.shift(-3, freq="H"), exp)
4548

pandas/tests/indexes/period/test_to_timestamp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def test_to_timestamp_quarterly_bug(self):
6060
pindex = PeriodIndex(year=years, quarter=quarters)
6161

6262
stamps = pindex.to_timestamp("D", "end")
63-
expected = DatetimeIndex([x.to_timestamp("D", "end") for x in pindex])
63+
expected = DatetimeIndex([x.to_timestamp("D", "end") for x in pindex], freq="Q")
6464
tm.assert_index_equal(stamps, expected)
6565

6666
def test_to_timestamp_pi_mult(self):

pandas/tests/indexes/timedeltas/test_partial_slicing.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ def test_slice_with_negative_step(self):
5252
SLC = pd.IndexSlice
5353

5454
def assert_slices_equivalent(l_slc, i_slc):
55-
tm.assert_series_equal(ts[l_slc], ts.iloc[i_slc])
56-
tm.assert_series_equal(ts.loc[l_slc], ts.iloc[i_slc])
57-
tm.assert_series_equal(ts.loc[l_slc], ts.iloc[i_slc])
55+
expected = ts.iloc[i_slc]
56+
57+
tm.assert_series_equal(ts[l_slc], expected)
58+
tm.assert_series_equal(ts.loc[l_slc], expected)
59+
tm.assert_series_equal(ts.loc[l_slc], expected)
5860

5961
assert_slices_equivalent(SLC[Timedelta(hours=7) :: -1], SLC[7::-1])
6062
assert_slices_equivalent(SLC["7 hours"::-1], SLC[7::-1])
@@ -73,7 +75,7 @@ def assert_slices_equivalent(l_slc, i_slc):
7375
SLC[Timedelta(hours=15) : "7 hours" : -1], SLC[15:6:-1]
7476
)
7577

76-
assert_slices_equivalent(SLC["7 hours":"15 hours":-1], SLC[:0])
78+
assert_slices_equivalent(SLC["7 hours":"15 hours":-1], SLC[0:0:-1])
7779

7880
def test_slice_with_zero_step_raises(self):
7981
ts = Series(np.arange(20), timedelta_range("0", periods=20, freq="H"))

pandas/tests/series/methods/test_append.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def test_series_append_aware(self):
175175
ts_result = ser1.append(ser2)
176176

177177
exp_index = DatetimeIndex(
178-
["2011-01-01 01:00", "2011-01-01 02:00"], tz="US/Eastern"
178+
["2011-01-01 01:00", "2011-01-01 02:00"], tz="US/Eastern", freq="H"
179179
)
180180
exp = Series([1, 2], index=exp_index)
181181
tm.assert_series_equal(ts_result, exp)
@@ -187,7 +187,9 @@ def test_series_append_aware(self):
187187
ser2 = Series([2], index=rng2)
188188
ts_result = ser1.append(ser2)
189189

190-
exp_index = DatetimeIndex(["2011-01-01 01:00", "2011-01-01 02:00"], tz="UTC")
190+
exp_index = DatetimeIndex(
191+
["2011-01-01 01:00", "2011-01-01 02:00"], tz="UTC", freq="H"
192+
)
191193
exp = Series([1, 2], index=exp_index)
192194
tm.assert_series_equal(ts_result, exp)
193195
utc = rng1.tz

pandas/tests/series/methods/test_asfreq.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,14 @@ def test_tz_aware_asfreq(self, tz):
3939
def test_asfreq(self):
4040
ts = Series(
4141
[0.0, 1.0, 2.0],
42-
index=[
43-
datetime(2009, 10, 30),
44-
datetime(2009, 11, 30),
45-
datetime(2009, 12, 31),
46-
],
42+
index=DatetimeIndex(
43+
[
44+
datetime(2009, 10, 30),
45+
datetime(2009, 11, 30),
46+
datetime(2009, 12, 31),
47+
],
48+
freq="BM",
49+
),
4750
)
4851

4952
daily_ts = ts.asfreq("B")

pandas/tests/tseries/offsets/test_offsets.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3501,7 +3501,7 @@ def test_offset_whole_year(self):
35013501

35023502
# ensure generating a range with DatetimeIndex gives same result
35033503
result = date_range(start=dates[0], end=dates[-1], freq="SM")
3504-
exp = DatetimeIndex(dates)
3504+
exp = DatetimeIndex(dates, freq="SM")
35053505
tm.assert_index_equal(result, exp)
35063506

35073507
offset_cases = []
@@ -3760,7 +3760,7 @@ def test_offset_whole_year(self):
37603760

37613761
# ensure generating a range with DatetimeIndex gives same result
37623762
result = date_range(start=dates[0], end=dates[-1], freq="SMS")
3763-
exp = DatetimeIndex(dates)
3763+
exp = DatetimeIndex(dates, freq="SMS")
37643764
tm.assert_index_equal(result, exp)
37653765

37663766
offset_cases = []

pandas/tests/window/moments/test_moments_rolling.py

+19-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import pandas.util._test_decorators as td
1010

1111
import pandas as pd
12-
from pandas import DataFrame, Index, Series, isna, notna
12+
from pandas import DataFrame, DatetimeIndex, Index, Series, isna, notna
1313
import pandas._testing as tm
1414
from pandas.core.window.common import _flex_binary_moment
1515
from pandas.tests.window.common import Base, ConsistencyBase
@@ -1346,7 +1346,9 @@ def test_rolling_max_gh6297(self):
13461346

13471347
expected = Series(
13481348
[1.0, 2.0, 6.0, 4.0, 5.0],
1349-
index=[datetime(1975, 1, i, 0) for i in range(1, 6)],
1349+
index=DatetimeIndex(
1350+
[datetime(1975, 1, i, 0) for i in range(1, 6)], freq="D"
1351+
),
13501352
)
13511353
x = series.resample("D").max().rolling(window=1).max()
13521354
tm.assert_series_equal(expected, x)
@@ -1366,15 +1368,19 @@ def test_rolling_max_resample(self):
13661368
# Default how should be max
13671369
expected = Series(
13681370
[0.0, 1.0, 2.0, 3.0, 20.0],
1369-
index=[datetime(1975, 1, i, 0) for i in range(1, 6)],
1371+
index=DatetimeIndex(
1372+
[datetime(1975, 1, i, 0) for i in range(1, 6)], freq="D"
1373+
),
13701374
)
13711375
x = series.resample("D").max().rolling(window=1).max()
13721376
tm.assert_series_equal(expected, x)
13731377

13741378
# Now specify median (10.0)
13751379
expected = Series(
13761380
[0.0, 1.0, 2.0, 3.0, 10.0],
1377-
index=[datetime(1975, 1, i, 0) for i in range(1, 6)],
1381+
index=DatetimeIndex(
1382+
[datetime(1975, 1, i, 0) for i in range(1, 6)], freq="D"
1383+
),
13781384
)
13791385
x = series.resample("D").median().rolling(window=1).max()
13801386
tm.assert_series_equal(expected, x)
@@ -1383,7 +1389,9 @@ def test_rolling_max_resample(self):
13831389
v = (4.0 + 10.0 + 20.0) / 3.0
13841390
expected = Series(
13851391
[0.0, 1.0, 2.0, 3.0, v],
1386-
index=[datetime(1975, 1, i, 0) for i in range(1, 6)],
1392+
index=DatetimeIndex(
1393+
[datetime(1975, 1, i, 0) for i in range(1, 6)], freq="D"
1394+
),
13871395
)
13881396
x = series.resample("D").mean().rolling(window=1).max()
13891397
tm.assert_series_equal(expected, x)
@@ -1403,7 +1411,9 @@ def test_rolling_min_resample(self):
14031411
# Default how should be min
14041412
expected = Series(
14051413
[0.0, 1.0, 2.0, 3.0, 4.0],
1406-
index=[datetime(1975, 1, i, 0) for i in range(1, 6)],
1414+
index=DatetimeIndex(
1415+
[datetime(1975, 1, i, 0) for i in range(1, 6)], freq="D"
1416+
),
14071417
)
14081418
r = series.resample("D").min().rolling(window=1)
14091419
tm.assert_series_equal(expected, r.min())
@@ -1423,7 +1433,9 @@ def test_rolling_median_resample(self):
14231433
# Default how should be median
14241434
expected = Series(
14251435
[0.0, 1.0, 2.0, 3.0, 10],
1426-
index=[datetime(1975, 1, i, 0) for i in range(1, 6)],
1436+
index=DatetimeIndex(
1437+
[datetime(1975, 1, i, 0) for i in range(1, 6)], freq="D"
1438+
),
14271439
)
14281440
x = series.resample("D").median().rolling(window=1).median()
14291441
tm.assert_series_equal(expected, x)

0 commit comments

Comments
 (0)