Code review

Author: crusaderky

array_api_strict/tests/test_array_object.py

@@ -412,10 +412,12 @@ def _matmul_array_vals():
 
 
 @pytest.mark.parametrize("op,dtypes", binary_op_dtypes.items())
-def test_binary_operators_vs_numpy_generics(op, dtypes):
-    """Test that np.bool_, np.int64, np.float32, np.float64, np.complex64, np.complex128
-    are disallowed in binary operators.
-    np.float64 and np.complex128 are subclasses of float and complex, so they need
+def test_binary_operators_numpy_scalars(op, dtypes):
+    """
+    Test that NumPy scalars (np.generic) are explicitly disallowed.
+
+    This must notably include np.float64 and np.complex128, which are
+    subclasses of float and complex respectively, so they need
     special treatment in order to be rejected.
     """
     match = "Expected Array or Python scalar"

array_api_strict/tests/test_elementwise_functions.py

@@ -181,12 +181,13 @@ def test_elementwise_function_device_mismatch(func_name):
 
 
 @pytest.mark.parametrize("func_name", elementwise_function_input_types)
-def test_elementwise_function_vs_numpy_generics(func_name):
+def test_elementwise_function_numpy_scalars(func_name):
     """
-    Test that NumPy generics are explicitly disallowed.
+    Test that NumPy scalars (np.generic) are explicitly disallowed.
 
-    This must notably includes np.float64 and np.complex128, which are
-    subclasses of float and complex respectively.
+    This must notably include np.float64 and np.complex128, which are
+    subclasses of float and complex respectively, so they need
+    special treatment in order to be rejected.
     """
     func = getattr(_elementwise_functions, func_name)
     dtypes = elementwise_function_input_types[func_name]
@@ -203,6 +204,8 @@ def test_elementwise_function_vs_numpy_generics(func_name):
                 _ = func(a, a)
                 with pytest.raises(TypeError, match="neither Array nor Python scalars"):
                     func(a, b)
+                with pytest.raises(TypeError, match="neither Array nor Python scalars"):
+                    func(b, a)
             else:
                 _ = func(a)
                 with pytest.raises(TypeError, match="allowed"):

array_api_strict/tests/test_searching_functions.py

@@ -81,12 +81,13 @@ def test_where_device_mismatch(cond_device, x1_device, x2_device):
 
 
 @pytest.mark.parametrize("dtype", _all_dtypes)
-def test_where_numpy_generics(dtype):
+def test_where_numpy_scalars(dtype):
     """
-    Test that NumPy generics are explicitly disallowed.
+    Test that NumPy scalars (np.generic) are explicitly disallowed.
 
-    This must notably includes np.float64 and np.complex128, which are
-    subclasses of float and complex respectively.
+    This must notably include np.float64 and np.complex128, which are
+    subclasses of float and complex respectively, so they need
+    special treatment in order to be rejected.
     """
     cond = xp.asarray(True)
     x1 = xp.asarray(1, dtype=dtype)