From 9dfd2a7cb0ef0d779b7fd58cfb259cc626809258 Mon Sep 17 00:00:00 2001 From: Paul McCarthy <pauldmccarthy@gmail.com> Date: Mon, 24 Jun 2019 17:48:38 +0930 Subject: [PATCH] TEST: Regression test for gifti bug, fix error in image test --- tests/test_gifti.py | 14 +++++++++++--- tests/test_image.py | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/test_gifti.py b/tests/test_gifti.py index 7a8ff6175..683863a8c 100644 --- a/tests/test_gifti.py +++ b/tests/test_gifti.py @@ -288,12 +288,18 @@ def test_GiftiMesh_multiple_vertices(): verts1 = TEST_VERT_ARRAY verts2 = nib.gifti.GiftiDataArray( TEST_VERTS * 5, intent='NIFTI_INTENT_POINTSET') + verts3 = nib.gifti.GiftiDataArray( + TEST_VERTS * 10, intent='NIFTI_INTENT_POINTSET') gimg = nib.gifti.GiftiImage(darrays=[verts1, verts2, tris]) + gimg2 = nib.gifti.GiftiImage(darrays=[verts3]) with tempdir(): - fname = op.abspath('test.gii') - gimg.to_filename(fname) + fname = op.abspath('test.gii') + fname2 = op.abspath('test2.gii') + gimg .to_filename(fname) + gimg2.to_filename(fname2) + surf = gifti.GiftiMesh(fname) expvsets = [fname, @@ -304,9 +310,11 @@ def test_GiftiMesh_multiple_vertices(): assert surf.vertexSets() == expvsets surf.vertices = expvsets[1] - assert np.all(surf.vertices == TEST_VERTS * 5) + surf.loadVertices(fname2, select=True) + assert np.all(surf.vertices == TEST_VERTS * 10) + def test_GiftiMesh_needsFixing(): from . import test_mesh diff --git a/tests/test_image.py b/tests/test_image.py index 9d82f2f46..5b1ba4c7f 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -306,7 +306,7 @@ def _test_Image_atts(imgtype): assert tuple(i.nibImage.shape) == tuple(dims) assert tuple(i.nibImage.header.get_zooms()) == tuple(pixdims) - asert i.nvals == 1 + assert i.nvals == 1 assert i.ndim == expndims assert i.dtype == dtype assert i.name == op.basename(path) -- GitLab