enh: reduce uncovered lines

Author: oesteban

nitransforms/linear.py

@@ -120,6 +120,10 @@ def __eq__(self, other):
         >>> xfm2 = Affine(xfm1.matrix)
         >>> xfm1 == xfm2
         True
+        >>> xfm1 == Affine()
+        False
+        >>> xfm1 == TransformBase()
+        False
 
         """
         if not hasattr(other, "matrix"):

nitransforms/manip.py

@@ -19,13 +19,13 @@
 )
 from nitransforms.io import itk, x5 as x5io
 from nitransforms.io.x5 import from_filename as load_x5
-from nitransforms.linear import (
+from nitransforms.linear import (  # noqa: F401
     Affine,
-    from_x5 as linear_from_x5,  # noqa: F401
+    from_x5 as linear_from_x5,
 )
-from nitransforms.nonlinear import (
+from nitransforms.nonlinear import (  # noqa: F401
     DenseFieldTransform,
-    from_x5 as nonlinear_from_x5,  # noqa: F401
+    from_x5 as nonlinear_from_x5,
 )
 
 
@@ -224,8 +224,9 @@ def from_filename(cls, filename, fmt="X5", reference=None, moving=None, x5_chain
                     raise TransformError("X5 file contains no TransformChain")
 
                 chain_path = chain_grp[str(x5_chain)][()]
-                if isinstance(chain_path, bytes):
-                    chain_path = chain_path.decode()
+                chain_path = (
+                    chain_path.decode() if isinstance(chain_path, bytes) else chain_path
+                )
 
             return TransformChain([xfm_list[int(idx)] for idx in chain_path.split("/")])
 

nitransforms/nonlinear.py

@@ -245,9 +245,13 @@ def __eq__(self, other):
         >>> xfm2 = DenseFieldTransform(test_dir / "someones_displacement_field.nii.gz")
         >>> xfm1 == xfm2
         True
+        >>> xfm1 == TransformBase()
+        False
+        >>> xfm1 == BSplineFieldTransform(test_dir / "someones_bspline_coefficients.nii.gz")
+        False
 
         """
-        if not hasattr(other, "_field"):
+        if not hasattr(other, "_field") or self._field.shape != other._field.shape:
             return False
 
         _eq = np.allclose(self._field, other._field)
@@ -335,13 +339,26 @@ def __eq__(self, other):
         >>> xfm2 = BSplineFieldTransform(test_dir / "someones_bspline_coefficients.nii.gz")
         >>> xfm1 == xfm2
         True
+        >>> xfm2._coeffs[:, :, :] = 0  # Let's zero all coefficients
+        >>> xfm1 == xfm2
+        False
+        >>> xfm2 = BSplineFieldTransform(
+        ...     test_dir / "someones_bspline_coefficients.nii.gz",
+        ...     order=4,
+        ... )
+        >>> xfm1 == xfm2
+        False
+        >>> xfm1 == TransformBase()
+        False
+        >>> xfm1 == DenseFieldTransform(test_dir / "someones_displacement_field.nii.gz")
+        False
 
         """
-        if not hasattr(other, "_coeffs"):
+        if not hasattr(other, "_coeffs") or self._coeffs.shape != other._coeffs.shape:
             return False
 
-        _eq = np.allclose(self._coeffs, other._coeffs)
-        _eq = _eq and self._order == other._order
+        _eq = self._order == other._order
+        _eq = _eq and np.allclose(self._coeffs, other._coeffs)
 
         if _eq and self._reference != other._reference:
             warnings.warn("Coefficients are equal, but references do not match.")

nitransforms/tests/test_manip.py

@@ -7,9 +7,11 @@
 import numpy as np
 import nibabel as nb
 import h5py
+from ..base import TransformError
 from ..manip import TransformChain
 from ..linear import Affine
 from ..nonlinear import DenseFieldTransform
+from ..io import x5
 
 FMT = {"lta": "fs", "tfm": "itk"}
 
@@ -45,18 +47,28 @@ def test_collapse_affines(tmp_path, data_path, ext0, ext1, ext2):
 def test_transformchain_x5_roundtrip(tmp_path):
     """Round-trip TransformChain with X5 storage."""
 
+    # Test empty transform file
+    x5.to_filename(tmp_path / "empty.x5", [])
+    with pytest.raises(TransformError):
+        TransformChain.from_filename(tmp_path / "empty.x5")
+
     mat = np.eye(4)
     mat[0, 3] = 1
     aff = Affine(mat)
 
+    # Test loading X5 with no transforms chains
+    x5.to_filename(tmp_path / "nochain.x5", [aff.to_x5()])
+    with pytest.raises(TransformError):
+        TransformChain.from_filename(tmp_path / "nochain.x5")
+
     field = nb.Nifti1Image(np.zeros((5, 5, 5, 3), dtype="float32"), np.eye(4))
     fdata = field.get_fdata()
     fdata[..., 1] = 1
     field = nb.Nifti1Image(fdata, np.eye(4))
     dfield = DenseFieldTransform(field, is_deltas=True)
 
+    # Create a chain
     chain = TransformChain([aff, aff, aff, dfield])
-
     fname = tmp_path / "chain.x5"
     chain.to_filename(fname)