MAINT: replace deprecated unit test method

Replace `failUnless` --> `assertTrue`.
Replace `failIf` --> `assertFalse`.

No change in code function.

Author: pavoljuhas

src/diffpy/pdfgui/tests/TestCalculation.py

@@ -73,7 +73,7 @@ def rgriddata(calc):
         # range should cover the argument range.
         self.calc.setRGrid(1, 0.7, 10)
         self.assertEqual(1, self.calc.rmin)
-        self.failUnless(10 < self.calc.rmax)
+        self.assertTrue(10 < self.calc.rmax)
         self.assertEqual(0.7, self.calc.rstep)
         return
 

src/diffpy/pdfgui/tests/TestConstraint.py

@@ -33,7 +33,7 @@ def setUp(self):
     def test___init__(self):
         """check Constraint.__init__()
         """
-        self.failUnless(1 in self.c.parguess)
+        self.assertTrue(1 in self.c.parguess)
         self.assertEqual(1, len(self.c.parguess))
         c1 = Constraint('2*@2 + 3.0', 13.0)
         self.assertEqual(1, len(c1.parguess))

src/diffpy/pdfgui/tests/TestFitDataSet.py

@@ -200,7 +200,7 @@ def test__resampledPDFDataSet(self):
         # reduce fitrmax to one half
         fds.fitrmax = fds.rmax / 2.0
         npts1 = len(fds.rcalc)
-        self.failUnless(npts1 < npts)
+        self.assertTrue(npts1 < npts)
         rds1 = fds._resampledPDFDataSet()
         self.assertEqual(npts1, len(rds1.robs))
         self.assertEqual(npts1, len(rds1.drobs))

src/diffpy/pdfgui/tests/TestFitStructure.py

@@ -55,7 +55,7 @@ def test___getattr__(self):
         """check FitStructure.__getattr__()
         """
         stru = self.stru
-        self.failUnless(stru is stru.initial)
+        self.assertTrue(stru is stru.initial)
         self.assertRaises(AttributeError, eval,
                 'stru.notdefined', locals())
         return
@@ -156,9 +156,9 @@ def test_insertAtoms(self):
         stru.insertAtoms(0, [Atom('Na', (0, 0, 0))])
         self.assertEqual(5, len(stru))
         self.assertEqual(1, len(stru.constraints))
-        self.failUnless(cns is stru.constraints['x(3)'])
+        self.assertTrue(cns is stru.constraints['x(3)'])
         stru.insertAtoms(5, [Atom('Cl', (0, 0, 0))])
-        self.failUnless(['x(3)'] == stru.constraints.keys())
+        self.assertTrue(['x(3)'] == stru.constraints.keys())
         return
 
 
@@ -171,10 +171,10 @@ def test_deleteAtoms(self):
         stru.constraints['x(2)'] = cns
         stru.deleteAtoms([3])
         self.assertEqual(['x(2)'], stru.constraints.keys())
-        self.failUnless(cns is stru.constraints.values()[0])
+        self.assertTrue(cns is stru.constraints.values()[0])
         stru.deleteAtoms([0])
         self.assertEqual(['x(1)'], stru.constraints.keys())
-        self.failUnless(cns is stru.constraints.values()[0])
+        self.assertTrue(cns is stru.constraints.values()[0])
         stru.deleteAtoms([0])
         self.assertEqual({}, stru.constraints)
         return

src/diffpy/pdfgui/tests/TestPDFDataSet.py

@@ -68,7 +68,7 @@ def test_read(self):
         # drobs are all zero
         self.assertEqual(npts*[0.0], self.pdfds.drobs)
         # dGobs should be defined
-        self.failUnless(min(self.pdfds.dGobs) > 0)
+        self.assertTrue(min(self.pdfds.dGobs) > 0)
         # x-ray data ---------------------------------------------------
         fx_Ni = datafile('Ni_2-8.chi.gr')
         self.pdfds.read(fx_Ni)
@@ -80,7 +80,7 @@ def test_read(self):
         # drobs are all zero
         self.assertEqual(npts*[0.0], self.pdfds.drobs)
         # dGobs should be defined
-        self.failUnless(min(self.pdfds.dGobs) > 0)
+        self.assertTrue(min(self.pdfds.dGobs) > 0)
         return
 
     def test_readStr(self):

src/diffpy/pdfgui/tests/TestPdfFitSandbox.py

@@ -231,11 +231,11 @@ def test_alloc(self):
         self.assertEqual(1, len(self.box._fits))
         self.assertEqual(1, len(self.box._fits[-1].strucs))
         self.assertEqual(0, len(self.box._fits[-1].datasets))
-        self.failUnless(isinstance(self.box._fits[-1], Fitting))
+        self.assertTrue(isinstance(self.box._fits[-1], Fitting))
         exec "alloc(N, 37.0, 0.07, 0.01, 10.0, 1000)" in sandbox
         self.assertEqual(1, len(self.box._fits))
         self.assertEqual(1, len(self.box._fits[-1].strucs))
-        self.failUnless(isinstance(self.box._fits[-1], Calculation))
+        self.assertTrue(isinstance(self.box._fits[-1], Calculation))
         c = self.box._fits[-1]
         self.assertEqual(37.0, c.qmax)
         self.assertEqual(0.07, c.qdamp)
@@ -257,7 +257,7 @@ def test_calc(self):
         exec "alloc(N, 37.0, 0.07, 0.01, 10.0, 1000)" in sandbox
         self.assertEqual(1, len(self.box._fits))
         exec "calc()" in sandbox
-        self.failUnless(isinstance(self.box._fits[0], Calculation))
+        self.assertTrue(isinstance(self.box._fits[0], Calculation))
         self.assertEqual(2, len(self.box._fits))
         self.assertEqual(0, len(self.box._fits[-1].datasets))
         self.assertEqual(0, len(self.box._fits[-1].strucs))
@@ -385,7 +385,7 @@ def test_constrain(self):
         cphase = self.box._fits[-1].strucs[self.box._curphase]
         cdataset = self.box._fits[-1].datasets[self.box._curdataset]
         self.assertEqual(10, len(cphase.constraints))
-        self.failUnless('pscale' in cphase.constraints)
+        self.assertTrue('pscale' in cphase.constraints)
         self.assertEqual('@6', cphase.constraints['u11(1)'].formula)
         self.assertEqual('@7+0.5', cphase.constraints['x(1)'].formula)
         self.assertEqual(2, len(cdataset.constraints))

src/diffpy/pdfgui/tests/TestStructureViewer.py

@@ -84,10 +84,10 @@ def test_plot(self):
         fs.read(datafile('LaMnO3.stru'))
         self.assertRaises(ControlConfigError, sv.plot, fs)
         sv.executable = 'does/not/exist'
-        self.failUnless(None is sv._tmpdir)
+        self.assertTrue(None is sv._tmpdir)
         self.assertEqual(0, sv._plotcount)
         self.assertRaises(ControlConfigError, sv.plot, fs)
-        self.failUnless(os.path.isdir(sv._tmpdir))
+        self.assertTrue(os.path.isdir(sv._tmpdir))
         self.assertEqual(1, sv._plotcount)
         return
 
@@ -103,10 +103,10 @@ def test___del__(self):
         fs.read(datafile('LaMnO3.stru'))
         self.assertRaises(ControlConfigError, sv.plot, fs)
         tmpd = sv._tmpdir
-        self.failUnless(os.path.isdir(tmpd))
+        self.assertTrue(os.path.isdir(tmpd))
         del sv
         gc.collect()
-        self.failIf(os.path.isdir(tmpd))
+        self.assertFalse(os.path.isdir(tmpd))
         return
 
 #   def test__writeTemporaryStructure(self):