Skip to content

Commit 4133e08

Browse files
pavoljuhaspavoljuhas
committed
TST: replace deprecated unit test methods.
Replace `assertEquals` --> `assertEqual`. Replace `assertAlmostEquals` --> `assertAlmostEqual`. No change in code function.
1 parent 7abbfa1 commit 4133e08

File tree

3 files changed

+83
-83
lines changed

3 files changed

+83
-83
lines changed

‎src/pyobjcryst/tests/testcif.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ def test_caffeine_cif(self):
6161
'''
6262
c = loadcifdata('caffeine.cif')
6363
self.assertTrue(c is not None)
64-
self.assertEquals(24, c.GetNbScatterer())
65-
self.assertAlmostEquals(14.9372, c.a, 6)
66-
self.assertAlmostEquals(14.9372, c.b, 6)
67-
self.assertAlmostEquals(6.8980, c.c, 6)
68-
self.assertAlmostEquals(pi/2, c.alpha, 6)
69-
self.assertAlmostEquals(pi/2, c.beta, 6)
70-
self.assertAlmostEquals(2*pi/3, c.gamma, 6)
64+
self.assertEqual(24, c.GetNbScatterer())
65+
self.assertAlmostEqual(14.9372, c.a, 6)
66+
self.assertAlmostEqual(14.9372, c.b, 6)
67+
self.assertAlmostEqual(6.8980, c.c, 6)
68+
self.assertAlmostEqual(pi/2, c.alpha, 6)
69+
self.assertAlmostEqual(pi/2, c.beta, 6)
70+
self.assertAlmostEqual(2*pi/3, c.gamma, 6)
7171
cifdata = """
7272
C5 -0.06613 -0.06314 0.09562 0.00000 Uiso 1.00000 C
7373
C4 0.02779 -0.05534 0.10000 0.00000 Uiso 1.00000 C
@@ -98,11 +98,11 @@ def test_caffeine_cif(self):
9898
for i, line in enumerate(lines):
9999
name, x, y, z, U, junk, occ, element = line.split()
100100
s = c.GetScatt(i)
101-
self.assertEquals(name, s.GetName())
102-
self.assertAlmostEquals(float(x), s.X, 6)
103-
self.assertAlmostEquals(float(y), s.Y, 6)
104-
self.assertAlmostEquals(float(z), s.Z, 6)
105-
self.assertAlmostEquals(float(occ), s.Occupancy, 6)
101+
self.assertEqual(name, s.GetName())
102+
self.assertAlmostEqual(float(x), s.X, 6)
103+
self.assertAlmostEqual(float(y), s.Y, 6)
104+
self.assertAlmostEqual(float(z), s.Z, 6)
105+
self.assertAlmostEqual(float(occ), s.Occupancy, 6)
106106
return
107107

108108

@@ -113,20 +113,20 @@ def test_CaTiO3_cif(self):
113113
self.assertTrue(c is not None)
114114
s = c.GetScatt(3)
115115
name = s.GetName()
116-
self.assertEquals(name, "O2")
116+
self.assertEqual(name, "O2")
117117
sp = c.GetScatteringPower(name)
118118
self.assertFalse(sp.IsIsotropic())
119119
utob = 8 * pi**2
120-
self.assertAlmostEquals(utob * 0.0065, sp.B11)
121-
self.assertAlmostEquals(utob * 0.0060, sp.B22)
122-
self.assertAlmostEquals(utob * 0.0095, sp.B33)
123-
self.assertAlmostEquals(utob * 0.0020, sp.B12)
124-
self.assertAlmostEquals(utob * -0.0008, sp.B13)
125-
self.assertAlmostEquals(utob * -0.0010, sp.B23)
126-
self.assertAlmostEquals(0.2897, s.X, 5)
127-
self.assertAlmostEquals(0.2888, s.Y, 5)
128-
self.assertAlmostEquals(0.0373, s.Z, 2)
129-
self.assertAlmostEquals(1, s.Occupancy)
120+
self.assertAlmostEqual(utob * 0.0065, sp.B11)
121+
self.assertAlmostEqual(utob * 0.0060, sp.B22)
122+
self.assertAlmostEqual(utob * 0.0095, sp.B33)
123+
self.assertAlmostEqual(utob * 0.0020, sp.B12)
124+
self.assertAlmostEqual(utob * -0.0008, sp.B13)
125+
self.assertAlmostEqual(utob * -0.0010, sp.B23)
126+
self.assertAlmostEqual(0.2897, s.X, 5)
127+
self.assertAlmostEqual(0.2888, s.Y, 5)
128+
self.assertAlmostEqual(0.0373, s.Z, 2)
129+
self.assertAlmostEqual(1, s.Occupancy)
130130
return
131131

132132

@@ -234,10 +234,10 @@ def test_TiO2_rutile_cif(self):
234234
s = c.GetScatt(0)
235235
name = s.GetName()
236236
sp = c.GetScatteringPower(name)
237-
self.assertEquals(name, "Ti")
237+
self.assertEqual(name, "Ti")
238238
self.assertTrue(sp.IsIsotropic())
239239
utob = 8 * pi**2
240-
self.assertAlmostEquals(utob * 0.00532, sp.Biso, 5)
240+
self.assertAlmostEqual(utob * 0.00532, sp.Biso, 5)
241241
return
242242

243243

‎src/pyobjcryst/tests/testcrystal.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@ def testGetScatteringComponentList(self):
8989
sp, atom = makeScatterer()
9090
c = makeCrystal(sp, atom)
9191
scl = c.GetScatteringComponentList()
92-
self.assertEquals(1, len(scl))
92+
self.assertEqual(1, len(scl))
9393

9494
sclcopy = scl[:]
95-
self.assertEquals(1, len(scl))
95+
self.assertEqual(1, len(scl))
9696

9797
del sclcopy[0]
98-
self.assertEquals(0, len(sclcopy))
99-
self.assertEquals(1, len(scl))
98+
self.assertEqual(0, len(sclcopy))
99+
self.assertEqual(1, len(scl))
100100

101101
del scl[0]
102-
self.assertEquals(0, len(scl))
102+
self.assertEqual(0, len(scl))
103103

104104
return
105105

‎src/pyobjcryst/tests/testmolecule.py‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ def testContainment(self):
6060
scope."""
6161
c = makeC60()
6262
m = self.c.GetScatterer("c60")
63-
self.assertEquals("c60", m.GetName())
63+
self.assertEqual("c60", m.GetName())
6464
del c
65-
self.assertEquals("c60", m.GetName())
65+
self.assertEqual("c60", m.GetName())
6666
return
6767

6868
def testAddPar(self):
@@ -72,11 +72,11 @@ def testAddPar(self):
7272
rpt = RefParType("test")
7373
par = RefinablePar("testpar", 3, 0, 10, rpt)
7474
m.AddPar(par)
75-
self.assertAlmostEquals(3, par.GetValue())
75+
self.assertAlmostEqual(3, par.GetValue())
7676
del m
77-
self.assertAlmostEquals(3, par.GetValue())
77+
self.assertAlmostEqual(3, par.GetValue())
7878
del c
79-
self.assertAlmostEquals(3, par.GetValue())
79+
self.assertAlmostEqual(3, par.GetValue())
8080
return
8181

8282
def testAtoms(self):
@@ -101,7 +101,7 @@ def testAtoms(self):
101101

102102
# Make sure the atom is still valid. We don't want RemoveAtom deleting
103103
# the memory for an object we still have access to.
104-
self.assertEquals(a.X, x)
104+
self.assertEqual(a.X, x)
105105

106106
# Check to see if a is in our list
107107
for i in xrange(59):
@@ -121,9 +121,9 @@ def testAtoms(self):
121121
self.m.RemoveAtom(a)
122122

123123
atoms = self.m.GetAtomList()
124-
self.assertEquals(0, len(atoms))
124+
self.assertEqual(0, len(atoms))
125125

126-
self.assertEquals(0, self.m.GetNbAtoms())
126+
self.assertEqual(0, self.m.GetNbAtoms())
127127

128128
return
129129

@@ -186,7 +186,7 @@ def testBonds(self):
186186

187187
# Remove the bond
188188
bonds = self.m.GetBondList()
189-
self.assertEquals(1, len(bonds))
189+
self.assertEqual(1, len(bonds))
190190
self.m.RemoveBond(bonds[0])
191191
# is the bond still in existance?
192192
self.assertEqual(name, bond8.GetName())
@@ -201,7 +201,7 @@ def testBonds(self):
201201
a = bond10.GetAtom1()
202202
# Try to remove that atom
203203
self.m.RemoveAtom(a)
204-
self.assertEquals(0, self.m.GetNbBonds())
204+
self.assertEqual(0, self.m.GetNbBonds())
205205

206206
return
207207

@@ -259,7 +259,7 @@ def testBondAngles(self):
259259

260260
# Remove the bond angle
261261
angles = self.m.GetBondAngleList()
262-
self.assertEquals(1, len(angles))
262+
self.assertEqual(1, len(angles))
263263
self.m.RemoveBondAngle(angles[0])
264264
# is the object still in existance?
265265
self.assertEqual(name, ba8.GetName())
@@ -274,7 +274,7 @@ def testBondAngles(self):
274274
a = ba10.GetAtom1()
275275
# Try to remove that atom
276276
self.m.RemoveAtom(a)
277-
self.assertEquals(0, self.m.GetNbBondAngles())
277+
self.assertEqual(0, self.m.GetNbBondAngles())
278278
return
279279

280280
def testDihedralAngles(self):
@@ -328,7 +328,7 @@ def testDihedralAngles(self):
328328

329329
# Remove the dihedral angle
330330
angles = self.m.GetDihedralAngleList()
331-
self.assertEquals(1, len(angles))
331+
self.assertEqual(1, len(angles))
332332
self.m.RemoveDihedralAngle(angles[0])
333333
# is the object still in existance?
334334
self.assertEqual(name, da8.GetName())
@@ -343,29 +343,29 @@ def testDihedralAngles(self):
343343
a = da10.GetAtom1()
344344
# Try to remove that atom
345345
self.m.RemoveAtom(a)
346-
self.assertEquals(0, self.m.GetNbDihedralAngles())
346+
self.assertEqual(0, self.m.GetNbDihedralAngles())
347347

348348
return
349349

350350
def testRigidGroup(self):
351351
"""Test adding and manipulating a rigid group."""
352352
# A rigid group has the interface of a set
353-
self.assertEquals(0, len(self.m.GetRigidGroupList()))
354-
self.assertEquals(0, self.m.GetNbRigidGroups())
353+
self.assertEqual(0, len(self.m.GetRigidGroupList()))
354+
self.assertEqual(0, self.m.GetNbRigidGroups())
355355
rg = self.m.AddRigidGroup(self.m.GetAtomList())
356-
self.assertEquals(1, self.m.GetNbRigidGroups())
356+
self.assertEqual(1, self.m.GetNbRigidGroups())
357357
rgl = self.m.GetRigidGroupList()
358-
self.assertEquals(1, len(rgl))
359-
self.assertEquals(60, len(rgl[0]))
358+
self.assertEqual(1, len(rgl))
359+
self.assertEqual(60, len(rgl[0]))
360360

361361
# We would like to check to see if the atoms are the same, but the
362362
# rigid group is a set, not a list.
363363

364364
# Test to see if we can remove the list.
365365
self.m.RemoveRigidGroup(rg)
366-
self.assertEquals(0, self.m.GetNbRigidGroups())
366+
self.assertEqual(0, self.m.GetNbRigidGroups())
367367
rgl = self.m.GetRigidGroupList()
368-
self.assertEquals(0, len(rgl))
368+
self.assertEqual(0, len(rgl))
369369

370370
return
371371

@@ -384,15 +384,15 @@ def testManipulation(self):
384384

385385
self.m.TranslateAtomGroup(self.m.GetAtomList(), 0, 0, 0.5)
386386

387-
self.assertAlmostEquals(x, a0.X)
388-
self.assertAlmostEquals(y, a0.Y)
389-
self.assertAlmostEquals(z+0.5, a0.Z)
387+
self.assertAlmostEqual(x, a0.X)
388+
self.assertAlmostEqual(y, a0.Y)
389+
self.assertAlmostEqual(z+0.5, a0.Z)
390390

391391
# Move them back
392392
self.m.TranslateAtomGroup(self.m.GetAtomList(), 0, 0, -0.5)
393-
self.assertAlmostEquals(x, a0.X)
394-
self.assertAlmostEquals(y, a0.Y)
395-
self.assertAlmostEquals(z, a0.Z)
393+
self.assertAlmostEqual(x, a0.X)
394+
self.assertAlmostEqual(y, a0.Y)
395+
self.assertAlmostEqual(z, a0.Z)
396396

397397
# Rotate the atoms
398398

@@ -406,9 +406,9 @@ def testManipulation(self):
406406
for i in range(len(self.m)):
407407
xyzi = xyz[i]
408408
newxyz = numpy.dot(rm, xyzi)
409-
self.assertAlmostEquals(newxyz[0], self.m[i].X, 6)
410-
self.assertAlmostEquals(newxyz[1], self.m[i].Y, 6)
411-
self.assertAlmostEquals(newxyz[2], self.m[i].Z, 6)
409+
self.assertAlmostEqual(newxyz[0], self.m[i].X, 6)
410+
self.assertAlmostEqual(newxyz[1], self.m[i].Y, 6)
411+
self.assertAlmostEqual(newxyz[2], self.m[i].Z, 6)
412412

413413
return
414414

@@ -437,38 +437,38 @@ def testAccessors(self):
437437
self.assertEqual("test", a.GetName())
438438

439439
# Test xyz & occ Get/Set
440-
self.assertAlmostEquals(3.451266498, a.X, numplaces)
441-
self.assertAlmostEquals(0.685, a.Y, numplaces)
442-
self.assertAlmostEquals(0, a.Z, numplaces)
443-
self.assertAlmostEquals(1.0, a.Occupancy, numplaces)
440+
self.assertAlmostEqual(3.451266498, a.X, numplaces)
441+
self.assertAlmostEqual(0.685, a.Y, numplaces)
442+
self.assertAlmostEqual(0, a.Z, numplaces)
443+
self.assertAlmostEqual(1.0, a.Occupancy, numplaces)
444444

445445
a.x = 3.40
446446
a.y = 0.68
447447
a.z = 0.1
448448
a.occ = 1.02
449449

450-
self.assertAlmostEquals(3.40, a.x, numplaces)
451-
self.assertAlmostEquals(0.68, a.y, numplaces)
452-
self.assertAlmostEquals(0.1, a.z, numplaces)
453-
self.assertAlmostEquals(1.02, a.occ, numplaces)
450+
self.assertAlmostEqual(3.40, a.x, numplaces)
451+
self.assertAlmostEqual(0.68, a.y, numplaces)
452+
self.assertAlmostEqual(0.1, a.z, numplaces)
453+
self.assertAlmostEqual(1.02, a.occ, numplaces)
454454

455455
# Test GetMolecule. We can't expect the python object to be the same as
456456
# our molecule above. However, we can verify that it points to the same
457457
# object.
458458
m = a.GetMolecule()
459-
self.assertEquals(m.GetName(), self.m.GetName())
459+
self.assertEqual(m.GetName(), self.m.GetName())
460460
# Change something with the molecule, and check to see if it appears in
461461
# self.m
462462
m.GetAtom("C1").Occupancy = 0.1
463-
self.assertAlmostEquals(0.1, self.m.GetAtom("C1").Occupancy, numplaces)
463+
self.assertAlmostEqual(0.1, self.m.GetAtom("C1").Occupancy, numplaces)
464464

465465
# Test IsDummy
466466
self.assertFalse(a.IsDummy())
467467

468468
# Test GetScatteringPower
469469
sp = a.GetScatteringPower()
470-
self.assertEquals("ScatteringPowerAtom", sp.GetClassName())
471-
self.assertEquals("C", sp.GetName())
470+
self.assertEqual("ScatteringPowerAtom", sp.GetClassName())
471+
self.assertEqual("C", sp.GetName())
472472

473473
# Test Ring Get/Set
474474
self.assertFalse(a.IsInRing())
@@ -707,20 +707,20 @@ def testStretchModeBondLength(self):
707707
sm = StretchModeBondLength(atop, abot, None)
708708
sm.AddAtom(abot)
709709

710-
self.assertEquals(sm.mpAtom0.GetName(), atop.GetName())
711-
self.assertEquals(sm.mpAtom1.GetName(), abot.GetName())
710+
self.assertEqual(sm.mpAtom0.GetName(), atop.GetName())
711+
self.assertEqual(sm.mpAtom1.GetName(), abot.GetName())
712712

713713
# Stretch the bond by 5%
714714
delta = 0.05 * d0
715715
sm.Stretch(delta)
716716

717717
# Make sure this does what we expected
718718
d1 = GetBondLength(atop, abot)
719-
self.assertAlmostEquals(d0+delta, d1, 6)
719+
self.assertAlmostEqual(d0+delta, d1, 6)
720720

721721
# Note that only the second atom has moved
722722
dc1 = GetBondLength(ac, atop)
723-
self.assertAlmostEquals(dc0, dc1)
723+
self.assertAlmostEqual(dc0, dc1)
724724

725725
return
726726

@@ -752,9 +752,9 @@ def testStretchModeBondAngle(self):
752752
sm = StretchModeBondAngle(a1, ac, a2, None)
753753
sm.AddAtom(a2)
754754

755-
self.assertEquals(sm.mpAtom0.GetName(), a1.GetName())
756-
self.assertEquals(sm.mpAtom1.GetName(), ac.GetName())
757-
self.assertEquals(sm.mpAtom2.GetName(), a2.GetName())
755+
self.assertEqual(sm.mpAtom0.GetName(), a1.GetName())
756+
self.assertEqual(sm.mpAtom1.GetName(), ac.GetName())
757+
self.assertEqual(sm.mpAtom2.GetName(), a2.GetName())
758758

759759

760760
# Stretch the angle by 5%
@@ -763,7 +763,7 @@ def testStretchModeBondAngle(self):
763763

764764
# Make sure this does what we expected
765765
angle1 = GetBondAngle(a1, ac, a2)
766-
self.assertAlmostEquals(angle0+delta, angle1, 6)
766+
self.assertAlmostEqual(angle0+delta, angle1, 6)
767767

768768
return
769769

@@ -797,16 +797,16 @@ def testStretchModeTorsion(self):
797797
# Add the last atom so it can rotate
798798
sm.AddAtom(a2)
799799

800-
self.assertEquals(sm.mpAtom1.GetName(), ac0.GetName())
801-
self.assertEquals(sm.mpAtom2.GetName(), ac1.GetName())
800+
self.assertEqual(sm.mpAtom1.GetName(), ac0.GetName())
801+
self.assertEqual(sm.mpAtom2.GetName(), ac1.GetName())
802802

803803
# Stretch the angle by 5%
804804
delta = 0.25 * angle0
805805
sm.Stretch(delta)
806806

807807
# Make sure this does what we expected
808808
angle1 = GetDihedralAngle(a1, ac0, ac1, a2)
809-
self.assertAlmostEquals(angle0+delta, angle1, 6)
809+
self.assertAlmostEqual(angle0+delta, angle1, 6)
810810

811811
return
812812

0 commit comments

Comments
 (0)