TEST improve error catching

Author: htwangtw

nibabel/arrayops.py

@@ -3,15 +3,13 @@
 import numpy as np
 
 from .orientations import aff2axcodes
-
-
-support_np_type = (
-    np.int8,
-    np.int64,
-    np.float16,
-    np.float32,
-    np.float64,
-    np.complex128)
+# support_np_type = (
+#     np.int8,
+#     np.int64,
+#     np.float16,
+#     np.float32,
+#     np.float64,
+#     np.complex128)
 
 
 class OperableImage:
@@ -47,7 +45,7 @@ def _unop(self, *, op):
         op :
             Python operator.
         """
-        _type_check(self)
+        # _type_check(self)
         if op.__name__ in ["pos", "neg", "abs"]:
             dataobj = op(np.asanyarray(self.dataobj))
         return self.__class__(dataobj, self.affine, self.header)
@@ -85,18 +83,19 @@ def __abs__(self):
 
 def _input_validation(self, val):
     """Check images orientation, affine, and shape muti-images operation."""
-    _type_check(self)
+    # _type_check(self)
     if isinstance(val, self.__class__):
-        _type_check(val)
+        # _type_check(val)
         # Check orientations are the same
         if aff2axcodes(self.affine) != aff2axcodes(val.affine):
             raise ValueError("Two images should have the same orientation")
         # Check affine
-        if (self.affine != val.affine).all():
+        if (self.affine != val.affine).any():
             raise ValueError("Two images should have the same affine.")
+
         # Check shape.
         if self.shape[:3] != val.shape[:3]:
-            raise ValueError("Two images should have the same shape except"
+            raise ValueError("Two images should have the same shape except "
                              "the time dimension.")
 
         # if 4th dim exist in a image,
@@ -122,10 +121,10 @@ def _input_validation(self, val):
         return self_, val_
 
 
-def _type_check(*args):
-    """Ensure image contains correct nifti data type."""
-    # Check types
-    dtypes = [img.get_data_dtype().type for img in args]
-    # check allowed dtype based on the operator
-    if set(support_np_type).union(dtypes) == 0:
-        raise ValueError("Image contains illegal datatype for Nifti1Image.")
+# def _type_check(*args):
+#     """Ensure image contains correct nifti data type."""
+#     # Check types
+#     dtypes = [img.get_data_dtype().type for img in args]
+#     # check allowed dtype based on the operator
+#     if set(support_np_type).union(dtypes) == 0:
+#         raise ValueError("Image contains illegal datatype for Nifti1Image.")

nibabel/tests/test_arrayops.py

@@ -51,16 +51,44 @@ def test_binary_operations_4d():
     img1 = Nifti1Image(data1, np.eye(4))
     img2 = Nifti1Image(data2, np.eye(4))
     data2_ = np.reshape(data2, (5, 5, 2, 1))
+
     output = img1 * img2
     assert_array_equal(output.dataobj, data1 * data2_)
 
 
 def test_unary_operations():
-    data = np.random.rand(5, 5, 2)
+    data = np.random.rand(5, 5, 2) - 0.5
     img = Nifti1Image(data, np.eye(4))
 
+    output = +img
+    assert_array_equal(output.dataobj, +data)
+
     output = -img
     assert_array_equal(output.dataobj, -data)
 
     output = abs(img)
     assert_array_equal(output.dataobj, abs(data))
+
+
+def test_error_catching():
+    data1 = np.random.rand(5, 5, 1)
+    data2 = np.random.rand(5, 5, 2)
+    img1 = Nifti1Image(data1, np.eye(4))
+    img2 = Nifti1Image(data2, np.eye(4))
+    with pytest.raises(ValueError, match=r'should have the same shape'):
+        img1 + img2
+
+    data1 = np.random.rand(5, 5, 2)
+    data2 = np.random.rand(5, 5, 2)
+    img1 = Nifti1Image(data1, np.eye(4) * 2)
+    img2 = Nifti1Image(data2, np.eye(4))
+    with pytest.raises(ValueError, match=r'should have the same affine'):
+        img1 + img2
+
+    data = np.random.rand(5, 5, 2)
+    aff1 = [[0,1,0,10],[-1,0,0,20],[0,0,1,30],[0,0,0,1]]
+    aff2 = np.eye(4)
+    img1 = Nifti1Image(data, aff1)
+    img2 = Nifti1Image(data, aff2)
+    with pytest.raises(ValueError, match=r'should have the same orientation'):
+        img1 + img2