Skip to content

Commit 896811a

Browse files
authored
CLN/TEST: clean setops tests (#42136)
1 parent 2aa306f commit 896811a

File tree

1 file changed

+8
-26
lines changed

1 file changed

+8
-26
lines changed

pandas/tests/indexes/test_setops.py

+8-26
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def test_intersection_base(self, index):
178178
return
179179

180180
# GH#10149
181-
cases = [klass(second.values) for klass in [np.array, Series, list]]
181+
cases = [second.to_numpy(), second.to_series(), second.to_list()]
182182
for case in cases:
183183
result = first.intersection(case)
184184
assert tm.equalContents(result, second)
@@ -201,15 +201,10 @@ def test_union_base(self, index):
201201
return
202202

203203
# GH#10149
204-
cases = [klass(second.values) for klass in [np.array, Series, list]]
204+
cases = [second.to_numpy(), second.to_series(), second.to_list()]
205205
for case in cases:
206-
if not isinstance(index, CategoricalIndex):
207-
result = first.union(case)
208-
assert tm.equalContents(result, everything), (
209-
result,
210-
everything,
211-
type(case),
212-
)
206+
result = first.union(case)
207+
assert tm.equalContents(result, everything)
213208

214209
if isinstance(index, MultiIndex):
215210
msg = "other must be a MultiIndex or a list of tuples"
@@ -227,16 +222,10 @@ def test_difference_base(self, sort, index):
227222
assert tm.equalContents(result, answer)
228223

229224
# GH#10149
230-
cases = [klass(second.values) for klass in [np.array, Series, list]]
225+
cases = [second.to_numpy(), second.to_series(), second.to_list()]
231226
for case in cases:
232-
if isinstance(index, (DatetimeIndex, TimedeltaIndex)):
233-
assert type(result) == type(answer)
234-
tm.assert_numpy_array_equal(
235-
result.sort_values().asi8, answer.sort_values().asi8
236-
)
237-
else:
238-
result = first.difference(case, sort)
239-
assert tm.equalContents(result, answer)
227+
result = first.difference(case, sort)
228+
assert tm.equalContents(result, answer)
240229

241230
if isinstance(index, MultiIndex):
242231
msg = "other must be a MultiIndex or a list of tuples"
@@ -260,16 +249,9 @@ def test_symmetric_difference(self, index):
260249
assert tm.equalContents(result, answer)
261250

262251
# GH#10149
263-
cases = [klass(second.values) for klass in [np.array, Series, list]]
252+
cases = [second.to_numpy(), second.to_series(), second.to_list()]
264253
for case in cases:
265254
result = first.symmetric_difference(case)
266-
267-
if is_datetime64tz_dtype(first):
268-
# second.values casts to tznaive
269-
expected = first.union(case)
270-
tm.assert_index_equal(result, expected)
271-
continue
272-
273255
assert tm.equalContents(result, answer)
274256

275257
if isinstance(index, MultiIndex):

0 commit comments

Comments
 (0)