Skip to content

Commit 6126dfb

Browse files
author
Ritsuki Yamada
committed
add axis test cases & refactor
1 parent 4e29a0d commit 6126dfb

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

tests/test_frame.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2984,19 +2984,15 @@ def test_iloc_tuple() -> None:
29842984
df = df.iloc[0:2,]
29852985

29862986

2987-
def test_take_list() -> None:
2988-
df = pd.DataFrame({"a": [1, 2, 3]})
2987+
def test_take() -> None:
2988+
df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
29892989
check(assert_type(df.take([0, 1]), pd.DataFrame), pd.DataFrame)
2990-
2991-
2992-
def test_take_list_npint() -> None:
2993-
df = pd.DataFrame({"a": [1, 2, 3]})
29942990
check(assert_type(df.take([np.int64(0), np.int64(1)]), pd.DataFrame), pd.DataFrame)
2995-
2996-
2997-
def test_take_ndarray() -> None:
2998-
df = pd.DataFrame({"a": [1, 2, 3]})
29992991
check(assert_type(df.take(np.array([0, 1])), pd.DataFrame), pd.DataFrame)
2992+
check(assert_type(df.take([0, 1], "index"), pd.DataFrame), pd.DataFrame)
2993+
check(assert_type(df.take([0, 1], 0), pd.DataFrame), pd.DataFrame)
2994+
check(assert_type(df.take([0, 1], "columns"), pd.DataFrame), pd.DataFrame)
2995+
check(assert_type(df.take([0, 1], 1), pd.DataFrame), pd.DataFrame)
30002996

30012997

30022998
def test_set_columns() -> None:

tests/test_series.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,21 +1715,13 @@ def test_iloc_getitem_ndarray() -> None:
17151715
check(assert_type(values_s.iloc[indices_u64], pd.Series), pd.Series)
17161716

17171717

1718-
def test_take_list() -> None:
1718+
def test_take() -> None:
17191719
s = pd.Series(np.arange(10), name="a")
17201720
check(assert_type(s.take([0, 1]), pd.Series), pd.Series)
1721-
1722-
1723-
def test_take_list_npint() -> None:
1724-
s = pd.Series(np.arange(10), name="a")
17251721
check(
17261722
assert_type(s.take([np.int64(0), np.int64(1)]), pd.Series),
17271723
pd.Series,
17281724
)
1729-
1730-
1731-
def test_take_ndarray() -> None:
1732-
s = pd.Series(np.arange(10), name="a")
17331725
check(assert_type(s.take(np.array([0, 1])), pd.Series), pd.Series)
17341726

17351727

0 commit comments

Comments
 (0)