Merge pull request #19702 from hugovk/maintenance/update-deprecated-u…

…nittest-aliases MAINT: Replace deprecated unittest aliases
numpy · Aug 18, 2021 · 89aa26f · 89aa26f
2 parents 04216da + 828e45d
commit 89aa26f
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py
@@ -28,15 +28,15 @@ def setUp(self):
 
     def testConstructor1(self):
         "Test Farray size constructor"
-        self.failUnless(isinstance(self.array, Farray.Farray))
+        self.assertTrue(isinstance(self.array, Farray.Farray))
 
     def testConstructor2(self):
         "Test Farray copy constructor"
         for i in range(self.nrows):
             for j in range(self.ncols):
                 self.array[i, j] = i + j
         arrayCopy = Farray.Farray(self.array)
-        self.failUnless(arrayCopy == self.array)
+        self.assertTrue(arrayCopy == self.array)
 
     def testConstructorBad1(self):
         "Test Farray size constructor, negative nrows"
@@ -48,15 +48,15 @@ def testConstructorBad2(self):
 
     def testNrows(self):
         "Test Farray nrows method"
-        self.failUnless(self.array.nrows() == self.nrows)
+        self.assertTrue(self.array.nrows() == self.nrows)
 
     def testNcols(self):
         "Test Farray ncols method"
-        self.failUnless(self.array.ncols() == self.ncols)
+        self.assertTrue(self.array.ncols() == self.ncols)
 
     def testLen(self):
         "Test Farray __len__ method"
-        self.failUnless(len(self.array) == self.nrows*self.ncols)
+        self.assertTrue(len(self.array) == self.nrows*self.ncols)
 
     def testSetGet(self):
         "Test Farray __setitem__, __getitem__ methods"
@@ -67,7 +67,7 @@ def testSetGet(self):
                 self.array[i, j] = i*j
         for i in range(m):
             for j in range(n):
-                self.failUnless(self.array[i, j] == i*j)
+                self.assertTrue(self.array[i, j] == i*j)
 
     def testSetBad1(self):
         "Test Farray __setitem__ method, negative row"
@@ -113,7 +113,7 @@ def testAsString(self):
         for i in range(self.nrows):
             for j in range(self.ncols):
                 self.array[i, j] = i+j
-        self.failUnless(self.array.asString() == result)
+        self.assertTrue(self.array.asString() == result)
 
     def testStr(self):
         "Test Farray __str__ method"
@@ -127,19 +127,19 @@ def testStr(self):
         for i in range(self.nrows):
             for j in range(self.ncols):
                 self.array[i, j] = i-j
-        self.failUnless(str(self.array) == result)
+        self.assertTrue(str(self.array) == result)
 
     def testView(self):
         "Test Farray view method"
         for i in range(self.nrows):
             for j in range(self.ncols):
                 self.array[i, j] = i+j
         a = self.array.view()
-        self.failUnless(isinstance(a, np.ndarray))
-        self.failUnless(a.flags.f_contiguous)
+        self.assertTrue(isinstance(a, np.ndarray))
+        self.assertTrue(a.flags.f_contiguous)
         for i in range(self.nrows):
             for j in range(self.ncols):
-                self.failUnless(a[i, j] == i+j)
+                self.assertTrue(a[i, j] == i+j)
 
 ######################################################################