improve coverage

Author: vtavana

dpnp/dpnp_iface_functional.py

@@ -338,9 +338,7 @@ def piecewise(x, condlist, funclist):
 
     """
     dpnp.check_supported_arrays_type(x)
-    if isinstance(condlist, tuple):
-        condlist = list(condlist)
-    elif isinstance(condlist, dpnp.ndarray) and condlist.ndim in [0, 1]:
+    if isinstance(condlist, dpnp.ndarray) and condlist.ndim in [0, 1]:
         condlist = [condlist]
     elif dpnp.isscalar(condlist) or (
         dpnp.isscalar(condlist[0]) and x.ndim != 0
@@ -352,7 +350,7 @@ def piecewise(x, condlist, funclist):
                 x.shape, condlist, usm_type=x.usm_type, sycl_queue=x.sycl_queue
             )
         ]
-    if not isinstance(condlist[0], (dpnp.ndarray)):
+    elif not isinstance(condlist[0], (dpnp.ndarray)):
         # convert list of lists to list of arrays
         # convert list of scalars to a list of 0d arrays (for 0d input)
         tmp = []

dpnp/tests/test_functional.py

@@ -136,7 +136,17 @@ def test_simple(self):
         result = dpnp.piecewise(ia, [dpnp.array([1, 0])], [1])
         assert_array_equal(result, expected)
 
-    def test_error(self):
+        # List of conditions: single bool tuple
+        expected = numpy.piecewise(a, ([True, False], [False, True]), [1, -4])
+        result = dpnp.piecewise(ia, ([True, False], [False, True]), [1, -4])
+        assert_array_equal(result, expected)
+
+        # Condition is single bool tuple
+        expected = numpy.piecewise(a, (True, False), [1])
+        result = dpnp.piecewise(ia, (True, False), [1])
+        assert_array_equal(result, expected)
+
+    def test_error_dpnp(self):
         ia = dpnp.array([0, 0])
         # values cannot be a callable function
         assert_raises_regex(
@@ -158,23 +168,45 @@ def test_error(self):
             [-1, lambda x: 1],
         )
 
+        # funclist is not array-like
+        assert_raises_regex(
+            TypeError,
+            "funclist must be a sequence of scalars",
+            dpnp.piecewise,
+            ia,
+            [dpnp.array([True, False])],
+            1,
+        )
+
+        assert_raises_regex(
+            TypeError,
+            "object of type",
+            numpy.piecewise,
+            ia.asnumpy(),
+            [numpy.array([True, False])],
+            1,
+        )
+
+    @pytest.mark.parametrize("xp", [dpnp, numpy])
+    def test_error(self, xp):
+        ia = xp.array([0, 0])
         # not enough functions
         assert_raises_regex(
             ValueError,
             "1 or 2 functions are expected",
-            dpnp.piecewise,
+            xp.piecewise,
             ia,
-            [dpnp.array([True, False])],
+            [xp.array([True, False])],
             [],
         )
 
         # extra function
         assert_raises_regex(
             ValueError,
             "1 or 2 functions are expected",
-            dpnp.piecewise,
+            xp.piecewise,
             ia,
-            [dpnp.array([True, False])],
+            [xp.array([True, False])],
             [1, 2, 3],
         )