TEST: Use ArrayProxy.from_header for normal tests

Author: effigies

nibabel/tests/test_arrayproxy.py

@@ -63,7 +63,7 @@ def test_init():
     bio.seek(16)
     bio.write(arr.tostring(order='F'))
     hdr = FunkyHeader(shape)
-    ap = ArrayProxy(bio, hdr)
+    ap = ArrayProxy.from_header(bio, hdr)
     assert_true(ap.file_like is bio)
     assert_equal(ap.shape, shape)
     # shape should be read only
@@ -79,7 +79,7 @@ def test_init():
     bio = BytesIO()
     bio.seek(16)
     bio.write(arr.tostring(order='C'))
-    ap = CArrayProxy(bio, FunkyHeader((2, 3, 4)))
+    ap = CArrayProxy.from_header(bio, FunkyHeader((2, 3, 4)))
     assert_array_equal(np.asarray(ap), arr)
 
 
@@ -97,7 +97,7 @@ def test_nifti1_init():
     arr = np.arange(24, dtype=np.int16).reshape(shape)
     write_raw_data(arr, hdr, bio)
     hdr.set_slope_inter(2, 10)
-    ap = ArrayProxy(bio, hdr)
+    ap = ArrayProxy.from_header(bio, hdr)
     assert_true(ap.file_like == bio)
     assert_equal(ap.shape, shape)
     # Check there has been a copy of the header
@@ -110,7 +110,7 @@ def test_nifti1_init():
         f = open('test.nii', 'wb')
         write_raw_data(arr, hdr, f)
         f.close()
-        ap = ArrayProxy('test.nii', hdr)
+        ap = ArrayProxy.from_header('test.nii', hdr)
         assert_true(ap.file_like == 'test.nii')
         assert_equal(ap.shape, shape)
         assert_array_equal(np.asarray(ap), arr * 2.0 + 10)
@@ -130,15 +130,15 @@ def test_proxy_slicing():
                 fobj = BytesIO()
                 fobj.write(b'\0' * offset)
                 fobj.write(arr.tostring(order=order))
-                prox = klass(fobj, hdr)
+                prox = klass.from_header(fobj, hdr)
                 for sliceobj in slicer_samples(shape):
                     assert_array_equal(arr[sliceobj], prox[sliceobj])
     # Check slicing works with scaling
     hdr.set_slope_inter(2.0, 1.0)
     fobj = BytesIO()
     fobj.write(b'\0' * offset)
     fobj.write(arr.tostring(order='F'))
-    prox = ArrayProxy(fobj, hdr)
+    prox = ArrayProxy.from_header(fobj, hdr)
     sliceobj = (None, slice(None), 1, -1)
     assert_array_equal(arr[sliceobj] * 2.0 + 1.0, prox[sliceobj])
 
@@ -147,7 +147,7 @@ def test_is_proxy():
     # Test is_proxy function
     hdr = FunkyHeader((2, 3, 4))
     bio = BytesIO()
-    prox = ArrayProxy(bio, hdr)
+    prox = ArrayProxy.from_header(bio, hdr)
     assert_true(is_proxy(prox))
     assert_false(is_proxy(bio))
     assert_false(is_proxy(hdr))
@@ -163,7 +163,7 @@ def test_reshape_dataobj():
     shape = (1, 2, 3, 4)
     hdr = FunkyHeader(shape)
     bio = BytesIO()
-    prox = ArrayProxy(bio, hdr)
+    prox = ArrayProxy.from_header(bio, hdr)
     arr = np.arange(np.prod(shape), dtype=prox.dtype).reshape(shape)
     bio.write(b'\x00' * prox.offset + arr.tostring(order='F'))
     assert_array_equal(prox, arr)
@@ -198,7 +198,7 @@ def get_slope_inter(self):
     arr = np.arange(24, dtype=np.int32).reshape(shape, order='F')
     bio.write(b'\x00' * hdr.get_data_offset())
     bio.write(arr.tostring(order='F'))
-    prox = ArrayProxy(bio, hdr)
+    prox = ArrayProxy.from_header(bio, hdr)
     assert_array_almost_equal(np.array(prox), arr * 2.1 + 3.14)
     # Check unscaled read works
     assert_array_almost_equal(prox.get_unscaled(), arr)

nibabel/tests/test_proxy_api.py

@@ -233,7 +233,7 @@ def sio_func():
                 # Use a copy of the header to avoid changing
                 # global header in test functions.
                 new_hdr = hdr.copy()
-                return (self.proxy_class(fio, new_hdr),
+                return (self.proxy_class.from_header(fio, new_hdr),
                         fio,
                         new_hdr)
 
@@ -258,7 +258,7 @@ def fname_func():
                     # Use a copy of the header to avoid changing
                     # global header in test functions.
                     new_hdr = hdr.copy()
-                    return (self.proxy_class(fname, new_hdr),
+                    return (self.proxy_class.from_header(fname, new_hdr),
                             fname,
                             new_hdr)
                 params = params.copy()
@@ -288,7 +288,7 @@ def validate_deprecated_header(self, pmaker, params):
             # Header is a copy of original
             assert_false(prox.header is hdr)
             assert_equal(prox.header, hdr)
-            assert_equal(warns.pop(0).category, FutureWarning)
+            assert_equal(warns.pop(0).category, DeprecationWarning)
 
 
 class TestSpm99AnalyzeProxyAPI(TestAnalyzeProxyAPI):