Skip to content

Commit 84df042

Browse files
author
Guidotti Roberto
committed
TEST: cmdline module to pytest
1 parent 6be3e94 commit 84df042

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

nibabel/cmdline/tests/test_parrec2nii.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from nibabel.cmdline import parrec2nii
1010

1111
from unittest.mock import Mock, MagicMock, patch
12-
from nose.tools import assert_true
1312
from numpy.testing import (assert_almost_equal, assert_array_equal)
1413

1514
from nibabel.tests.test_parrec import EG_PAR, VARY_PAR
@@ -89,8 +88,8 @@ def test_parrec2nii_save_load_qform_code(*args):
8988
for fname in [EG_PAR, VARY_PAR]:
9089
parrec2nii.proc_file(fname, opts)
9190
outfname = join(pth, basename(fname)).replace('.PAR', '.nii')
92-
assert_true(isfile(outfname))
91+
assert isfile(outfname)
9392
img = nibabel.load(outfname)
9493
assert_almost_equal(img.affine, PAR_AFFINE, 4)
95-
assert_array_equal(img.header['qform_code'], 1)
94+
assert img.header['qform_code'] == 1
9695
assert_array_equal(img.header['sform_code'], 1)

nibabel/cmdline/tests/test_utils.py

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
Test running scripts
66
"""
77

8-
from nose.tools import assert_equal
98
from numpy.testing import assert_raises
109

10+
import pytest
11+
1112
import nibabel as nib
1213
import numpy as np
1314
from nibabel.cmdline.utils import *
@@ -19,18 +20,18 @@
1920

2021

2122
def test_table2string():
22-
assert_equal(table2string([["A", "B", "C", "D"], ["E", "F", "G", "H"]]), "A B C D\nE F G H\n")
23-
assert_equal(table2string([["Let's", "Make", "Tests", "And"], ["Have", "Lots", "Of", "Fun"],
24-
["With", "Python", "Guys", "!"]]), "Let's Make Tests And\n Have Lots Of Fun"+
25-
"\n With Python Guys !\n")
23+
assert table2string([["A", "B", "C", "D"], ["E", "F", "G", "H"]]) == "A B C D\nE F G H\n"
24+
assert table2string([["Let's", "Make", "Tests", "And"], ["Have", "Lots", "Of", "Fun"],
25+
["With", "Python", "Guys", "!"]]) == "Let's Make Tests And\n Have Lots Of Fun"+ \
26+
"\n With Python Guys !\n"
2627

2728

2829
def test_ap():
29-
assert_equal(ap([1, 2], "%2d"), " 1, 2")
30-
assert_equal(ap([1, 2], "%3d"), " 1, 2")
31-
assert_equal(ap([1, 2], "%-2d"), "1 , 2 ")
32-
assert_equal(ap([1, 2], "%d", "+"), "1+2")
33-
assert_equal(ap([1, 2, 3], "%d", "-"), "1-2-3")
30+
assert ap([1, 2], "%2d") == " 1, 2"
31+
assert ap([1, 2], "%3d") == " 1, 2"
32+
assert ap([1, 2], "%-2d") == "1 , 2 "
33+
assert ap([1, 2], "%d", "+") == "1+2"
34+
assert ap([1, 2, 3], "%d", "-") == "1-2-3"
3435

3536

3637
def test_safe_get():
@@ -44,8 +45,8 @@ def get_test(self):
4445
test = TestObject()
4546
test.test = 2
4647

47-
assert_equal(safe_get(test, "test"), 2)
48-
assert_equal(safe_get(test, "failtest"), "-")
48+
assert safe_get(test, "test") == 2
49+
assert safe_get(test, "failtest") == "-"
4950

5051

5152
def test_get_headers_diff():
@@ -107,14 +108,14 @@ def test_display_diff():
107108
" " \
108109
"\n"
109110

110-
assert_equal(display_diff(bogus_names, dict_values), expected_output)
111+
assert display_diff(bogus_names, dict_values) == expected_output
111112

112113

113114
def test_get_data_diff():
114115
# testing for identical files specifically as md5 may vary by computer
115116
test_names = [pjoin(data_path, f)
116117
for f in ('standard.nii.gz', 'standard.nii.gz')]
117-
assert_equal(get_data_hash_diff(test_names), [])
118+
assert get_data_hash_diff(test_names) == []
118119

119120
# testing the maximum relative and absolute differences' different use cases
120121
test_array = np.arange(16).reshape(4, 4)
@@ -124,37 +125,37 @@ def test_get_data_diff():
124125
test_array_5 = np.arange(64).reshape(8, 8)
125126

126127
# same shape, 2 files
127-
assert_equal(get_data_diff([test_array, test_array_2]),
128-
OrderedDict([('DATA(diff 1:)', [None, OrderedDict([('abs', 1), ('rel', 2.0)])])]))
128+
assert get_data_diff([test_array, test_array_2]) == \
129+
OrderedDict([('DATA(diff 1:)', [None, OrderedDict([('abs', 1), ('rel', 2.0)])])])
129130

130131
# same shape, 3 files
131-
assert_equal(get_data_diff([test_array, test_array_2, test_array_3]),
132+
assert get_data_diff([test_array, test_array_2, test_array_3]) == \
132133
OrderedDict([('DATA(diff 1:)', [None, OrderedDict([('abs', 1), ('rel', 2.0)]),
133134
OrderedDict([('abs', 2), ('rel', 2.0)])]),
134135
('DATA(diff 2:)', [None, None,
135-
OrderedDict([('abs', 1), ('rel', 0.66666666666666663)])])]))
136+
OrderedDict([('abs', 1), ('rel', 0.66666666666666663)])])])
136137

137138
# same shape, 2 files, modified maximum abs/rel
138-
assert_equal(get_data_diff([test_array, test_array_2], max_abs=2, max_rel=2), OrderedDict())
139+
assert get_data_diff([test_array, test_array_2], max_abs=2, max_rel=2) == OrderedDict()
139140

140141
# different shape, 2 files
141-
assert_equal(get_data_diff([test_array_2, test_array_4]),
142-
OrderedDict([('DATA(diff 1:)', [None, {'CMP': 'incompat'}])]))
142+
assert get_data_diff([test_array_2, test_array_4]) == \
143+
OrderedDict([('DATA(diff 1:)', [None, {'CMP': 'incompat'}])])
143144

144145
# different shape, 3 files
145-
assert_equal(get_data_diff([test_array_4, test_array_5, test_array_2]),
146+
assert get_data_diff([test_array_4, test_array_5, test_array_2]) == \
146147
OrderedDict([('DATA(diff 1:)', [None, {'CMP': 'incompat'}, {'CMP': 'incompat'}]),
147-
('DATA(diff 2:)', [None, None, {'CMP': 'incompat'}])]))
148+
('DATA(diff 2:)', [None, None, {'CMP': 'incompat'}])])
148149

149150
test_return = get_data_diff([test_array, test_array_2], dtype=np.float32)
150-
assert_equal(type(test_return['DATA(diff 1:)'][1]['abs']), np.float32)
151-
assert_equal(type(test_return['DATA(diff 1:)'][1]['rel']), np.float32)
151+
assert type(test_return['DATA(diff 1:)'][1]['abs']) is np.float32
152+
assert type(test_return['DATA(diff 1:)'][1]['rel']) is np.float32
152153

153154
test_return_2 = get_data_diff([test_array, test_array_2, test_array_3])
154-
assert_equal(type(test_return_2['DATA(diff 1:)'][1]['abs']), np.float64)
155-
assert_equal(type(test_return_2['DATA(diff 1:)'][1]['rel']), np.float64)
156-
assert_equal(type(test_return_2['DATA(diff 2:)'][2]['abs']), np.float64)
157-
assert_equal(type(test_return_2['DATA(diff 2:)'][2]['rel']), np.float64)
155+
assert type(test_return_2['DATA(diff 1:)'][1]['abs']) is np.float64
156+
assert type(test_return_2['DATA(diff 1:)'][1]['rel']) is np.float64
157+
assert type(test_return_2['DATA(diff 2:)'][2]['abs']) is np.float64
158+
assert type(test_return_2['DATA(diff 2:)'][2]['rel']) is np.float64
158159

159160

160161
def test_main():
@@ -201,4 +202,4 @@ def test_main():
201202
test_names_2 = [pjoin(data_path, f) for f in ('standard.nii.gz', 'standard.nii.gz')]
202203

203204
with assert_raises(SystemExit):
204-
assert_equal(main(test_names_2, StringIO()), "These files are identical.")
205+
assert main(test_names_2, StringIO()) == "These files are identical."

0 commit comments

Comments
 (0)