Skip to content

Commit 828e45d

Browse files
committed
MAINT: Replace deprecated unittest aliases
1 parent 04216da commit 828e45d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

tools/swig/test/testFarray.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ def setUp(self):
2828

2929
def testConstructor1(self):
3030
"Test Farray size constructor"
31-
self.failUnless(isinstance(self.array, Farray.Farray))
31+
self.assertTrue(isinstance(self.array, Farray.Farray))
3232

3333
def testConstructor2(self):
3434
"Test Farray copy constructor"
3535
for i in range(self.nrows):
3636
for j in range(self.ncols):
3737
self.array[i, j] = i + j
3838
arrayCopy = Farray.Farray(self.array)
39-
self.failUnless(arrayCopy == self.array)
39+
self.assertTrue(arrayCopy == self.array)
4040

4141
def testConstructorBad1(self):
4242
"Test Farray size constructor, negative nrows"
@@ -48,15 +48,15 @@ def testConstructorBad2(self):
4848

4949
def testNrows(self):
5050
"Test Farray nrows method"
51-
self.failUnless(self.array.nrows() == self.nrows)
51+
self.assertTrue(self.array.nrows() == self.nrows)
5252

5353
def testNcols(self):
5454
"Test Farray ncols method"
55-
self.failUnless(self.array.ncols() == self.ncols)
55+
self.assertTrue(self.array.ncols() == self.ncols)
5656

5757
def testLen(self):
5858
"Test Farray __len__ method"
59-
self.failUnless(len(self.array) == self.nrows*self.ncols)
59+
self.assertTrue(len(self.array) == self.nrows*self.ncols)
6060

6161
def testSetGet(self):
6262
"Test Farray __setitem__, __getitem__ methods"
@@ -67,7 +67,7 @@ def testSetGet(self):
6767
self.array[i, j] = i*j
6868
for i in range(m):
6969
for j in range(n):
70-
self.failUnless(self.array[i, j] == i*j)
70+
self.assertTrue(self.array[i, j] == i*j)
7171

7272
def testSetBad1(self):
7373
"Test Farray __setitem__ method, negative row"
@@ -113,7 +113,7 @@ def testAsString(self):
113113
for i in range(self.nrows):
114114
for j in range(self.ncols):
115115
self.array[i, j] = i+j
116-
self.failUnless(self.array.asString() == result)
116+
self.assertTrue(self.array.asString() == result)
117117

118118
def testStr(self):
119119
"Test Farray __str__ method"
@@ -127,19 +127,19 @@ def testStr(self):
127127
for i in range(self.nrows):
128128
for j in range(self.ncols):
129129
self.array[i, j] = i-j
130-
self.failUnless(str(self.array) == result)
130+
self.assertTrue(str(self.array) == result)
131131

132132
def testView(self):
133133
"Test Farray view method"
134134
for i in range(self.nrows):
135135
for j in range(self.ncols):
136136
self.array[i, j] = i+j
137137
a = self.array.view()
138-
self.failUnless(isinstance(a, np.ndarray))
139-
self.failUnless(a.flags.f_contiguous)
138+
self.assertTrue(isinstance(a, np.ndarray))
139+
self.assertTrue(a.flags.f_contiguous)
140140
for i in range(self.nrows):
141141
for j in range(self.ncols):
142-
self.failUnless(a[i, j] == i+j)
142+
self.assertTrue(a[i, j] == i+j)
143143

144144
######################################################################
145145

0 commit comments

Comments
 (0)