Skip to content

Commit 6bd34fe

Browse files
committed
TEST: Added brikhead to test_image_api.py
Created minimal test_image_api test for brikhead, modeled on PARREC image tests.
1 parent 8107fd4 commit 6bd34fe

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

nibabel/brikhead.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ class AFNIImage(SpatialImage):
447447
"""
448448

449449
header_class = AFNIHeader
450-
valid_exts = ('.BRIK', '.HEAD') # HEAD, at least, needs to be upper
450+
valid_exts = ('.brik', '.head')
451451
files_types = (('image', '.brik'), ('header', '.head'))
452452
_compressed_suffixes = ('.gz', '.bz2')
453453
makeable = False

nibabel/tests/test_brikhead.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
EXAMPLE_IMAGES = [
2626
dict(
2727
head=pjoin(data_path, 'example4d+orig.HEAD'),
28-
brik=pjoin(data_path, 'example4d+orig.BRIK.gz'),
28+
fname=pjoin(data_path, 'example4d+orig.BRIK.gz'),
2929
shape=(33, 41, 25, 3),
3030
dtype=np.int16,
3131
affine=np.array([[-3.0,0,0,49.5],
@@ -43,7 +43,7 @@
4343
scaling=None),
4444
dict(
4545
head=pjoin(data_path, 'scaled+tlrc.HEAD'),
46-
brik=pjoin(data_path, 'scaled+tlrc.BRIK'),
46+
fname=pjoin(data_path, 'scaled+tlrc.BRIK'),
4747
shape=(47, 54, 43, 1.),
4848
dtype=np.int16,
4949
affine=np.array([[3.0,0,0,-66.],
@@ -85,7 +85,7 @@ def test_makehead(self):
8585
with assert_raises(self.module.AFNIHeaderError):
8686
self.module.AFNIHeader.from_header(header=None)
8787
with assert_raises(self.module.AFNIHeaderError):
88-
self.module.AFNIHeader.from_header(tp['brik'])
88+
self.module.AFNIHeader.from_header(tp['fname'])
8989

9090

9191
class TestAFNIImage(object):
@@ -94,7 +94,7 @@ class TestAFNIImage(object):
9494

9595
def test_brikheadfile(self):
9696
for tp in self.test_files:
97-
brik = self.module.load(tp['brik'])
97+
brik = self.module.load(tp['fname'])
9898
assert_equal(brik.get_data_dtype().type, tp['dtype'])
9999
assert_equal(brik.shape, tp['shape'])
100100
assert_equal(brik.header.get_zooms(), tp['zooms'])
@@ -120,7 +120,7 @@ def test_load(self):
120120
def test_array_proxy_slicing(self):
121121
# Test slicing of array proxy
122122
for tp in self.test_files:
123-
img = self.module.load(tp['brik'])
123+
img = self.module.load(tp['fname'])
124124
arr = img.get_data()
125125
prox = img.dataobj
126126
assert_true(prox.is_proxy)

nibabel/tests/test_image_api.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
Nifti1Pair, Nifti1Image, Nifti2Pair, Nifti2Image,
4040
MGHImage, Minc1Image, Minc2Image, is_proxy)
4141
from ..spatialimages import SpatialImage
42-
from .. import minc1, minc2, parrec
42+
from .. import minc1, minc2, parrec, brikhead
4343

4444
from nose import SkipTest
4545
from nose.tools import (assert_true, assert_false, assert_raises, assert_equal)
@@ -54,7 +54,7 @@
5454
from .test_minc1 import EXAMPLE_IMAGES as MINC1_EXAMPLE_IMAGES
5555
from .test_minc2 import EXAMPLE_IMAGES as MINC2_EXAMPLE_IMAGES
5656
from .test_parrec import EXAMPLE_IMAGES as PARREC_EXAMPLE_IMAGES
57-
57+
from .test_brikhead import EXAMPLE_IMAGES as AFNI_EXAMPLE_IMAGES
5858

5959
class GenericImageAPI(ValidateAPI):
6060
""" General image validation API """
@@ -596,3 +596,9 @@ class TestMGHAPI(ImageHeaderAPI):
596596
has_scaling = True
597597
can_save = True
598598
standard_extension = '.mgh'
599+
600+
601+
class TestAFNIAPI(LoadImageAPI):
602+
loader = brikhead.load
603+
klass = image_maker = brikhead.AFNIImage
604+
example_images = AFNI_EXAMPLE_IMAGES

0 commit comments

Comments
 (0)