Restore test code shared with SparseSeries tests

Author: wesm

pandas/sparse/tests/test_sparse.py

@@ -34,7 +34,7 @@
 from pandas.sparse.tests.test_array import assert_sp_array_equal
 
 import pandas.tests.test_panel as test_panel
-import pandas.tests.test_series as test_series
+from pandas.tests.series.test_misc_api import SharedWithSparse
 
 dec = np.testing.dec
 
@@ -116,7 +116,7 @@ def assert_sp_panel_equal(left, right, exact_indices=True):
         assert (item in left)
 
 
-class TestSparseSeries(tm.TestCase, test_series.CheckNameIntegration):
+class TestSparseSeries(tm.TestCase, SharedWithSparse):
     _multiprocess_can_split_ = True
 
     def setUp(self):

pandas/tests/series/test_analytics.py

@@ -1615,14 +1615,6 @@ def test_is_unique(self):
         s = Series(np.arange(1000))
         self.assertTrue(s.is_unique)
 
-    def test_argsort_preserve_name(self):
-        result = self.ts.argsort()
-        self.assertEqual(result.name, self.ts.name)
-
-    def test_sort_index_name(self):
-        result = self.ts.sort_index(ascending=False)
-        self.assertEqual(result.name, self.ts.name)
-
     def test_sort_values(self):
 
         ts = self.ts.copy()

pandas/tests/series/test_combine_concat.py

@@ -183,10 +183,6 @@ def test_concat_empty_series_dtypes(self):
         self.assertEqual(result.dtype, np.object_)
         self.assertEqual(result.ftype, 'object:dense')
 
-    def test_combine_first_name(self):
-        result = self.ts.combine_first(self.ts[:5])
-        self.assertEqual(result.name, self.ts.name)
-
     def test_combine_first_dt64(self):
         from pandas.tseries.tools import to_datetime
         s0 = to_datetime(Series(["2010", np.NaN]))
@@ -200,7 +196,3 @@ def test_combine_first_dt64(self):
         rs = s0.combine_first(s1)
         xp = Series([datetime(2010, 1, 1), '2011'])
         assert_series_equal(rs, xp)
-
-    def test_append_preserve_name(self):
-        result = self.ts[:5].append(self.ts[5:])
-        self.assertEqual(result.name, self.ts.name)

pandas/tests/series/test_indexing.py

@@ -111,16 +111,6 @@ def f():
         assert_series_equal(s, Series(dtype='int64', index=Index(
             [], dtype='object')))
 
-    def test_getitem_preserve_name(self):
-        result = self.ts[self.ts > 0]
-        self.assertEqual(result.name, self.ts.name)
-
-        result = self.ts[[0, 2, 4]]
-        self.assertEqual(result.name, self.ts.name)
-
-        result = self.ts[5:10]
-        self.assertEqual(result.name, self.ts.name)
-
     def test_getitem_setitem_ellipsis(self):
         s = Series(np.random.randn(10))
 

pandas/tests/series/test_io.py

@@ -20,19 +20,6 @@ class TestSeriesIO(TestData, tm.TestCase):
 
     _multiprocess_can_split_ = True
 
-    def test_pickle(self):
-        unp_series = self._pickle_roundtrip(self.series)
-        unp_ts = self._pickle_roundtrip(self.ts)
-        assert_series_equal(unp_series, self.series)
-        assert_series_equal(unp_ts, self.ts)
-
-    def _pickle_roundtrip(self, obj):
-
-        with ensure_clean() as path:
-            obj.to_pickle(path)
-            unpickled = pd.read_pickle(path)
-            return unpickled
-
     def test_from_csv(self):
 
         with ensure_clean() as path:

pandas/tests/series/test_misc_api.py

@@ -10,13 +10,113 @@
 
 from pandas.compat import range
 from pandas import compat
-from pandas.util.testing import assert_series_equal
+from pandas.util.testing import (assert_series_equal,
+                                 ensure_clean)
 import pandas.util.testing as tm
 
 from .common import TestData
 
 
-class TestSeriesMisc(TestData, tm.TestCase):
+class SharedWithSparse(object):
+
+    def test_scalarop_preserve_name(self):
+        result = self.ts * 2
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_copy_name(self):
+        result = self.ts.copy()
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_copy_index_name_checking(self):
+        # don't want to be able to modify the index stored elsewhere after
+        # making a copy
+
+        self.ts.index.name = None
+        self.assertIsNone(self.ts.index.name)
+        self.assertIs(self.ts, self.ts)
+
+        cp = self.ts.copy()
+        cp.index.name = 'foo'
+        com.pprint_thing(self.ts.index.name)
+        self.assertIsNone(self.ts.index.name)
+
+    def test_append_preserve_name(self):
+        result = self.ts[:5].append(self.ts[5:])
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_binop_maybe_preserve_name(self):
+        # names match, preserve
+        result = self.ts * self.ts
+        self.assertEqual(result.name, self.ts.name)
+        result = self.ts.mul(self.ts)
+        self.assertEqual(result.name, self.ts.name)
+
+        result = self.ts * self.ts[:-2]
+        self.assertEqual(result.name, self.ts.name)
+
+        # names don't match, don't preserve
+        cp = self.ts.copy()
+        cp.name = 'something else'
+        result = self.ts + cp
+        self.assertIsNone(result.name)
+        result = self.ts.add(cp)
+        self.assertIsNone(result.name)
+
+        ops = ['add', 'sub', 'mul', 'div', 'truediv', 'floordiv', 'mod', 'pow']
+        ops = ops + ['r' + op for op in ops]
+        for op in ops:
+            # names match, preserve
+            s = self.ts.copy()
+            result = getattr(s, op)(s)
+            self.assertEqual(result.name, self.ts.name)
+
+            # names don't match, don't preserve
+            cp = self.ts.copy()
+            cp.name = 'changed'
+            result = getattr(s, op)(cp)
+            self.assertIsNone(result.name)
+
+    def test_combine_first_name(self):
+        result = self.ts.combine_first(self.ts[:5])
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_getitem_preserve_name(self):
+        result = self.ts[self.ts > 0]
+        self.assertEqual(result.name, self.ts.name)
+
+        result = self.ts[[0, 2, 4]]
+        self.assertEqual(result.name, self.ts.name)
+
+        result = self.ts[5:10]
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_pickle(self):
+        unp_series = self._pickle_roundtrip(self.series)
+        unp_ts = self._pickle_roundtrip(self.ts)
+        assert_series_equal(unp_series, self.series)
+        assert_series_equal(unp_ts, self.ts)
+
+    def _pickle_roundtrip(self, obj):
+
+        with ensure_clean() as path:
+            obj.to_pickle(path)
+            unpickled = pd.read_pickle(path)
+            return unpickled
+
+    def test_argsort_preserve_name(self):
+        result = self.ts.argsort()
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_sort_index_name(self):
+        result = self.ts.sort_index(ascending=False)
+        self.assertEqual(result.name, self.ts.name)
+
+    def test_to_sparse_pass_name(self):
+        result = self.ts.to_sparse()
+        self.assertEqual(result.name, self.ts.name)
+
+
+class TestSeriesMisc(TestData, SharedWithSparse, tm.TestCase):
 
     _multiprocess_can_split_ = True
 
@@ -144,27 +244,6 @@ def test_numpy_unique(self):
         # it works!
         np.unique(self.ts)
 
-    def test_copy_name(self):
-        result = self.ts.copy()
-        self.assertEqual(result.name, self.ts.name)
-
-    def test_copy_index_name_checking(self):
-        # don't want to be able to modify the index stored elsewhere after
-        # making a copy
-
-        self.ts.index.name = None
-        self.assertIsNone(self.ts.index.name)
-        self.assertIs(self.ts, self.ts)
-
-        cp = self.ts.copy()
-        cp.index.name = 'foo'
-        com.pprint_thing(self.ts.index.name)
-        self.assertIsNone(self.ts.index.name)
-
-    def test_to_sparse_pass_name(self):
-        result = self.ts.to_sparse()
-        self.assertEqual(result.name, self.ts.name)
-
     def test_ndarray_compat(self):
 
         # test numpy compat with Series as sub-class of NDFrame

pandas/tests/series/test_operators.py

@@ -28,38 +28,6 @@ class TestSeriesOperators(TestData, tm.TestCase):
 
     _multiprocess_can_split_ = True
 
-    def test_binop_maybe_preserve_name(self):
-        # names match, preserve
-        result = self.ts * self.ts
-        self.assertEqual(result.name, self.ts.name)
-        result = self.ts.mul(self.ts)
-        self.assertEqual(result.name, self.ts.name)
-
-        result = self.ts * self.ts[:-2]
-        self.assertEqual(result.name, self.ts.name)
-
-        # names don't match, don't preserve
-        cp = self.ts.copy()
-        cp.name = 'something else'
-        result = self.ts + cp
-        self.assertIsNone(result.name)
-        result = self.ts.add(cp)
-        self.assertIsNone(result.name)
-
-        ops = ['add', 'sub', 'mul', 'div', 'truediv', 'floordiv', 'mod', 'pow']
-        ops = ops + ['r' + op for op in ops]
-        for op in ops:
-            # names match, preserve
-            s = self.ts.copy()
-            result = getattr(s, op)(s)
-            self.assertEqual(result.name, self.ts.name)
-
-            # names don't match, don't preserve
-            cp = self.ts.copy()
-            cp.name = 'changed'
-            result = getattr(s, op)(cp)
-            self.assertIsNone(result.name)
-
     def test_comparisons(self):
         left = np.random.randn(10)
         right = np.random.randn(10)
@@ -1407,7 +1375,3 @@ def test_datetime64_with_index(self):
         df['expected'] = df['date'] - df.index.to_series()
         df['result'] = df['date'] - df.index
         assert_series_equal(df['result'], df['expected'], check_names=False)
-
-    def test_scalarop_preserve_name(self):
-        result = self.ts * 2
-        self.assertEqual(result.name, self.ts.name)