Replace deprecated failIf, failUnless functions.

Use recommended TestCase functions assertFalse, assertTrue instead.
No change in code function.

Author: pavoljuhas

diffpy/Structure/tests/TestLattice.py

@@ -94,7 +94,7 @@ def test_latpar_properties(self):
         lat.gamma = 120
         lat1 = Lattice(2, 4, 6, 80, 100, 120)
         self.assertAlmostEqual(-0.5, lat.cg, self.places)
-        self.failUnless(numpy.array_equal(lat1.base, lat.base))
+        self.assertTrue(numpy.array_equal(lat1.base, lat.base))
         return
 
 

diffpy/Structure/tests/TestLoadStructure.py

@@ -17,7 +17,7 @@ def test_xcfg(self):
         """
         f = datafile('BubbleRaftShort.xcfg')
         stru = loadStructure(f)
-        self.failUnless(type(stru) is Structure)
+        self.assertTrue(type(stru) is Structure)
         self.assertRaises(StructureFormatError,
                 loadStructure, f, 'xyz')
         return
@@ -27,16 +27,16 @@ def test_discus(self):
         """
         f = datafile('Ni-discus.stru')
         stru = loadStructure(f)
-        self.failUnless(type(stru) is PDFFitStructure)
+        self.assertTrue(type(stru) is PDFFitStructure)
         return
 
     def test_cif(self):
         """check loading of CIF file format
         """
         f = datafile('PbTe.cif')
         stru = loadStructure(f)
-        self.failUnless(isinstance(stru, Structure))
-        self.failIf(isinstance(stru, PDFFitStructure))
+        self.assertTrue(isinstance(stru, Structure))
+        self.assertFalse(isinstance(stru, PDFFitStructure))
         return
 
     def test_badfile(self):

diffpy/Structure/tests/TestP_cif.py

@@ -206,7 +206,7 @@ def test_write_and_read(self):
         a0 = stru[0]
         self.assertEqual('Cd', a0.element)
         self.assertListAlmostEqual([0.3334, 0.6667, 0.0], a0.xyz)
-        self.failUnless(a0.anisotropy)
+        self.assertTrue(a0.anisotropy)
         self.assertAlmostEqual(0.01303, a0.U[0,0])
         self.assertAlmostEqual(0.01303, a0.U[1,1])
         self.assertAlmostEqual(0.01402, a0.U[2,2])

diffpy/Structure/tests/TestP_discus.py

@@ -60,7 +60,7 @@ def test_read_discus_Ni(self):
         # first atom
         a0 = stru[0]
         self.assertEqual((0.0, 0.0, 0.0), tuple(a0.xyz))
-        self.failUnless(not a0.anisotropy)
+        self.assertTrue(not a0.anisotropy)
         Biso0 = 0.1
         self.assertAlmostEqual(Biso0, a0.Bisoequiv, self.places)
         return
@@ -117,11 +117,11 @@ def test_spdiameter_parsing(self):
         stru.read(datafile('Ni-discus.stru'), self.format)
         self.assertEqual(0, stru.pdffit['spdiameter'])
         snoshape = stru.writeStr(format=self.format)
-        self.failUnless(not re.search('(?m)^shape', snoshape))
+        self.assertTrue(not re.search('(?m)^shape', snoshape))
         # produce a string with non-zero spdiameter
         stru.pdffit['spdiameter'] = 13
         s13 = stru.writeStr(format=self.format)
-        self.failUnless(re.search('(?m)^shape +sphere, ', s13))
+        self.assertTrue(re.search('(?m)^shape +sphere, ', s13))
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['spdiameter'])
@@ -140,11 +140,11 @@ def test_stepcut_parsing(self):
         stru.read(datafile('Ni-discus.stru'), self.format)
         self.assertEqual(0, stru.pdffit['stepcut'])
         snoshape = stru.writeStr(format=self.format)
-        self.failUnless(not re.search('(?m)^shape', snoshape))
+        self.assertTrue(not re.search('(?m)^shape', snoshape))
         # produce a string with non-zero stepcut
         stru.pdffit['stepcut'] = 13
         s13 = stru.writeStr(format=self.format)
-        self.failUnless(re.search('(?m)^shape +stepcut, ', s13))
+        self.assertTrue(re.search('(?m)^shape +stepcut, ', s13))
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['stepcut'])

diffpy/Structure/tests/TestP_pdffit.py

@@ -199,11 +199,11 @@ def test_spdiameter_parsing(self):
         stru.read(datafile('Ni.stru'), self.format)
         self.assertEqual(0, stru.pdffit['spdiameter'])
         snoshape = stru.writeStr(format=self.format)
-        self.failUnless(not re.search('(?m)^shape', snoshape))
+        self.assertTrue(not re.search('(?m)^shape', snoshape))
         # produce a string with non-zero spdiameter
         stru.pdffit['spdiameter'] = 13
         s13 = stru.writeStr(format=self.format)
-        self.failUnless(re.search('(?m)^shape +sphere, ', s13))
+        self.assertTrue(re.search('(?m)^shape +sphere, ', s13))
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['spdiameter'])
@@ -222,11 +222,11 @@ def test_stepcut_parsing(self):
         stru.read(datafile('Ni.stru'), self.format)
         self.assertEqual(0, stru.pdffit['stepcut'])
         snoshape = stru.writeStr(format=self.format)
-        self.failUnless(not re.search('(?m)^shape', snoshape))
+        self.assertTrue(not re.search('(?m)^shape', snoshape))
         # produce a string with non-zero stepcut
         stru.pdffit['stepcut'] = 13
         s13 = stru.writeStr(format=self.format)
-        self.failUnless(re.search('(?m)^shape +stepcut, ', s13))
+        self.assertTrue(re.search('(?m)^shape +stepcut, ', s13))
         stru13 = Structure()
         stru13.readStr(s13)
         self.assertEqual(13, stru13.pdffit['stepcut'])