Skip to content

Commit

Permalink
Modernize assertEquals->assertEqual
Browse files Browse the repository at this point in the history
This eliminates one set of warnings in the unit tests,
leaving 4 warnings from numpy:
`RuntimeWarning: invalid value encountered in true_divide`
  • Loading branch information
r-owen committed Sep 13, 2017
1 parent 0bc1983 commit 7dcc60c
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions tests/test_append.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,12 @@ def test_AppendFrames(self):
set2 = self.makeFrameSet(3, 2)
set12 = append(set1, set2)

self.assertEquals(set1.nFrame + set2.nFrame,
set12.nFrame)
self.assertEqual(set1.nFrame + set2.nFrame, set12.nFrame)
for i in range(1, 1+set1.nFrame):
oldFrame = set1.getFrame(i)
newFrame = set12.getFrame(i)
self.assertEquals(oldFrame.ident, newFrame.ident)
self.assertEquals(oldFrame.nAxes, newFrame.nAxes)
self.assertEqual(oldFrame.ident, newFrame.ident)
self.assertEqual(oldFrame.nAxes, newFrame.nAxes)
if i == set1.base:
self.assertTrue(i == set12.base)
else:
Expand All @@ -93,8 +92,8 @@ def test_AppendFrames(self):
offset = set1.nFrame
oldFrame = set2.getFrame(i)
newFrame = set12.getFrame(offset + i)
self.assertEquals(oldFrame.ident, newFrame.ident)
self.assertEquals(oldFrame.nAxes, newFrame.nAxes)
self.assertEqual(oldFrame.ident, newFrame.ident)
self.assertEqual(oldFrame.nAxes, newFrame.nAxes)
if i == set2.current:
self.assertTrue(offset + i == set12.current)
else:
Expand All @@ -119,8 +118,8 @@ def test_AppendIndependent(self):
set2.base = 2

# Use exact equality because nothing should change
self.assertEquals(set12.nFrame, nTotal)
self.assertEquals(set12.applyForward(x), y)
self.assertEqual(set12.nFrame, nTotal)
self.assertEqual(set12.applyForward(x), y)

def test_AppendMismatch(self):
"""Check that append behaves as expected when joining non-identical frames.
Expand Down

0 comments on commit 7dcc60c

Please sign in to comment.