move tests

pandas-dev · jreback · Dec 28, 2018 · Dec 20, 2018 · Dec 20, 2018 · Dec 21, 2018
commit 2c615b07e2ecc45a74157820fb38947b0cf2933c
diff --git a/pandas/tests/frame/test_block_internals.py b/pandas/tests/frame/test_block_internals.py
@@ -12,6 +12,7 @@
 
 from pandas import (DataFrame, Series, Timestamp, date_range, compat,
                     option_context, Categorical)
+from pandas.core.internals.blocks import IntBlock
 from pandas.core.arrays import IntervalArray, integer_array
 from pandas.compat import StringIO
 import pandas as pd
@@ -579,3 +580,12 @@ def test_strange_column_corruption_issue(self):
         first = len(df.loc[pd.isna(df[myid]), [myid]])
         second = len(df.loc[pd.isna(df[myid]), [myid]])
         assert first == second == 0
+
+    def test_constructor_no_pandas_array(self):
+        # Ensure that PandasArray isn't allowed inside Series
+        # See https://github.com/pandas-dev/pandas/issues/23995 for more.
+        arr = pd.Series([1, 2, 3]).array
+        result = pd.DataFrame({"A": arr})
+        expected = pd.DataFrame({"A": [1, 2, 3]})
+        tm.assert_frame_equal(result, expected)
+        assert isinstance(result._data.blocks[0], IntBlock)
diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py
@@ -23,7 +23,6 @@
 import pandas as pd
 import pandas.util.testing as tm
 from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
-from pandas.core.internals.blocks import IntBlock
 
 from pandas.tests.frame.common import TestData
 
@@ -2166,15 +2165,6 @@ def test_constructor_range_dtype(self, dtype):
         result = DataFrame({'A': range(5)}, dtype=dtype)
         tm.assert_frame_equal(result, expected)
 
-    def test_constructor_no_numpy_backed_ea(self):
-        # Ensure that PandasArray isn't allowed inside Series
-        # See https://github.com/pandas-dev/pandas/issues/23995 for more.
-        arr = pd.Series([1, 2, 3]).array
-        result = pd.DataFrame({"A": arr})
-        expected = pd.DataFrame({"A": [1, 2, 3]})
-        tm.assert_frame_equal(result, expected)
-        assert isinstance(result._data.blocks[0], IntBlock)
-
     def test_frame_from_list_subclass(self):
         # GH21226
         class List(list):

diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py
@@ -258,7 +258,7 @@ def test_constructor_int_dtype_nan_raises(self, dtype):
         with pytest.raises(ValueError, match=msg):
             Index(data, dtype=dtype)
 
-    def test_constructor_no_numpy_backed_ea(self):
+    def test_constructor_no_pandas_array(self):
         ser = pd.Series([1, 2, 3])
         result = pd.Index(ser.array)
         expected = pd.Index([1, 2, 3])

diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py
@@ -22,7 +22,6 @@
     Timestamp, date_range, isna, period_range, timedelta_range)
 from pandas.api.types import CategoricalDtype
 from pandas.core.arrays import period_array
-from pandas.core.internals.blocks import IntBlock
 import pandas.util.testing as tm
 from pandas.util.testing import assert_series_equal
 
@@ -1239,9 +1238,3 @@ def test_constructor_tz_mixed_data(self):
         result = Series(dt_list)
         expected = Series(dt_list, dtype=object)
         tm.assert_series_equal(result, expected)
-
-    def test_constructor_no_numpy_backed_ea(self):
-        ser = pd.Series([1, 2, 3])
-        result = pd.Series(ser.array)
-        tm.assert_series_equal(ser, result)
-        assert isinstance(result._data.blocks[0], IntBlock)
diff --git a/pandas/tests/series/test_internals.py b/pandas/tests/series/test_internals.py
@@ -8,6 +8,7 @@
 
 import pandas as pd
 from pandas import NaT, Series, Timestamp
+from pandas.core.internals.blocks import IntBlock
 import pandas.util.testing as tm
 from pandas.util.testing import assert_series_equal
 
@@ -306,6 +307,12 @@ def test_convert_preserve_all_bool(self):
         e = Series([False, True, False, False], dtype=bool)
         tm.assert_series_equal(r, e)
 
+    def test_constructor_no_pandas_array(self):
+        ser = pd.Series([1, 2, 3])
+        result = pd.Series(ser.array)
+        tm.assert_series_equal(ser, result)
+        assert isinstance(result._data.blocks[0], IntBlock)
+
 
 def test_hasnans_unchached_for_series():
     # GH#19700