removing usage of Ops mixin in tests/indexes

Author: SaturnFromTitan

pandas/conftest.py

@@ -841,6 +841,16 @@ def tick_classes(request):
     )
 
 
+@pytest.fixture
+def datetime_series():
+    """
+    Fixture for Series of floats with DatetimeIndex
+    """
+    s = tm.makeTimeSeries()
+    s.name = "ts"
+    return s
+
+
 @pytest.fixture
 def float_frame():
     """

pandas/tests/indexes/datetimes/test_ops.py

@@ -16,35 +16,39 @@
     bdate_range,
     date_range,
 )
-from pandas.tests.base.test_ops import Ops
+from pandas.tests.base.utils import (
+    check_ops_properties_invalid,
+    check_ops_properties_valid,
+)
 import pandas.util.testing as tm
 
 from pandas.tseries.offsets import BDay, BMonthEnd, CDay, Day, Hour
 
 START, END = datetime(2009, 1, 1), datetime(2010, 1, 1)
 
 
-class TestDatetimeIndexOps(Ops):
-    def setup_method(self, method):
-        super().setup_method(method)
-        mask = lambda x: (isinstance(x, DatetimeIndex) or isinstance(x, PeriodIndex))
-        self.is_valid_objs = [o for o in self.objs if mask(o)]
-        self.not_valid_objs = [o for o in self.objs if not mask(o)]
-
-    def test_ops_properties(self):
-        f = lambda x: isinstance(x, DatetimeIndex)
-        self.check_ops_properties(DatetimeIndex._field_ops, f)
-        self.check_ops_properties(DatetimeIndex._object_ops, f)
-        self.check_ops_properties(DatetimeIndex._bool_ops, f)
+class TestDatetimeIndexOps:
+    def test_ops_properties(self, index_or_series_obj):
+        obj = index_or_series_obj
+        is_valid = isinstance(obj, (DatetimeIndex, PeriodIndex))
+        if is_valid:
+            filter_ = lambda x: isinstance(x, DatetimeIndex)
+            check_ops_properties_valid(obj, DatetimeIndex._field_ops, filter_)
+            check_ops_properties_valid(obj, DatetimeIndex._object_ops, filter_)
+            check_ops_properties_valid(obj, DatetimeIndex._bool_ops, filter_)
+        else:
+            check_ops_properties_invalid(obj, DatetimeIndex._field_ops)
+            check_ops_properties_invalid(obj, DatetimeIndex._object_ops)
+            check_ops_properties_invalid(obj, DatetimeIndex._bool_ops)
 
-    def test_ops_properties_basic(self):
+    def test_ops_properties_basic(self, datetime_series):
 
         # sanity check that the behavior didn't change
         # GH#7206
         msg = "'Series' object has no attribute '{}'"
         for op in ["year", "day", "second", "weekday"]:
             with pytest.raises(AttributeError, match=msg.format(op)):
-                getattr(self.dt_series, op)
+                getattr(datetime_series, op)
 
         # attribute access should still work!
         s = Series(dict(year=2000, month=1, day=10))

pandas/tests/indexes/period/test_ops.py

@@ -4,22 +4,26 @@
 import pandas as pd
 from pandas import DatetimeIndex, Index, NaT, PeriodIndex, Series
 from pandas.core.arrays import PeriodArray
-from pandas.tests.base.test_ops import Ops
+from pandas.tests.base.utils import (
+    check_ops_properties_invalid,
+    check_ops_properties_valid,
+)
 import pandas.util.testing as tm
 
 
-class TestPeriodIndexOps(Ops):
-    def setup_method(self, method):
-        super().setup_method(method)
-        mask = lambda x: (isinstance(x, DatetimeIndex) or isinstance(x, PeriodIndex))
-        self.is_valid_objs = [o for o in self.objs if mask(o)]
-        self.not_valid_objs = [o for o in self.objs if not mask(o)]
-
-    def test_ops_properties(self):
-        f = lambda x: isinstance(x, PeriodIndex)
-        self.check_ops_properties(PeriodArray._field_ops, f)
-        self.check_ops_properties(PeriodArray._object_ops, f)
-        self.check_ops_properties(PeriodArray._bool_ops, f)
+class TestPeriodIndexOps:
+    def test_ops_properties(self, index_or_series_obj):
+        obj = index_or_series_obj
+        is_valid = isinstance(obj, (DatetimeIndex, PeriodIndex))
+        if is_valid:
+            filter_ = lambda x: isinstance(x, PeriodIndex)
+            check_ops_properties_valid(obj, PeriodArray._field_ops, filter_)
+            check_ops_properties_valid(obj, PeriodArray._object_ops, filter_)
+            check_ops_properties_valid(obj, PeriodArray._bool_ops, filter_)
+        else:
+            check_ops_properties_invalid(obj, PeriodArray._field_ops)
+            check_ops_properties_invalid(obj, PeriodArray._object_ops)
+            check_ops_properties_invalid(obj, PeriodArray._bool_ops)
 
     def test_resolution(self):
         for freq, expected in zip(

pandas/tests/indexes/timedeltas/test_ops.py

@@ -7,23 +7,20 @@
 
 import pandas as pd
 from pandas import Series, TimedeltaIndex, timedelta_range
-from pandas.tests.base.test_ops import Ops
+from pandas.tests.base.utils import check_ops_properties_valid
 import pandas.util.testing as tm
 
 from pandas.tseries.offsets import Day, Hour
 
 
-class TestTimedeltaIndexOps(Ops):
-    def setup_method(self, method):
-        super().setup_method(method)
-        mask = lambda x: isinstance(x, TimedeltaIndex)
-        self.is_valid_objs = [o for o in self.objs if mask(o)]
-        self.not_valid_objs = []
-
-    def test_ops_properties(self):
-        f = lambda x: isinstance(x, TimedeltaIndex)
-        self.check_ops_properties(TimedeltaIndex._field_ops, f)
-        self.check_ops_properties(TimedeltaIndex._object_ops, f)
+class TestTimedeltaIndexOps:
+    def test_ops_properties(self, index_or_series_obj):
+        obj = index_or_series_obj
+        is_valid = isinstance(obj, TimedeltaIndex)
+        if is_valid:
+            filter_ = lambda x: isinstance(x, TimedeltaIndex)
+            check_ops_properties_valid(obj, TimedeltaIndex._field_ops, filter_)
+            check_ops_properties_valid(obj, TimedeltaIndex._object_ops, filter_)
 
     def test_value_counts_unique(self):
         # GH 7735

pandas/tests/series/conftest.py

@@ -3,16 +3,6 @@
 import pandas.util.testing as tm
 
 
-@pytest.fixture
-def datetime_series():
-    """
-    Fixture for Series of floats with DatetimeIndex
-    """
-    s = tm.makeTimeSeries()
-    s.name = "ts"
-    return s
-
-
 @pytest.fixture
 def string_series():
     """