TEST: Move shape API tests into DataInterfaceMixin

Author: effigies

nibabel/tests/test_image_api.py

@@ -117,25 +117,6 @@ def validate_header_deprecated(self, imaker, params):
             assert_equal(len(w), 1)
             assert_true(hdr is img.header)
 
-    def validate_shape(self, imaker, params):
-        # Validate shape
-        img = imaker()
-        # Same as expected shape
-        assert_equal(img.shape, params['shape'])
-        # Same as array shape if passed
-        if 'data' in params:
-            assert_equal(img.shape, params['data'].shape)
-        # Read only
-        assert_raises(AttributeError, setattr, img, 'shape', np.eye(4))
-
-    def validate_shape_deprecated(self, imaker, params):
-        # Check deprecated get_shape API
-        with clear_and_catch_warnings() as w:
-            warnings.simplefilter('always', DeprecationWarning)
-            img = imaker()
-            assert_equal(img.get_shape(), params['shape'])
-            assert_equal(len(w), 1)
-
     def validate_filenames(self, imaker, params):
         # Validate the filename, file_map interface
         if not self.can_save:
@@ -289,6 +270,26 @@ def validate_data_deprecated(self, imaker, params):
         fake_data = np.zeros(img.shape).astype(img.get_data_dtype())
         assert_raises(AttributeError, setattr, img, '_data', fake_data)
 
+    def validate_shape(self, imaker, params):
+        # Validate shape
+        img = imaker()
+        # Same as expected shape
+        assert_equal(img.shape, params['shape'])
+        # Same as array shape if passed
+        if 'data' in params:
+            assert_equal(img.shape, params['data'].shape)
+        # Read only
+        assert_raises(AttributeError, setattr, img, 'shape', np.eye(4))
+
+    def validate_shape_deprecated(self, imaker, params):
+        # Check deprecated get_shape API
+        with clear_and_catch_warnings() as w:
+            warnings.simplefilter('always', DeprecationWarning)
+            img = imaker()
+            assert_equal(img.get_shape(), params['shape'])
+            assert_equal(len(w), 1)
+
+
 
 class HeaderShapeMixin(object):
     """ Tests that header shape can be set and got