Skip to content

Commit 2106e8b

Browse files
loicdiridollouloicdiridollou
authored
Minor test cleanup to adopt check assert_type framework (#1369)
Convert tests to check assert_type framework
1 parent 9980c3b commit 2106e8b

File tree

4 files changed

+77
-31
lines changed

4 files changed

+77
-31
lines changed

‎tests/test_dtypes.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def test_categorical_dtype() -> None:
113113
pd.CategoricalDtype,
114114
)
115115
check(assert_type(cdt.categories, pd.Index), pd.Index)
116-
assert check(assert_type(cdt.ordered, Optional[bool]), bool)
116+
check(assert_type(cdt.ordered, Optional[bool]), bool)
117117

118118

119119
def test_sparse_dtype() -> None:

‎tests/test_frame.py‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ def test_types_drop() -> None:
463463
check(assert_type(df.drop(index=[0]), pd.DataFrame), pd.DataFrame)
464464
check(assert_type(df.drop(index=1), pd.DataFrame), pd.DataFrame)
465465
check(assert_type(df.drop(labels=0), pd.DataFrame), pd.DataFrame)
466-
assert assert_type(df.drop([0, 0], inplace=True), None) is None
466+
check(assert_type(df.drop([0, 0], inplace=True), None), type(None))
467467
to_drop: list[str] = ["col1"]
468468
check(assert_type(df.drop(columns=to_drop), pd.DataFrame), pd.DataFrame)
469469
# GH 302
@@ -2968,8 +2968,8 @@ def test_types_ffill() -> None:
29682968
assert_type(df.ffill(inplace=False, limit_area="inside"), pd.DataFrame),
29692969
pd.DataFrame,
29702970
)
2971-
assert assert_type(df.ffill(inplace=True), None) is None
2972-
assert assert_type(df.ffill(inplace=True, limit_area="outside"), None) is None
2971+
check(assert_type(df.ffill(inplace=True), None), type(None))
2972+
check(assert_type(df.ffill(inplace=True, limit_area="outside"), None), type(None))
29732973

29742974

29752975
def test_types_bfill() -> None:
@@ -2981,16 +2981,16 @@ def test_types_bfill() -> None:
29812981
assert_type(df.bfill(inplace=False, limit_area="inside"), pd.DataFrame),
29822982
pd.DataFrame,
29832983
)
2984-
assert assert_type(df.bfill(inplace=True), None) is None
2985-
assert assert_type(df.bfill(inplace=True, limit_area="outside"), None) is None
2984+
check(assert_type(df.bfill(inplace=True), None), type(None))
2985+
check(assert_type(df.bfill(inplace=True, limit_area="outside"), None), type(None))
29862986

29872987

29882988
def test_types_replace() -> None:
29892989
# GH 44
29902990
df = pd.DataFrame([[1, 2, 3]])
29912991
check(assert_type(df.replace(1, 2), pd.DataFrame), pd.DataFrame)
29922992
check(assert_type(df.replace(1, 2, inplace=False), pd.DataFrame), pd.DataFrame)
2993-
assert assert_type(df.replace(1, 2, inplace=True), None) is None
2993+
check(assert_type(df.replace(1, 2, inplace=True), None), type(None))
29942994

29952995

29962996
def test_dataframe_replace() -> None:
@@ -3286,12 +3286,12 @@ def test_frame_ndarray_assignmment() -> None:
32863286

32873287
def test_not_hashable() -> None:
32883288
# GH 113
3289-
assert assert_type(pd.DataFrame.__hash__, None) is None
3290-
assert assert_type(pd.DataFrame().__hash__, None) is None
3291-
assert assert_type(pd.Series.__hash__, None) is None
3292-
assert assert_type(pd.Series([], dtype=object).__hash__, None) is None
3293-
assert assert_type(pd.Index.__hash__, None) is None
3294-
assert assert_type(pd.Index([]).__hash__, None) is None
3289+
check(assert_type(pd.DataFrame.__hash__, None), type(None))
3290+
check(assert_type(pd.DataFrame().__hash__, None), type(None))
3291+
check(assert_type(pd.Series.__hash__, None), type(None))
3292+
check(assert_type(pd.Series([], dtype=object).__hash__, None), type(None))
3293+
check(assert_type(pd.Index.__hash__, None), type(None))
3294+
check(assert_type(pd.Index([]).__hash__, None), type(None))
32953295

32963296
def test_func(_: Hashable):
32973297
pass
@@ -4171,9 +4171,11 @@ def test_insert_newvalues() -> None:
41714171
df = pd.DataFrame({"a": [1, 2]})
41724172
ab = pd.DataFrame({"col1": [1, 2], "col2": [3, 4]})
41734173
ef = pd.DataFrame({"z": [4, 5, 6]})
4174-
assert assert_type(df.insert(loc=0, column="b", value=None), None) is None
4175-
assert assert_type(ab.insert(loc=0, column="newcol", value=[99, 99]), None) is None
4176-
assert assert_type(ef.insert(loc=0, column="g", value=4), None) is None
4174+
check(assert_type(df.insert(loc=0, column="b", value=None), None), type(None))
4175+
check(
4176+
assert_type(ab.insert(loc=0, column="newcol", value=[99, 99]), None), type(None)
4177+
)
4178+
check(assert_type(ef.insert(loc=0, column="g", value=4), None), type(None))
41774179

41784180

41794181
def test_astype() -> None:

‎tests/test_timefuncs.py‎

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def test_timedelta_series_string() -> None:
190190

191191
def test_timestamp_timedelta_series_arithmetic() -> None:
192192
ts1 = pd.to_datetime(pd.Series(["2022-03-05", "2022-03-06"]))
193-
assert isinstance(ts1.iloc[0], pd.Timestamp)
193+
check(assert_type(ts1.iloc[0], pd.Timestamp), pd.Timestamp)
194194
td1 = pd.to_timedelta([2, 3], "seconds")
195195
ts2 = pd.to_datetime(pd.Series(["2022-03-08", "2022-03-10"]))
196196
r1 = ts1 - ts2
@@ -328,7 +328,7 @@ def test_timedelta_series_sum() -> None:
328328
def test_iso_calendar() -> None:
329329
# GH 31
330330
dates = pd.date_range(start="2012-01-01", end="2019-12-31", freq="W-MON")
331-
dates.isocalendar()
331+
check(assert_type(dates.isocalendar(), pd.DataFrame), pd.DataFrame)
332332

333333

334334
def test_fail_on_adding_two_timestamps() -> None:
@@ -343,7 +343,7 @@ def test_fail_on_adding_two_timestamps() -> None:
343343
def test_dtindex_tzinfo() -> None:
344344
# GH 71
345345
dti = pd.date_range("2000-1-1", periods=10)
346-
assert assert_type(dti.tzinfo, Optional[dt.tzinfo]) is None
346+
check(assert_type(dti.tzinfo, Optional[dt.tzinfo]), type(None))
347347

348348

349349
def test_todatetime_fromnumpy() -> None:
@@ -422,7 +422,7 @@ def test_series_dt_accessors() -> None:
422422
check(assert_type(s0.dt.is_leap_year, "pd.Series[bool]"), pd.Series, np.bool_)
423423
check(assert_type(s0.dt.daysinmonth, "pd.Series[int]"), pd.Series, np.integer)
424424
check(assert_type(s0.dt.days_in_month, "pd.Series[int]"), pd.Series, np.integer)
425-
assert assert_type(s0.dt.tz, Optional[dt.tzinfo]) is None
425+
check(assert_type(s0.dt.tz, Optional[dt.tzinfo]), type(None))
426426
check(assert_type(s0.dt.freq, Optional[str]), str)
427427
check(assert_type(s0.dt.isocalendar(), pd.DataFrame), pd.DataFrame)
428428
check(assert_type(s0.dt.to_period("D"), "PeriodSeries"), pd.Series, pd.Period)
@@ -1207,19 +1207,61 @@ def test_to_timedelta_index() -> None:
12071207

12081208

12091209
def test_bdate_range_holidays() -> None:
1210-
pd.bdate_range("2000-1-1", "2001-1-1", freq="C", holidays=["2000-12-15"])
1211-
pd.bdate_range("2000-1-1", "2001-1-1", freq="C", holidays=[dt.date(2000, 12, 15)])
1212-
pd.bdate_range(
1213-
"2000-1-1", "2001-1-1", freq="C", holidays=[pd.Timestamp(2000, 12, 15)]
1210+
check(
1211+
assert_type(
1212+
pd.bdate_range("2000-1-1", "2001-1-1", freq="C", holidays=["2000-12-15"]),
1213+
pd.DatetimeIndex,
1214+
),
1215+
pd.DatetimeIndex,
1216+
)
1217+
check(
1218+
assert_type(
1219+
pd.bdate_range(
1220+
"2000-1-1", "2001-1-1", freq="C", holidays=[dt.date(2000, 12, 15)]
1221+
),
1222+
pd.DatetimeIndex,
1223+
),
1224+
pd.DatetimeIndex,
1225+
)
1226+
check(
1227+
assert_type(
1228+
pd.bdate_range(
1229+
"2000-1-1", "2001-1-1", freq="C", holidays=[pd.Timestamp(2000, 12, 15)]
1230+
),
1231+
pd.DatetimeIndex,
1232+
),
1233+
pd.DatetimeIndex,
12141234
)
1215-
pd.bdate_range(
1216-
"2000-1-1", "2001-1-1", freq="C", holidays=[np.datetime64("2000-12-15")]
1235+
check(
1236+
assert_type(
1237+
pd.bdate_range(
1238+
"2000-1-1", "2001-1-1", freq="C", holidays=[np.datetime64("2000-12-15")]
1239+
),
1240+
pd.DatetimeIndex,
1241+
),
1242+
pd.DatetimeIndex,
12171243
)
1218-
pd.bdate_range(
1219-
"2000-1-1", "2001-1-1", freq="C", holidays=[dt.datetime(2000, 12, 15)]
1244+
check(
1245+
assert_type(
1246+
pd.bdate_range(
1247+
"2000-1-1", "2001-1-1", freq="C", holidays=[dt.datetime(2000, 12, 15)]
1248+
),
1249+
pd.DatetimeIndex,
1250+
),
1251+
pd.DatetimeIndex,
12201252
)
1221-
pd.bdate_range(
1222-
"2000-1-1", "2001-1-1", freq="C", holidays=[dt.date(2000, 12, 15)], name=("a",)
1253+
check(
1254+
assert_type(
1255+
pd.bdate_range(
1256+
"2000-1-1",
1257+
"2001-1-1",
1258+
freq="C",
1259+
holidays=[dt.date(2000, 12, 15)],
1260+
name=("a",),
1261+
),
1262+
pd.DatetimeIndex,
1263+
),
1264+
pd.DatetimeIndex,
12231265
)
12241266

12251267

‎tests/test_windowing.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
)
1515
from typing_extensions import assert_type
1616

17+
from pandas._libs.tslibs.offsets import DateOffset
18+
1719
from tests import (
1820
PD_LTE_23,
1921
check,
@@ -56,7 +58,7 @@ def test_rolling_basic_math() -> None:
5658

5759
def test_rolling_datetime_index() -> None:
5860
offset_1d = to_offset("1D")
59-
assert offset_1d is not None
61+
check(assert_type(offset_1d, DateOffset), DateOffset)
6062

6163
check(assert_type(DF_DTI.rolling("1D"), "Rolling[DataFrame]"), Rolling, DataFrame)
6264
check(

0 commit comments

Comments
 (0)