TST: Parameterized on data parameter in sparse where tests

Author: Licht-T

pandas/tests/sparse/test_frame.py

@@ -1386,97 +1386,21 @@ def test_numpy_func_call(self):
         for func in funcs:
             getattr(np, func)(self.frame)
 
-    @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
-                              '(GH 17386)')
-    def test_where_with_int_data(self):
-        # GH 17386
-        data = [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]]
-        lower_bound = 2.5
-
-        sparse = SparseDataFrame(data)
-        result = sparse.where(sparse > lower_bound)
-
-        dense = DataFrame(data)
-        dense_expected = dense.where(dense > lower_bound)
-        sparse_expected = SparseDataFrame(dense_expected)
-
-        tm.assert_frame_equal(result, dense_expected)
-        tm.assert_sp_frame_equal(result, sparse_expected)
-
-    @pytest.mark.parametrize('other', [
-        True,
-        -100,
-        0.1,
-        100.0 + 100.0j
-    ])
-    @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
-                              '(GH 17386)')
-    def test_where_with_int_data_and_other(self, other):
-        # GH 17386
-        data = [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]]
-        lower_bound = 2.5
-
-        sparse = SparseDataFrame(data)
-        result = sparse.where(sparse > lower_bound, other)
-
-        dense = DataFrame(data)
-        dense_expected = dense.where(dense > lower_bound, other)
-        sparse_expected = SparseDataFrame(dense_expected,
-                                          default_fill_value=other)
-
-        tm.assert_frame_equal(result, dense_expected)
-        tm.assert_sp_frame_equal(result, sparse_expected)
-
-    @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
-                              '(GH 17386)')
-    def test_where_with_float_data(self):
-        # GH 17386
-        data = [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]]
-        lower_bound = 2.5
-
-        sparse = SparseDataFrame(data)
-        result = sparse.where(sparse > lower_bound)
-
-        dense = DataFrame(data)
-        dense_expected = dense.where(dense > lower_bound)
-        sparse_expected = SparseDataFrame(dense_expected)
-
-        tm.assert_frame_equal(result, dense_expected)
-        tm.assert_sp_frame_equal(result, sparse_expected)
-
-    @pytest.mark.parametrize('other', [
-        True,
-        0,
-        0.1,
-        100.0 + 100.0j
+    @pytest.mark.parametrize('data', [
+        [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]],
+        [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]],
+        [
+            [1.0, 1.0 + 1.0j],
+            [2.0 + 2.0j, 2.0],
+            [3.0, 3.0 + 3.0j],
+            [4.0 + 4.0j, 4.0],
+            [nan, nan]
+        ]
     ])
     @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
                               '(GH 17386)')
-    def test_where_with_float_data_and_other(self, other):
+    def test_where_with_numeric_data(self, data):
         # GH 17386
-        data = [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]]
-        lower_bound = 2.5
-
-        sparse = SparseDataFrame(data)
-        result = sparse.where(sparse > lower_bound, other)
-
-        dense = DataFrame(data)
-        dense_expected = dense.where(dense > lower_bound, other)
-        sparse_expected = SparseDataFrame(dense_expected,
-                                          default_fill_value=other)
-
-        tm.assert_frame_equal(result, dense_expected)
-        tm.assert_sp_frame_equal(result, sparse_expected)
-
-    @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
-                              '(GH 17386)')
-    def test_where_with_complex_data(self):
-        # GH 17386
-        data = [[1.0, 1.0 + 1.0j],
-                [2.0 + 2.0j, 2.0],
-                [3.0, 3.0 + 3.0j],
-                [4.0 + 4.0j, 4.0],
-                [nan, nan]]
         lower_bound = 1.5
 
         sparse = SparseDataFrame(data)
@@ -1489,21 +1413,27 @@ def test_where_with_complex_data(self):
         tm.assert_frame_equal(result, dense_expected)
         tm.assert_sp_frame_equal(result, sparse_expected)
 
+    @pytest.mark.parametrize('data', [
+        [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]],
+        [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]],
+        [
+            [1.0, 1.0 + 1.0j],
+            [2.0 + 2.0j, 2.0],
+            [3.0, 3.0 + 3.0j],
+            [4.0 + 4.0j, 4.0],
+            [nan, nan]
+        ]
+    ])
     @pytest.mark.parametrize('other', [
         True,
-        0,
+        -100,
         0.1,
         100.0 + 100.0j
     ])
     @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
                               '(GH 17386)')
-    def test_where_with_complex_data_and_other(self, other):
+    def test_where_with_numeric_data_and_other(self, data, other):
         # GH 17386
-        data = [[1.0, 1.0 + 1.0j],
-                [2.0 + 2.0j, 2.0],
-                [3.0, 3.0 + 3.0j],
-                [4.0 + 4.0j, 4.0],
-                [nan, nan]]
         lower_bound = 1.5
 
         sparse = SparseDataFrame(data)

pandas/tests/sparse/test_series.py

@@ -1384,97 +1384,21 @@ def test_numpy_func_call(self):
             for series in ('bseries', 'zbseries'):
                 getattr(np, func)(getattr(self, series))
 
-    @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
-                              '(GH 17386)')
-    def test_where_with_int_data(self):
-        # GH 17386
-        data = [1, 1, 2, 2, 3, 3, 4, 4, 0, 0]
-        lower_bound = 2.5
-
-        sparse = SparseSeries(data)
-        result = sparse.where(sparse > lower_bound)
-
-        dense = Series(data)
-        dense_expected = dense.where(dense > lower_bound)
-        sparse_expected = SparseSeries(dense_expected)
-
-        tm.assert_series_equal(result, dense_expected)
-        tm.assert_sp_series_equal(result, sparse_expected)
-
-    @pytest.mark.parametrize('other', [
-        True,
-        -100,
-        0.1,
-        100.0 + 100.0j
-    ])
-    @pytest.mark.skip(reason='Wrong SparseBlock initialization '
-                             '(Segfault) '
-                             '(GH 17386)')
-    def test_where_with_int_data_and_other(self, other):
-        # GH 17386
-        data = [1, 1, 2, 2, 3, 3, 4, 4, 0, 0]
-        lower_bound = 2.5
-
-        sparse = SparseSeries(data)
-        result = sparse.where(sparse > lower_bound, other)
-
-        dense = Series(data)
-        dense_expected = dense.where(dense > lower_bound, other)
-        sparse_expected = SparseSeries(dense_expected, fill_value=other)
-
-        tm.assert_series_equal(result, dense_expected)
-        tm.assert_sp_series_equal(result, sparse_expected)
-
-    @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
-                              '(GH 17386)')
-    def test_where_with_float_data(self):
-        # GH 17386
-        data = [1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, nan, nan]
-        lower_bound = 2.5
-
-        sparse = SparseSeries(data)
-        result = sparse.where(sparse > lower_bound)
-
-        dense = Series(data)
-        dense_expected = dense.where(dense > lower_bound)
-        sparse_expected = SparseSeries(dense_expected)
-
-        tm.assert_series_equal(result, dense_expected)
-        tm.assert_sp_series_equal(result, sparse_expected)
-
-    @pytest.mark.parametrize('other', [
-        True,
-        0,
-        0.1,
-        100.0 + 100.0j
+    @pytest.mark.parametrize('data', [
+        [1, 1, 2, 2, 3, 3, 4, 4, 0, 0],
+        [1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, nan, nan],
+        [
+            1.0, 1.0 + 1.0j,
+            2.0 + 2.0j, 2.0,
+            3.0, 3.0 + 3.0j,
+            4.0 + 4.0j, 4.0,
+            nan, nan
+        ]
     ])
-    @pytest.mark.skip(reason='Wrong SparseBlock initialization '
-                             '(Segfault) '
-                             '(GH 17386)')
-    def test_where_with_float_data_and_other(self, other):
-        # GH 17386
-        data = [1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, nan, nan]
-        lower_bound = 2.5
-
-        sparse = SparseSeries(data)
-        result = sparse.where(sparse > lower_bound, other)
-
-        dense = Series(data)
-        dense_expected = dense.where(dense > lower_bound, other)
-        sparse_expected = SparseSeries(dense_expected, fill_value=other)
-
-        tm.assert_series_equal(result, dense_expected)
-        tm.assert_sp_series_equal(result, sparse_expected)
-
     @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
                               '(GH 17386)')
-    def test_where_with_complex_data(self):
+    def test_where_with_numeric_data(self, data):
         # GH 17386
-        data = [1.0, 1.0 + 1.0j,
-                2.0 + 2.0j, 2.0,
-                3.0, 3.0 + 3.0j,
-                4.0 + 4.0j, 4.0,
-                nan, nan]
         lower_bound = 1.5
 
         sparse = SparseSeries(data)
@@ -1487,22 +1411,28 @@ def test_where_with_complex_data(self):
         tm.assert_series_equal(result, dense_expected)
         tm.assert_sp_series_equal(result, sparse_expected)
 
+    @pytest.mark.parametrize('data', [
+        [1, 1, 2, 2, 3, 3, 4, 4, 0, 0],
+        [1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, nan, nan],
+        [
+            1.0, 1.0 + 1.0j,
+            2.0 + 2.0j, 2.0,
+            3.0, 3.0 + 3.0j,
+            4.0 + 4.0j, 4.0,
+            nan, nan
+        ]
+    ])
     @pytest.mark.parametrize('other', [
         True,
-        0,
+        -100,
         0.1,
         100.0 + 100.0j
     ])
     @pytest.mark.skip(reason='Wrong SparseBlock initialization '
                              '(Segfault) '
                              '(GH 17386)')
-    def test_where_with_complex_data_and_other(self, other):
+    def test_where_with_numeric_data_and_other(self, data, other):
         # GH 17386
-        data = [1.0, 1.0 + 1.0j,
-                2.0 + 2.0j, 2.0,
-                3.0, 3.0 + 3.0j,
-                4.0 + 4.0j, 4.0,
-                nan, nan]
         lower_bound = 1.5
 
         sparse = SparseSeries(data)