Change more tests

pandas-dev · jreback · Jul 3, 2019 · Jun 30, 2019 · Jun 30, 2019 · Jun 30, 2019
commit eb5213cb2e5845d30e171b70dc07e9fef7fbca81
diff --git a/pandas/tests/frame/test_api.py b/pandas/tests/frame/test_api.py
@@ -433,7 +433,6 @@ def test_with_datetimelikes(self):
                          'B': timedelta_range('1 day', periods=10)})
         t = df.T
 
-        #result = Series(t._data.get_dtype_counts())
         result = t.dtypes.value_counts()
         if self.klass is DataFrame:
             expected = Series({np.dtype('object'): 10})

diff --git a/pandas/tests/frame/test_reshape.py b/pandas/tests/frame/test_reshape.py
@@ -502,29 +502,41 @@ def test_unstack_dtypes(self):
                 [2, 2, 3, 4]]
 
         df = DataFrame(rows, columns=list('ABCD'))
-        result = Series(df._data.get_dtype_counts())
-        expected = Series({'int64': 4})
+        result = df.dtypes
+        expected = Series([np.dtype('int64')] * 4,
+                          index=list('ABCD'))
         assert_series_equal(result, expected)
 
         # single dtype
         df2 = df.set_index(['A', 'B'])
         df3 = df2.unstack('B')
-        result = Series(df3._data.get_dtype_counts())
-        expected = Series({'int64': 4})
+        result = df3.dtypes
+        expected = Series([np.dtype('int64')] * 4,
+                          index=pd.MultiIndex.from_arrays([
+                              ['C', 'C', 'D', 'D'],
+                              [1, 2, 1, 2]
+                          ], names=(None, 'B')))
         assert_series_equal(result, expected)
 
         # mixed
         df2 = df.set_index(['A', 'B'])
         df2['C'] = 3.
         df3 = df2.unstack('B')
-        result = Series(df3._data.get_dtype_counts())
-        expected = Series({'int64': 2, 'float64': 2})
+        result = df3.dtypes
+        expected = Series([np.dtype('float64')] * 2 + [np.dtype('int64')] * 2,
+                          index=pd.MultiIndex.from_arrays([
+                              ['C', 'C', 'D', 'D'],
+                              [1, 2, 1, 2]
+                          ], names=(None, 'B')))
         assert_series_equal(result, expected)
-
         df2['D'] = 'foo'
         df3 = df2.unstack('B')
-        result = Series(df3._data.get_dtype_counts())
-        expected = Series({'float64': 2, 'object': 2})
+        result = df3.dtypes
+        expected = Series([np.dtype('float64')] * 2 + [np.dtype('object')] * 2,
+                          index=pd.MultiIndex.from_arrays([
+                              ['C', 'C', 'D', 'D'],
+                              [1, 2, 1, 2]
+                          ], names=(None, 'B')))
         assert_series_equal(result, expected)
 
         # GH7405

diff --git a/pandas/tests/frame/test_timezones.py b/pandas/tests/frame/test_timezones.py
@@ -154,9 +154,14 @@ def test_frame_no_datetime64_dtype(self, tz):
                         'dr_tz': dr_tz,
                         'datetimes_naive': datetimes_naive,
                         'datetimes_with_tz': datetimes_with_tz})
-        result = Series(df._data.get_dtype_counts()).sort_index()
-        expected = Series({'datetime64[ns]': 2,
-                           str(tz_expected): 2}).sort_index()
+        result = df.dtypes
+        expected = Series([
+            np.dtype('datetime64[ns]'),
+            DatetimeTZDtype(tz=tz),
+            np.dtype('datetime64[ns]'),
+            DatetimeTZDtype(tz=tz)
+        ],
+            index=['dr', 'dr_tz', 'datetimes_naive', 'datetimes_with_tz'])
         tm.assert_series_equal(result, expected)
 
     @pytest.mark.parametrize('tz', ['US/Eastern', 'dateutil/US/Eastern'])