waltsims#460: improved coverage and changed ValueError to TypeError

kwave/utils/kwave_array.py

@@ -106,7 +106,7 @@ def is_close(self, other: "Element", rtol=1e-05, atol=1e-08, equal_nan=False):
         :return: bool
         """
         if not isinstance(other, type(self)):
-            raise ValueError(f"{other} is not instance of type Element")
+            raise TypeError(f"{other} with {type(other)} is not of type Element")
 
         for field in fields(self):
             self_attr = getattr(self, field.name)
@@ -128,7 +128,7 @@ def __eq__(self, other):
         :return: bool
         """
         if not isinstance(other, type(self)):
-            raise ValueError(f"{other} is not instance of type Element")
+            raise TypeError(f"{other} with {type(other)} is not of type Element")
 
         for field in fields(self):
             self_attr = getattr(self, field.name)

tests/matlab_test_data_collectors/python_testers/kWaveArray_test.py

@@ -15,12 +15,18 @@ def test_element():
     element1 = Element(group_id=0, type="rect", dim=2, active=True, measure=1, position=[1, 1, 1])
     # element2 has a very similar position to element 1 but with a small numerical difference
     element2 = Element(group_id=0, type="rect", dim=2, active=True, measure=1, position=[1, 1, 1.000001])
-    element3 = "not an element"
+    # element3 is a completely different element
+    element3 = Element(group_id=1, type="rect", dim=2, active=True, measure=2, position=[2, 2, 2])
+    # element 4 is not an element
+    element4 = "not an element"
+
     assert element1 != element2
     assert element1.is_close(element2)
-    with pytest.raises(Exception):
-        element1 != element3
-        element1.is_close(element3)
+    assert element1 != element3
+    assert not element1.is_close(element3)
+    with pytest.raises(TypeError):
+        element1 != element4
+        element1.is_close(element4)
 
 
 def test_kwave_array():