diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2021-08-18 07:04:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 07:04:35 -0700 |
| commit | 89aa26f6b3c07666dc10b488786f4878660e07ea (patch) | |
| tree | a5d0a48e2ac3291031060e047f712c807e9447f3 | |
| parent | 04216da0970380bb9ef3c0437eb98d63bb78b680 (diff) | |
| parent | 828e45dcb1312e88c3d680577d33153863bbf851 (diff) | |
| download | numpy-89aa26f6b3c07666dc10b488786f4878660e07ea.tar.gz | |
Merge pull request #19702 from hugovk/maintenance/update-deprecated-unittest-aliases
MAINT: Replace deprecated unittest aliases
| -rwxr-xr-x | tools/swig/test/testFarray.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py index 43a6003f4..29bf96fe2 100755 --- a/tools/swig/test/testFarray.py +++ b/tools/swig/test/testFarray.py @@ -28,7 +28,7 @@ class FarrayTestCase(unittest.TestCase): 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" @@ -36,7 +36,7 @@ class FarrayTestCase(unittest.TestCase): 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 @@ class FarrayTestCase(unittest.TestCase): 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 @@ class FarrayTestCase(unittest.TestCase): 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 @@ class FarrayTestCase(unittest.TestCase): 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,7 +127,7 @@ class FarrayTestCase(unittest.TestCase): 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" @@ -135,11 +135,11 @@ class FarrayTestCase(unittest.TestCase): 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) ###################################################################### |