Skip to content

Commit fe0f934

Browse files
authored
CLN: pandas-dev#62191 move new tests to the right place (pandas-dev#62720)
1 parent e95948f commit fe0f934

File tree

2 files changed

+60
-63
lines changed

2 files changed

+60
-63
lines changed

pandas/tests/series/methods/test_compare.py

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
from enum import (
2-
Enum,
3-
auto,
4-
)
5-
61
import numpy as np
72
import pytest
83

@@ -143,61 +138,3 @@ def test_compare_datetime64_and_string():
143138
tm.assert_series_equal(result_eq1, expected_eq)
144139
tm.assert_series_equal(result_eq2, expected_eq)
145140
tm.assert_series_equal(result_neq, expected_neq)
146-
147-
148-
def test_eq_objects():
149-
# GH#62191 Test eq with Enum and List elements
150-
151-
class Thing(Enum):
152-
FIRST = auto()
153-
SECOND = auto()
154-
155-
left = pd.Series([Thing.FIRST, Thing.SECOND])
156-
py_l = [Thing.FIRST, Thing.SECOND]
157-
158-
result = left.eq(Thing.FIRST)
159-
expected = pd.Series([True, False])
160-
tm.assert_series_equal(result, expected)
161-
162-
result = left.eq(py_l)
163-
expected = pd.Series([True, True])
164-
tm.assert_series_equal(result, expected)
165-
166-
result = left.eq(np.asarray(py_l))
167-
expected = pd.Series([True, True])
168-
tm.assert_series_equal(result, expected)
169-
170-
result = left.eq(pd.Series(py_l))
171-
expected = pd.Series([True, True])
172-
tm.assert_series_equal(result, expected)
173-
174-
result = pd.Series([[1, 2], [3, 4]]).eq([1, 2])
175-
expected = pd.Series([True, False])
176-
with pytest.raises(AssertionError):
177-
tm.assert_series_equal(result, expected)
178-
expected = pd.Series([False, False])
179-
tm.assert_series_equal(result, expected)
180-
181-
182-
def test_eq_with_index():
183-
# GH#62191 Test eq with non-trivial indices
184-
left = pd.Series([1, 2], index=[1, 0])
185-
py_l = [1, 2]
186-
187-
# assuming Python list has the same index as the Series
188-
result = left.eq(py_l)
189-
expected = pd.Series([True, True], index=[1, 0])
190-
tm.assert_series_equal(result, expected)
191-
192-
# assuming np.ndarray has the same index as the Series
193-
result = left.eq(np.asarray(py_l))
194-
expected = pd.Series([True, True], index=[1, 0])
195-
tm.assert_series_equal(result, expected)
196-
197-
result = left.eq(pd.Series(py_l))
198-
expected = pd.Series([False, False])
199-
tm.assert_series_equal(result, expected)
200-
201-
result = left.eq(pd.Series([2, 1]))
202-
expected = pd.Series([True, True])
203-
tm.assert_series_equal(result, expected)

pandas/tests/series/test_arithmetic.py

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
timezone,
55
)
66
from decimal import Decimal
7+
from enum import (
8+
Enum,
9+
auto,
10+
)
711
import operator
812

913
import numpy as np
@@ -444,6 +448,62 @@ def test_comparison_flex_alignment_fill(self, values, op, fill_value):
444448
expected = Series(values, index=list("abcd"))
445449
tm.assert_series_equal(result, expected)
446450

451+
def test_eq_objects(self) -> None:
452+
# GH#62191 Test eq with Enum and List elements
453+
454+
class Thing(Enum):
455+
FIRST = auto()
456+
SECOND = auto()
457+
458+
left = Series([Thing.FIRST, Thing.SECOND])
459+
py_l = [Thing.FIRST, Thing.SECOND]
460+
461+
result = left.eq(Thing.FIRST)
462+
expected = Series([True, False])
463+
tm.assert_series_equal(result, expected)
464+
465+
result = left.eq(py_l)
466+
expected = Series([True, True])
467+
tm.assert_series_equal(result, expected)
468+
469+
result = left.eq(np.asarray(py_l))
470+
expected = Series([True, True])
471+
tm.assert_series_equal(result, expected)
472+
473+
result = left.eq(Series(py_l))
474+
expected = Series([True, True])
475+
tm.assert_series_equal(result, expected)
476+
477+
result = Series([[1, 2], [3, 4]]).eq([1, 2])
478+
expected = Series([True, False])
479+
with pytest.raises(AssertionError):
480+
tm.assert_series_equal(result, expected)
481+
expected = Series([False, False])
482+
tm.assert_series_equal(result, expected)
483+
484+
def test_eq_with_index(self) -> None:
485+
# GH#62191 Test eq with non-trivial indices
486+
left = Series([1, 2], index=[1, 0])
487+
py_l = [1, 2]
488+
489+
# assuming Python list has the same index as the Series
490+
result = left.eq(py_l)
491+
expected = Series([True, True], index=[1, 0])
492+
tm.assert_series_equal(result, expected)
493+
494+
# assuming np.ndarray has the same index as the Series
495+
result = left.eq(np.asarray(py_l))
496+
expected = Series([True, True], index=[1, 0])
497+
tm.assert_series_equal(result, expected)
498+
499+
result = left.eq(Series(py_l))
500+
expected = Series([False, False])
501+
tm.assert_series_equal(result, expected)
502+
503+
result = left.eq(Series([2, 1]))
504+
expected = Series([True, True])
505+
tm.assert_series_equal(result, expected)
506+
447507

448508
class TestSeriesComparison:
449509
def test_comparison_different_length(self):

0 commit comments

Comments
 (0)