convert more tests

pandas-dev · jreback · Jul 3, 2019 · Jun 30, 2019 · Jun 30, 2019 · Jun 30, 2019
commit 0c82f16818eaa74ff8663603ceb59d3495e66317
diff --git a/pandas/tests/groupby/test_apply.py b/pandas/tests/groupby/test_apply.py
@@ -179,10 +179,9 @@ def test_apply_with_mixed_dtype():
     # GH3480, apply with mixed dtype on axis=1 breaks in 0.11
     df = DataFrame({'foo1': np.random.randn(6),
                     'foo2': ['one', 'two', 'two', 'three', 'one', 'two']})
-    result = df.apply(lambda x: x, axis=1)
-    tm.assert_series_equal(Series(df._data.get_dtype_counts()),
-                           Series(result._data.get_dtype_counts())
-                           )
+    result = df.apply(lambda x: x, axis=1).dtypes
+    expected = df.dtypes
+    tm.assert_series_equal(result, expected)
 
     # GH 3610 incorrect dtype conversion with as_index=False
     df = DataFrame({"c1": [1, 2, 6, 6, 8]})

diff --git a/pandas/tests/series/test_arithmetic.py b/pandas/tests/series/test_arithmetic.py
@@ -122,21 +122,19 @@ def test_ser_flex_cmp_return_dtypes(self, opname):
         # GH#15115
         ser = Series([1, 3, 2], index=range(3))
         const = 2
-
-        result = Series(
-            getattr(ser, opname)(const)._data.get_dtype_counts()
-        )
-        tm.assert_series_equal(result, Series([1], ['bool']))
+        result = getattr(ser, opname)(const).dtypes
+        expected = np.dtype('bool')
+        assert result == expected
 
     @pytest.mark.parametrize('opname', ['eq', 'ne', 'gt', 'lt', 'ge', 'le'])
     def test_ser_flex_cmp_return_dtypes_empty(self, opname):
         # GH#15115 empty Series case
         ser = Series([1, 3, 2], index=range(3))
         empty = ser.iloc[:0]
         const = 2
-
-        result = Series(getattr(empty, opname)(const)._data.get_dtype_counts())
-        tm.assert_series_equal(result, Series([1], ['bool']))
+        result = getattr(empty, opname)(const).dtypes
+        expected = np.dtype('bool')
+        assert result == expected
 
     @pytest.mark.parametrize('op', [operator.eq, operator.ne,
                                     operator.le, operator.lt,

diff --git a/pandas/tests/sparse/frame/test_frame.py b/pandas/tests/sparse/frame/test_frame.py
@@ -901,7 +901,7 @@ def test_corr(self, float_frame):
 
     def test_describe(self, float_frame):
         float_frame['foo'] = np.nan
-        Series(float_frame._data.get_dtype_counts())
+        float_frame.dtypes.value_counts()
         str(float_frame)
         desc = float_frame.describe()  # noqa