Skip to content

Commit 7b573c2

Browse files
committed
improving test cases
1 parent ffad503 commit 7b573c2

File tree

1 file changed

+53
-30
lines changed

1 file changed

+53
-30
lines changed

pandas/tests/base/test_value_counts.py

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
Series,
1515
Timedelta,
1616
TimedeltaIndex,
17+
Timestamp,
1718
array,
1819
)
1920
import pandas._testing as tm
@@ -344,52 +345,74 @@ def test_value_counts_object_inference_deprecated():
344345
@pytest.mark.parametrize(
345346
("index", "expected_index"),
346347
[
347-
pytest.param(
348+
[
348349
pd.date_range("2016-01-01", periods=5, freq="D"),
349350
pd.date_range("2016-01-01", periods=5, freq="D"),
350-
),
351-
pytest.param(
351+
],
352+
[
352353
pd.timedelta_range(Timedelta(0), periods=5, freq="h"),
353354
pd.timedelta_range(Timedelta(0), periods=5, freq="h"),
354-
),
355-
pytest.param(
356-
pd.date_range("2016-01-01", periods=5, freq="D").insert(
357-
1, pd.date_range("2016-01-01", periods=5, freq="D")[1]
355+
],
356+
[
357+
DatetimeIndex(
358+
[Timestamp("2016-01-01") + Timedelta(days=i) for i in range(1)]
359+
+ [Timestamp("2016-01-02")]
360+
+ [Timestamp("2016-01-01") + Timedelta(days=i) for i in range(1, 5)]
358361
),
359362
DatetimeIndex(pd.date_range("2016-01-01", periods=5, freq="D")),
360-
),
361-
pytest.param(
362-
pd.timedelta_range(Timedelta(0), periods=5, freq="h").insert(
363-
1, pd.timedelta_range(Timedelta(0), periods=5, freq="h")[1]
363+
],
364+
[
365+
TimedeltaIndex(
366+
[Timedelta(hours=i) for i in range(1)]
367+
+ [Timedelta(hours=1)]
368+
+ [Timedelta(hours=i) for i in range(1, 5)],
364369
),
365370
TimedeltaIndex(pd.timedelta_range(Timedelta(0), periods=5, freq="h")),
366-
),
367-
pytest.param(
368-
pd.date_range("2016-01-01", periods=5, freq="D").delete(2),
369-
DatetimeIndex(pd.date_range("2016-01-01", periods=5, freq="D").delete(2)),
370-
),
371-
pytest.param(
372-
pd.timedelta_range(Timedelta(0), periods=5, freq="h").delete(2),
371+
],
372+
[
373+
DatetimeIndex(
374+
[Timestamp("2016-01-01") + Timedelta(days=i) for i in range(2)]
375+
+ [Timestamp("2016-01-01") + Timedelta(days=i) for i in range(3, 5)],
376+
),
377+
DatetimeIndex(
378+
[Timestamp("2016-01-01") + Timedelta(days=i) for i in range(2)]
379+
+ [Timestamp("2016-01-01") + Timedelta(days=i) for i in range(3, 5)],
380+
),
381+
],
382+
[
383+
TimedeltaIndex(
384+
[Timedelta(hours=i) for i in range(2)]
385+
+ [Timedelta(hours=i) for i in range(3, 5)],
386+
),
373387
TimedeltaIndex(
374-
pd.timedelta_range(Timedelta(0), periods=5, freq="h").delete(2)
388+
[Timedelta(hours=i) for i in range(2)]
389+
+ [Timedelta(hours=i) for i in range(3, 5)],
375390
),
376-
),
377-
pytest.param(
378-
pd.date_range("2016-01-01", periods=5, freq="D").insert(1, pd.NaT),
391+
],
392+
[
379393
DatetimeIndex(
380-
list(pd.date_range("2016-01-01", periods=5, freq="D")[:1])
394+
[Timestamp("2016-01-01")]
395+
+ [pd.NaT]
396+
+ [Timestamp("2016-01-01") + Timedelta(days=i) for i in range(1, 5)],
397+
),
398+
DatetimeIndex(
399+
[Timestamp("2016-01-01")]
400+
+ [pd.NaT]
401+
+ [Timestamp("2016-01-01") + Timedelta(days=i) for i in range(1, 5)],
402+
),
403+
],
404+
[
405+
TimedeltaIndex(
406+
[Timedelta(hours=0)]
381407
+ [pd.NaT]
382-
+ list(pd.date_range("2016-01-01", periods=5, freq="D")[1:])
408+
+ [Timedelta(hours=i) for i in range(1, 5)],
383409
),
384-
),
385-
pytest.param(
386-
pd.timedelta_range(Timedelta(0), periods=5, freq="h").insert(1, pd.NaT),
387410
TimedeltaIndex(
388-
list(pd.timedelta_range(Timedelta(0), periods=5, freq="h")[:1])
411+
[Timedelta(hours=0)]
389412
+ [pd.NaT]
390-
+ list(pd.timedelta_range(Timedelta(0), periods=5, freq="h")[1:])
413+
+ [Timedelta(hours=i) for i in range(1, 5)],
391414
),
392-
),
415+
],
393416
],
394417
)
395418
def test_value_counts_index_datetimelike(index, expected_index):

0 commit comments

Comments
 (0)