Increased testing coverage and code cleanup

Author: demianw

nibabel/cifti2/cifti2.py

@@ -984,7 +984,7 @@ def from_file_map(klass, file_map):
         """ Load a Cifti2 image from a file_map
 
         Parameters
-        file_map : string
+        file_map : file_map
 
         Returns
         -------
@@ -1000,9 +1000,6 @@ def from_file_map(klass, file_map):
                 cifti_header = item.get_content()
                 break
         else:
-            cifti_header = None
-
-        if cifti_header is None:
             raise ValueError('Nifti2 header does not contain a CIFTI2 '
                              'extension')
 

nibabel/cifti2/tests/test_cifti2io.py

@@ -19,14 +19,15 @@
 from nibabel.tmpdirs import InTemporaryDirectory
 from nibabel.tests.nibabel_data import get_nibabel_data, needs_nibabel_data
 
-CIFTI2_DATA = pjoin(get_nibabel_data(), 'nitest-cifti2')
-
-
-
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 from nose.tools import (assert_true, assert_false, assert_equal,
                         assert_raises)
 
+NIBABEL_TEST_DATA = pjoin(dirname(nib.__file__), 'tests', 'data')
+NIFTI2_DATA = pjoin(NIBABEL_TEST_DATA, 'example_nifti2.nii.gz')
+
+CIFTI2_DATA = pjoin(get_nibabel_data(), 'nitest-cifti2')
+
 DATA_FILE1 = pjoin(CIFTI2_DATA, '')
 DATA_FILE2 = pjoin(CIFTI2_DATA,
                    'Conte69.MyelinAndCorrThickness.32k_fs_LR.dscalar.nii')
@@ -40,6 +41,12 @@
 datafiles = [DATA_FILE2, DATA_FILE3, DATA_FILE4, DATA_FILE5, DATA_FILE6]
 
 
+def test_read_nifti2():
+    filemap = ci.Cifti2Image.make_file_map()
+    for k in filemap:
+        filemap[k].fileobj = open(NIFTI2_DATA)
+    assert_raises(ValueError, ci.Cifti2Image.from_file_map, filemap)
+
 @needs_nibabel_data('nitest-cifti2')
 def test_read_internal():
     img2 = ci.load(DATA_FILE6)