diff --git a/tests/test_callfsl.py b/tests/test_callfsl.py index e137160e46e341d0d9744aaafa3b8bdfe8e3885a..85176b2124e565a0ad13df3131ce75cd535eb55f 100644 --- a/tests/test_callfsl.py +++ b/tests/test_callfsl.py @@ -31,10 +31,10 @@ def setup_module(): # or 'fslinfo ...' def mock_check_output(args): if args[0].endswith('fslinfo'): - return 'info' + return 'info'.encode('utf-8') img = nib.load(args[-2]) - return str(img.get_data().mean()) + return str(img.get_data().mean()).encode('utf-8') def test_callfsl(): diff --git a/tests/test_transform.py b/tests/test_transform.py index e8b2d342210ce3be368b6b5bdc1af0b114330d2e..2913b5cb7626e395c9c66962b0c08c2054728adf 100644 --- a/tests/test_transform.py +++ b/tests/test_transform.py @@ -108,9 +108,11 @@ def test_scaleOffsetXform(): expected = [[float(v) for v in l.split()] for l in expected] expected = np.array(expected) - result = transform.scaleOffsetXform(scales, offsets) + result1 = transform.scaleOffsetXform( scales, offsets) + result2 = transform.scaleOffsetXform(tuple(scales), tuple(offsets)) - assert np.all(np.isclose(result, expected)) + assert np.all(np.isclose(result1, expected)) + assert np.all(np.isclose(result2, expected)) def test_compose_and_decompose(): @@ -138,6 +140,19 @@ def test_compose_and_decompose(): assert np.all(np.isclose(xform, result, atol=1e-5)) + # compose should also accept a rotation matrix + rots = [np.pi / 5, np.pi / 4, np.pi / 3] + rmat = transform.axisAnglesToRotMat(*rots) + xform = transform.compose([1, 1, 1], [0, 0, 0], rmat) + sc, of, rot = transform.decompose(xform) + sc = np.array(sc) + of = np.array(of) + rot = np.array(rot) + + assert np.all(sc == [1, 1, 1]) + assert np.all(of == [0, 0, 0]) + assert np.all(np.isclose(rot, rots)) + def test_axisBounds(): testfile = op.join(datadir, 'test_transform_test_axisBounds.txt')