@@ -83,7 +83,7 @@ def testAtoms(self):
83
83
This tests GetAtom.
84
84
85
85
"""
86
- self .assertTrue (60 , self .m .GetNbAtoms ())
86
+ self .assertEqual (60 , self .m .GetNbAtoms ())
87
87
for i in range (60 ):
88
88
a1 = self .m .GetAtom (i )
89
89
self .assertEqual (a1 .GetName (), "C%i" % i )
@@ -92,11 +92,11 @@ def testAtoms(self):
92
92
x = a .X
93
93
sp = a .GetScatteringPower ()
94
94
95
- self .assertTrue (60 , self .m .GetNbAtoms ())
95
+ self .assertEqual (60 , self .m .GetNbAtoms ())
96
96
97
97
self .m .RemoveAtom (a )
98
98
99
- self .assertTrue (59 , self .m .GetNbAtoms ())
99
+ self .assertEqual (59 , self .m .GetNbAtoms ())
100
100
101
101
# Make sure the atom is still valid. We don't want RemoveAtom deleting
102
102
# the memory for an object we still have access to.
@@ -431,9 +431,9 @@ def testAccessors(self):
431
431
a = self .a
432
432
433
433
# Test name Get/Set
434
- self .assertTrue ( a .GetName (), "C0" )
434
+ self .assertEqual ( "C0" , a .GetName ())
435
435
a .SetName ("test" )
436
- self .assertTrue ( a .GetName (), "test" )
436
+ self .assertEqual ( "test" , a .GetName ())
437
437
438
438
# Test xyz & occ Get/Set
439
439
self .assertAlmostEquals (3.451266498 , a .X , numplaces )
@@ -508,7 +508,7 @@ def testAccessors(self):
508
508
a2 = self .a2
509
509
510
510
# Check the name
511
- self .assertTrue ("C0-C1" , b .GetName ())
511
+ self .assertEqual ("C0-C1" , b .GetName ())
512
512
513
513
# Get the atoms
514
514
at1 = b .GetAtom1 ()
@@ -571,7 +571,7 @@ def testAccessors(self):
571
571
a3 = self .a3
572
572
573
573
# Check the name
574
- self .assertTrue ("C0-C1-C2" , ba .GetName ())
574
+ self .assertEqual ("C0-C1-C2" , ba .GetName ())
575
575
576
576
# Get the atoms
577
577
at1 = ba .GetAtom1 ()
@@ -637,7 +637,7 @@ def testAccessors(self):
637
637
a4 = self .a4
638
638
639
639
# Check the name
640
- self .assertTrue ("C0-C1-C2-C3" , da .GetName ())
640
+ self .assertEqual ("C0-C1-C2-C3" , da .GetName ())
641
641
642
642
# Get the atoms
643
643
at1 = da .GetAtom1 ()
0 commit comments