Skip to content

Commit 62d53c3

Browse files
committed
finish porting gifti module tests to pytest
1 parent d79af8b commit 62d53c3

File tree

2 files changed

+60
-63
lines changed

2 files changed

+60
-63
lines changed

nibabel/gifti/tests/test_giftiio.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
import warnings
1111

12-
from nose.tools import (assert_true, assert_false, assert_equal,
13-
assert_raises)
1412
from nibabel.testing import clear_and_catch_warnings
1513
from nibabel.tmpdirs import InTemporaryDirectory
1614

@@ -24,7 +22,7 @@ class TestGiftiIO(object):
2422
def setUp(self):
2523
with clear_and_catch_warnings() as w:
2624
warnings.simplefilter('always', DeprecationWarning)
27-
assert_equal(len(w), 1)
25+
assert len(w) == 1
2826

2927

3028
def test_read_deprecated():
@@ -33,7 +31,7 @@ def test_read_deprecated():
3331
from nibabel.gifti.giftiio import read, write
3432

3533
img = read(DATA_FILE1)
36-
assert_equal(len(w), 1)
34+
assert len(w) == 1
3735
with InTemporaryDirectory():
3836
write(img, 'test.gii')
39-
assert_equal(len(w), 2)
37+
assert len(w) == 2

nibabel/gifti/tests/test_parse_gifti_fast.py

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323
from numpy.testing import assert_array_almost_equal
2424

25-
from nose.tools import (assert_true, assert_false, assert_equal,
26-
assert_raises)
25+
import pytest
2726
from ...testing import clear_and_catch_warnings
2827

2928

@@ -106,9 +105,9 @@ def assert_default_types(loaded):
106105
if defaulttype is type(None):
107106
continue
108107
loadedtype = type(getattr(loaded, attr))
109-
assert_equal(loadedtype, defaulttype,
110-
"Type mismatch for attribute: {} ({!s} != {!s})".format(
111-
attr, loadedtype, defaulttype))
108+
assert loadedtype == defaulttype, (
109+
"Type mismatch for attribute: {} ({!s} != {!s})".format(
110+
attr, loadedtype, defaulttype))
112111

113112

114113
def test_default_types():
@@ -142,18 +141,18 @@ def test_read_ordering():
142141
# read another image first (DATA_FILE2) then the shape is wrong
143142
# Read an image
144143
img2 = load(DATA_FILE2)
145-
assert_equal(img2.darrays[0].data.shape, (143479, 1))
144+
assert img2.darrays[0].data.shape == (143479, 1)
146145
# Read image for which we know output shape
147146
img = load(DATA_FILE1)
148-
assert_equal(img.darrays[0].data.shape, (3, 3))
147+
assert img.darrays[0].data.shape == (3, 3)
149148

150149

151150
def test_load_metadata():
152151
for i, dat in enumerate(datafiles):
153152
img = load(dat)
154153
img.meta
155-
assert_equal(numDA[i], img.numDA)
156-
assert_equal(img.version, '1.0')
154+
assert numDA[i] == img.numDA
155+
assert img.version == '1.0'
157156

158157

159158
def test_metadata_deprecations():
@@ -163,12 +162,12 @@ def test_metadata_deprecations():
163162
# Test deprecation
164163
with clear_and_catch_warnings() as w:
165164
warnings.filterwarnings('once', category=DeprecationWarning)
166-
assert_equal(me, img.get_meta())
165+
assert me == img.get_meta()
167166

168167
with clear_and_catch_warnings() as w:
169168
warnings.filterwarnings('once', category=DeprecationWarning)
170169
img.set_metadata(me)
171-
assert_equal(me, img.meta)
170+
assert me == img.meta
172171

173172

174173
def test_load_dataarray1():
@@ -181,14 +180,14 @@ def test_load_dataarray1():
181180
assert_array_almost_equal(img.darrays[0].data, DATA_FILE1_darr1)
182181
assert_array_almost_equal(img.darrays[1].data, DATA_FILE1_darr2)
183182
me = img.darrays[0].meta.metadata
184-
assert_true('AnatomicalStructurePrimary' in me)
185-
assert_true('AnatomicalStructureSecondary' in me)
186-
assert_equal(me['AnatomicalStructurePrimary'], 'CortexLeft')
183+
assert 'AnatomicalStructurePrimary' in me
184+
assert 'AnatomicalStructureSecondary' in me
185+
me['AnatomicalStructurePrimary'] == 'CortexLeft'
187186
assert_array_almost_equal(img.darrays[0].coordsys.xform, np.eye(4, 4))
188-
assert_equal(xform_codes.niistring[img.darrays[
189-
0].coordsys.dataspace], 'NIFTI_XFORM_TALAIRACH')
190-
assert_equal(xform_codes.niistring[img.darrays[
191-
0].coordsys.xformspace], 'NIFTI_XFORM_TALAIRACH')
187+
assert xform_codes.niistring[
188+
img.darrays[0].coordsys.dataspace] == 'NIFTI_XFORM_TALAIRACH'
189+
assert xform_codes.niistring[img.darrays[
190+
0].coordsys.xformspace] == 'NIFTI_XFORM_TALAIRACH'
192191

193192

194193
def test_load_dataarray2():
@@ -223,7 +222,7 @@ def test_load_dataarray4():
223222
def test_dataarray5():
224223
img5 = load(DATA_FILE5)
225224
for da in img5.darrays:
226-
assert_equal(gifti_endian_codes.byteorder[da.endian], 'little')
225+
gifti_endian_codes.byteorder[da.endian] == 'little'
227226
assert_array_almost_equal(img5.darrays[0].data, DATA_FILE5_darr1)
228227
assert_array_almost_equal(img5.darrays[1].data, DATA_FILE5_darr2)
229228
# Round trip tested below
@@ -234,24 +233,24 @@ def test_base64_written():
234233
with open(DATA_FILE5, 'rb') as fobj:
235234
contents = fobj.read()
236235
# Confirm the bad tags are still in the file
237-
assert_true(b'GIFTI_ENCODING_B64BIN' in contents)
238-
assert_true(b'GIFTI_ENDIAN_LITTLE' in contents)
236+
assert b'GIFTI_ENCODING_B64BIN' in contents
237+
assert b'GIFTI_ENDIAN_LITTLE' in contents
239238
# The good ones are missing
240-
assert_false(b'Base64Binary' in contents)
241-
assert_false(b'LittleEndian' in contents)
239+
assert b'Base64Binary' not in contents
240+
assert b'LittleEndian' not in contents
242241
# Round trip
243242
img5 = load(DATA_FILE5)
244243
save(img5, 'fixed.gii')
245244
with open('fixed.gii', 'rb') as fobj:
246245
contents = fobj.read()
247246
# The bad codes have gone, replaced by the good ones
248-
assert_false(b'GIFTI_ENCODING_B64BIN' in contents)
249-
assert_false(b'GIFTI_ENDIAN_LITTLE' in contents)
250-
assert_true(b'Base64Binary' in contents)
247+
assert b'GIFTI_ENCODING_B64BIN' not in contents
248+
assert b'GIFTI_ENDIAN_LITTLE' not in contents
249+
assert b'Base64Binary' in contents
251250
if sys.byteorder == 'little':
252-
assert_true(b'LittleEndian' in contents)
251+
assert b'LittleEndian' in contents
253252
else:
254-
assert_true(b'BigEndian' in contents)
253+
assert b'BigEndian' in contents
255254
img5_fixed = load('fixed.gii')
256255
darrays = img5_fixed.darrays
257256
assert_array_almost_equal(darrays[0].data, DATA_FILE5_darr1)
@@ -263,7 +262,7 @@ def test_readwritedata():
263262
with InTemporaryDirectory():
264263
save(img, 'test.gii')
265264
img2 = load('test.gii')
266-
assert_equal(img.numDA, img2.numDA)
265+
assert img.numDA == img2.numDA
267266
assert_array_almost_equal(img.darrays[0].data,
268267
img2.darrays[0].data)
269268

@@ -272,7 +271,7 @@ def test_modify_darray():
272271
img = load(fname)
273272
darray = img.darrays[0]
274273
darray.data[:] = 0
275-
assert_true(np.array_equiv(darray.data, 0))
274+
assert np.array_equiv(darray.data, 0)
276275

277276

278277
def test_write_newmetadata():
@@ -281,32 +280,32 @@ def test_write_newmetadata():
281280
newmeta = gi.GiftiMetaData(attr)
282281
img.meta = newmeta
283282
myme = img.meta.metadata
284-
assert_true('mykey' in myme)
283+
assert 'mykey' in myme
285284
newmeta = gi.GiftiMetaData.from_dict({'mykey1': 'val2'})
286285
img.meta = newmeta
287286
myme = img.meta.metadata
288-
assert_true('mykey1' in myme)
289-
assert_false('mykey' in myme)
287+
assert 'mykey1' in myme
288+
assert 'mykey' not in myme
290289

291290

292291
def test_load_getbyintent():
293292
img = load(DATA_FILE1)
294293
da = img.get_arrays_from_intent("NIFTI_INTENT_POINTSET")
295-
assert_equal(len(da), 1)
294+
assert len(da) == 1
296295

297296
with clear_and_catch_warnings() as w:
298297
warnings.filterwarnings('once', category=DeprecationWarning)
299298
da = img.getArraysFromIntent("NIFTI_INTENT_POINTSET")
300-
assert_equal(len(da), 1)
301-
assert_equal(len(w), 1)
302-
assert_equal(w[0].category, DeprecationWarning)
299+
assert len(da) == 1
300+
assert len(w) == 1
301+
w[0].category == DeprecationWarning
303302

304303
da = img.get_arrays_from_intent("NIFTI_INTENT_TRIANGLE")
305-
assert_equal(len(da), 1)
304+
assert len(da) == 1
306305

307306
da = img.get_arrays_from_intent("NIFTI_INTENT_CORREL")
308-
assert_equal(len(da), 0)
309-
assert_equal(da, [])
307+
assert len(da) == 0
308+
assert da == []
310309

311310

312311
def test_load_labeltable():
@@ -317,15 +316,15 @@ def test_load_labeltable():
317316
bimg = load('test.gii')
318317
for img in (img6, bimg):
319318
assert_array_almost_equal(img.darrays[0].data[:3], DATA_FILE6_darr1)
320-
assert_equal(len(img.labeltable.labels), 36)
319+
assert len(img.labeltable.labels) == 36
321320
labeldict = img.labeltable.get_labels_as_dict()
322-
assert_true(660700 in labeldict)
323-
assert_equal(labeldict[660700], 'entorhinal')
324-
assert_equal(img.labeltable.labels[1].key, 2647065)
325-
assert_equal(img.labeltable.labels[1].red, 0.0980392)
326-
assert_equal(img.labeltable.labels[1].green, 0.392157)
327-
assert_equal(img.labeltable.labels[1].blue, 0.156863)
328-
assert_equal(img.labeltable.labels[1].alpha, 1)
321+
assert 660700 in labeldict
322+
assert labeldict[660700] == 'entorhinal'
323+
assert img.labeltable.labels[1].key == 2647065
324+
assert img.labeltable.labels[1].red == 0.0980392
325+
assert img.labeltable.labels[1].green == 0.392157
326+
assert img.labeltable.labels[1].blue == 0.156863
327+
assert img.labeltable.labels[1].alpha == 1
329328

330329

331330
def test_labeltable_deprecations():
@@ -335,14 +334,14 @@ def test_labeltable_deprecations():
335334
# Test deprecation
336335
with clear_and_catch_warnings() as w:
337336
warnings.filterwarnings('always', category=DeprecationWarning)
338-
assert_equal(lt, img.get_labeltable())
339-
assert_equal(len(w), 1)
337+
assert lt == img.get_labeltable()
338+
assert len(w) == 1
340339

341340
with clear_and_catch_warnings() as w:
342341
warnings.filterwarnings('always', category=DeprecationWarning)
343342
img.set_labeltable(lt)
344-
assert_equal(len(w), 1)
345-
assert_equal(lt, img.labeltable)
343+
assert len(w) == 1
344+
assert lt == img.labeltable
346345

347346

348347
def test_parse_dataarrays():
@@ -361,8 +360,8 @@ def test_parse_dataarrays():
361360
with clear_and_catch_warnings() as w:
362361
warnings.filterwarnings('once', category=UserWarning)
363362
load(fn)
364-
assert_equal(len(w), 1)
365-
assert_equal(img.numDA, 0)
363+
assert len(w) == 1
364+
assert img.numDA == 0
366365

367366

368367
def test_parse_deprecated():
@@ -371,16 +370,16 @@ def test_parse_deprecated():
371370
with clear_and_catch_warnings() as w:
372371
warnings.filterwarnings('always', category=DeprecationWarning)
373372
op = Outputter()
374-
assert_equal(len(w), 1)
373+
assert len(w) == 1
375374
op.initialize() # smoke test--no error.
376375

377376
with clear_and_catch_warnings() as w:
378377
warnings.filterwarnings('always', category=DeprecationWarning)
379-
assert_raises(ValueError, parse_gifti_file)
380-
assert_equal(len(w), 1)
378+
pytest.raises(ValueError, parse_gifti_file)
379+
assert len(w) == 1
381380

382381

383382
def test_parse_with_buffersize():
384383
for buff_sz in [None, 1, 2**12]:
385384
img2 = load(DATA_FILE2, buffer_size=buff_sz)
386-
assert_equal(img2.darrays[0].data.shape, (143479, 1))
385+
assert img2.darrays[0].data.shape == (143479, 1)

0 commit comments

Comments
 (0)