Skip to content

Commit 856ab94

Browse files
phoflluckyvs1
authored andcommitted
CLN: Multiindex tests (pandas-dev#38978)
1 parent 2f16726 commit 856ab94

File tree

4 files changed

+21
-36
lines changed

4 files changed

+21
-36
lines changed

pandas/tests/indexes/multi/test_constructors.py

+18-31
Original file line numberDiff line numberDiff line change
@@ -189,37 +189,24 @@ def test_from_arrays_tuples(idx):
189189
tm.assert_index_equal(result, idx)
190190

191191

192-
def test_from_arrays_index_series_datetimetz():
193-
idx1 = date_range("2015-01-01 10:00", freq="D", periods=3, tz="US/Eastern")
194-
idx2 = date_range("2015-01-01 10:00", freq="H", periods=3, tz="Asia/Tokyo")
195-
result = MultiIndex.from_arrays([idx1, idx2])
196-
tm.assert_index_equal(result.get_level_values(0), idx1)
197-
tm.assert_index_equal(result.get_level_values(1), idx2)
198-
199-
result2 = MultiIndex.from_arrays([Series(idx1), Series(idx2)])
200-
tm.assert_index_equal(result2.get_level_values(0), idx1)
201-
tm.assert_index_equal(result2.get_level_values(1), idx2)
202-
203-
tm.assert_index_equal(result, result2)
204-
205-
206-
def test_from_arrays_index_series_timedelta():
207-
idx1 = pd.timedelta_range("1 days", freq="D", periods=3)
208-
idx2 = pd.timedelta_range("2 hours", freq="H", periods=3)
209-
result = MultiIndex.from_arrays([idx1, idx2])
210-
tm.assert_index_equal(result.get_level_values(0), idx1)
211-
tm.assert_index_equal(result.get_level_values(1), idx2)
212-
213-
result2 = MultiIndex.from_arrays([Series(idx1), Series(idx2)])
214-
tm.assert_index_equal(result2.get_level_values(0), idx1)
215-
tm.assert_index_equal(result2.get_level_values(1), idx2)
216-
217-
tm.assert_index_equal(result, result2)
218-
219-
220-
def test_from_arrays_index_series_period():
221-
idx1 = pd.period_range("2011-01-01", freq="D", periods=3)
222-
idx2 = pd.period_range("2015-01-01", freq="H", periods=3)
192+
@pytest.mark.parametrize(
193+
("idx1", "idx2"),
194+
[
195+
(
196+
pd.period_range("2011-01-01", freq="D", periods=3),
197+
pd.period_range("2015-01-01", freq="H", periods=3),
198+
),
199+
(
200+
date_range("2015-01-01 10:00", freq="D", periods=3, tz="US/Eastern"),
201+
date_range("2015-01-01 10:00", freq="H", periods=3, tz="Asia/Tokyo"),
202+
),
203+
(
204+
pd.timedelta_range("1 days", freq="D", periods=3),
205+
pd.timedelta_range("2 hours", freq="H", periods=3),
206+
),
207+
],
208+
)
209+
def test_from_arrays_index_series_period_datetimetz_and_timedelta(idx1, idx2):
223210
result = MultiIndex.from_arrays([idx1, idx2])
224211
tm.assert_index_equal(result.get_level_values(0), idx1)
225212
tm.assert_index_equal(result.get_level_values(1), idx2)

pandas/tests/indexes/multi/test_copy.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,7 @@ def test_copy_method_kwargs(deep, kwarg, value):
7979
names=["first", "second"],
8080
)
8181
idx_copy = idx.copy(**{kwarg: value, "deep": deep})
82-
if kwarg == "names":
83-
assert getattr(idx_copy, kwarg) == value
84-
else:
85-
assert [list(i) for i in getattr(idx_copy, kwarg)] == value
82+
assert getattr(idx_copy, kwarg) == value
8683

8784

8885
@pytest.mark.parametrize("deep", [True, False])

pandas/tests/indexes/multi/test_duplicates.py

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def test_unique_level(idx, level):
6868
mi = MultiIndex.from_arrays([[], []], names=["first", "second"])
6969
result = mi.unique(level=level)
7070
expected = mi.get_level_values(level)
71+
tm.assert_index_equal(result, expected)
7172

7273

7374
@pytest.mark.parametrize("dropna", [True, False])

pandas/tests/indexes/multi/test_integrity.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def test_dims():
137137
pass
138138

139139

140-
def take_invalid_kwargs():
140+
def test_take_invalid_kwargs():
141141
vals = [["A", "B"], [pd.Timestamp("2011-01-01"), pd.Timestamp("2011-01-02")]]
142142
idx = MultiIndex.from_product(vals, names=["str", "dt"])
143143
indices = [1, 2]

0 commit comments

Comments
 (0)