TST: Parametrized other parameter on sparse where tests

Author: Licht-T

pandas/tests/sparse/test_frame.py

@@ -1403,69 +1403,17 @@ def test_where_with_int_data(self):
         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_int_other(self):
+    def test_where_with_int_data_and_other(self, other):
         # GH 17386
         data = [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]]
-        other = -100
-        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_int_data_and_float_other(self):
-        # GH 17386
-        data = [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]]
-        other = 0.1
-        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_int_data_and_complex_other(self):
-        # GH 17386
-        data = [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]]
-        other = 100.0 + 100.0j
-        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_int_data_and_bool_other(self):
-        # GH 17386
-        data = [[1, 1], [2, 2], [3, 3], [4, 4], [0, 0]]
-        other = True
         lower_bound = 2.5
 
         sparse = SparseDataFrame(data)
@@ -1496,69 +1444,17 @@ def test_where_with_float_data(self):
         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.xfail(reason='Wrong SparseBlock initialization '
                               '(GH 17386)')
-    def test_where_with_float_data_and_int_other(self):
-        # GH 17386
-        data = [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]]
-        other = 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_and_float_other(self):
-        # GH 17386
-        data = [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]]
-        other = 0.1
-        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_and_complex_other(self):
-        # GH 17386
-        data = [[1.0, 1.0], [2.0, 2.0], [3.0, 3.0], [4.0, 4.0], [nan, nan]]
-        other = 100.0 - 100j
-        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_and_bool_other(self):
+    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]]
-        other = True
         lower_bound = 2.5
 
         sparse = SparseDataFrame(data)
@@ -1593,39 +1489,21 @@ 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('other', [
+        True,
+        0,
+        0.1,
+        100.0 + 100.0j
+    ])
     @pytest.mark.xfail(reason='Wrong SparseBlock initialization '
                               '(GH 17386)')
-    def test_where_with_complex_data_and_int_other(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]]
-        other = 0
-        lower_bound = 1.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_and_float_other(self):
+    def test_where_with_complex_data_and_other(self, 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]]
-        other = 0.1
         lower_bound = 1.5
 
         sparse = SparseDataFrame(data)
@@ -1639,52 +1517,6 @@ def test_where_with_complex_data_and_float_other(self):
         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_and_complex_other(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]]
-        other = 100.0 - 100.0j
-        lower_bound = 1.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_and_bool_other(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]]
-        other = True
-        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_bool_data(self):
@@ -1702,31 +1534,17 @@ def test_where_with_bool_data(self):
         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.xfail(reason='Wrong SparseBlock initialization '
                               '(GH 17386)')
-    def test_where_with_bool_data_and_bool_other(self):
-        # GH 17386
-        data = [[False, False], [True, True], [False, False]]
-        other = True
-        cond = True
-
-        sparse = SparseDataFrame(data)
-        result = sparse.where(sparse == cond, other)
-
-        dense = DataFrame(data)
-        dense_expected = dense.where(dense == cond, 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_bool_data_and_complex_other(self):
+    def test_where_with_bool_data_and_other(self, other):
         # GH 17386
         data = [[False, False], [True, True], [False, False]]
-        other = 100.0 + 100.0j
         cond = True
 
         sparse = SparseDataFrame(data)