Skip to content

Commit 307a328

Browse files
author
Ben Cipollini
committed
Add tests, change print error to ValueError, test it
1 parent 8040f6d commit 307a328

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

nibabel/gifti/gifti.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def add_gifti_data_array(self, dataarr):
453453
if isinstance(dataarr, GiftiDataArray):
454454
self.darrays.append(dataarr)
455455
else:
456-
print("dataarr paramater must be of tzpe GiftiDataArray")
456+
raise ValueError("dataarr paramater must be of type GiftiDataArray")
457457

458458
def remove_gifti_data_array(self, ith):
459459
""" Removes the ith data array element from the GiftiImage """

nibabel/gifti/tests/test_gifti.py

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44

55
import numpy as np
66

7+
from nibabel.gifti import giftiio
8+
9+
from .test_giftiio import (DATA_FILE1, DATA_FILE2, DATA_FILE3, DATA_FILE4,
10+
DATA_FILE5, DATA_FILE6)
711
from ..gifti import (GiftiImage, GiftiDataArray, GiftiLabel, GiftiLabelTable,
812
GiftiMetaData)
913
from ...nifti1 import data_type_codes, intent_codes
10-
14+
from ...testing import clear_and_catch_warnings
1115
from numpy.testing import (assert_array_almost_equal,
1216
assert_array_equal)
1317
from nose.tools import (assert_true, assert_false, assert_equal, assert_raises)
14-
from ...testing import clear_and_catch_warnings
1518

1619

1720
def test_gifti_image():
@@ -127,3 +130,30 @@ def assign_rgba(gl, val):
127130
gl4 = GiftiLabel()
128131
assert_equal(len(gl4.rgba), 4)
129132
assert_true(np.all([elem is None for elem in gl4.rgba]))
133+
134+
135+
def test_print_summary():
136+
for fil in [DATA_FILE1, DATA_FILE2, DATA_FILE3, DATA_FILE4,
137+
DATA_FILE5, DATA_FILE6]:
138+
gimg = giftiio.read(fil)
139+
gimg.print_summary()
140+
141+
142+
def test_gifti_coord():
143+
from ..gifti import GiftiCoordSystem
144+
gcs = GiftiCoordSystem()
145+
assert_true(gcs.xform is not None)
146+
147+
# Smoke test
148+
gcs.xform = None
149+
gcs.print_summary()
150+
gcs.to_xml()
151+
152+
153+
def test_gifti_image():
154+
img = GiftiImage()
155+
assert_true(img.darrays is not None)
156+
assert_true(img.meta is not None)
157+
assert_true(img.labeltable is not None)
158+
159+
assert_raises(ValueError, img.add_gifti_data_array, 'not-a-data-array')

0 commit comments

Comments
 (0)