mv test of failure + rm redundant tests

Author: Jakub Kaczmarzyk

nibabel/tests/test_image_load_save.py

@@ -30,7 +30,7 @@
 from ..spatialimages import SpatialImage
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
-from nose.tools import assert_true, assert_equal
+from nose.tools import assert_true, assert_equal, assert_raises
 
 _, have_scipy, _ = optional_package('scipy')  # No scipy=>no SPM-format writing
 DATA_PATH = pjoin(dirname(__file__), 'data')
@@ -322,3 +322,14 @@ def test_guessed_image_type():
     assert_equal(nils.guessed_image_type(
         pjoin(DATA_PATH, 'analyze.hdr')),
         Spm2AnalyzeImage)
+
+
+def test_fail_save():
+    with InTemporaryDirectory():
+        dataobj = np.ones((10, 10, 10), dtype=np.float16)
+        affine = np.eye(4, dtype=np.float32)
+        img = SpatialImage(dataobj, affine)
+        # Fails because float16 is not supported.
+        with assert_raises(AttributeError):
+            nils.save(img, 'foo.nii.gz')
+        del img

nibabel/tests/test_loadsave.py

@@ -10,8 +10,7 @@
 from .. import (Spm99AnalyzeImage, Spm2AnalyzeImage,
                 Nifti1Pair, Nifti1Image,
                 Nifti2Pair, Nifti2Image)
-from ..spatialimages import SpatialImage
-from ..loadsave import load, read_img_data, save
+from ..loadsave import load, read_img_data
 from ..filebasedimages import ImageFileError
 from ..tmpdirs import InTemporaryDirectory, TemporaryDirectory
 
@@ -136,33 +135,3 @@ def test_read_img_data_nifti():
             assert_array_equal(exp_offset, read_img_data(img_back))
             # Delete stuff that might hold onto file references
             del img, img_back, data_back
-
-
-def test_save():
-    with InTemporaryDirectory():
-        dataobj = np.ones((10, 10, 10), dtype=np.float16)
-        affine = np.eye(4, dtype=np.float32)
-        img = SpatialImage(dataobj, affine)
-
-        # The `save` method can raise one of many types of errors, but they are
-        # all subclasses of Exception. This attempt will fail because float16
-        # is not supported.
-        with assert_raises(Exception):
-            save(img, 'foo.nii.gz')
-
-        # Test the saving of several types of images.
-        dataobj = np.ones((10, 10, 10), dtype=np.float32)
-        img = SpatialImage(dataobj, affine)
-        for ext in {'hdr', 'img', 'nii', 'nii.gz', 'mgz'}:
-            this_filepath = "foo." + ext
-            save(img, this_filepath)
-            img_loaded = load(this_filepath)
-            assert_array_equal(np.asarray(img_loaded.dataobj), dataobj)
-            assert_array_equal(np.asarray(img_loaded.affine), affine)
-
-        # Test not being able to work out file type.
-        with assert_raises(ImageFileError):
-            save(img, 'foo.noexists')
-
-        # Delete stuff that might hold onto file references
-        del img, img_loaded