Update and add more test scenaio

Author: antonwolfy

dpnp/tests/test_manipulation.py

@@ -1378,6 +1378,20 @@ def test_basic(self, dtype):
         expected = numpy.trim_zeros(a)
         assert_array_equal(result, expected)
 
+    @testing.with_requires("numpy>=2.2")
+    @pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
+    @pytest.mark.parametrize("trim", ["F", "B", "fb"])
+    @pytest.mark.parametrize("ndim", [0, 1, 2, 3])
+    def test_basic_nd(self, dtype, trim, ndim):
+        a = numpy.ones((2,) * ndim, dtype=dtype)
+        a = numpy.pad(a, (2, 1), mode="constant", constant_values=0)
+        ia = dpnp.array(a)
+
+        for axis in list(range(ndim)) + [None]:
+            result = dpnp.trim_zeros(ia, trim=trim, axis=axis)
+            expected = numpy.trim_zeros(a, trim=trim, axis=axis)
+            assert_array_equal(result, expected)
+
     @pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
     @pytest.mark.parametrize("trim", ["F", "B"])
     def test_trim(self, dtype, trim):
@@ -1398,6 +1412,19 @@ def test_all_zero(self, dtype, trim):
         expected = numpy.trim_zeros(a, trim)
         assert_array_equal(result, expected)
 
+    @testing.with_requires("numpy>=2.2")
+    @pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
+    @pytest.mark.parametrize("trim", ["F", "B", "fb"])
+    @pytest.mark.parametrize("ndim", [0, 1, 2, 3])
+    def test_all_zero_nd(self, dtype, trim, ndim):
+        a = numpy.zeros((3,) * ndim, dtype=dtype)
+        ia = dpnp.array(a)
+
+        for axis in list(range(ndim)) + [None]:
+            result = dpnp.trim_zeros(ia, trim=trim, axis=axis)
+            expected = numpy.trim_zeros(a, trim=trim, axis=axis)
+            assert_array_equal(result, expected)
+
     def test_size_zero(self):
         a = numpy.zeros(0)
         ia = dpnp.array(a)
@@ -1416,17 +1443,11 @@ def test_overflow(self, a):
         expected = numpy.trim_zeros(a)
         assert_array_equal(result, expected)
 
-    # TODO: modify once SAT-7616
-    # numpy 2.2 validates trim rules
-    @testing.with_requires("numpy<2.2")
-    def test_trim_no_rule(self):
-        a = numpy.array([0, 0, 1, 0, 2, 3, 4, 0])
-        ia = dpnp.array(a)
-        trim = "ADE"  # no "F" or "B" in trim string
-
-        result = dpnp.trim_zeros(ia, trim)
-        expected = numpy.trim_zeros(a, trim)
-        assert_array_equal(result, expected)
+    @testing.with_requires("numpy>=2.2")
+    @pytest.mark.parametrize("xp", [numpy, dpnp])
+    def test_trim_no_fb_in_rule(self, xp):
+        a = xp.array([0, 0, 1, 0, 2, 3, 4, 0])
+        assert_raises(ValueError, xp.trim_zeros, a, "ADE")
 
     def test_list_array(self):
         assert_raises(TypeError, dpnp.trim_zeros, [0, 0, 1, 0, 2, 3, 4, 0])