Skip to content

Commit eea91cb

Browse files
committed
Use assertEqual instead of assertEquals
1 parent e631b42 commit eea91cb

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

Tests/test_array.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,17 @@ def test_creation(self):
159159
def test_constructor(self):
160160
array1 = System.Array[int](10)
161161
array2 = System.Array.CreateInstance(System.Int32, 10)
162-
self.assertEquals(len(array1), len(array2))
162+
self.assertEqual(len(array1), len(array2))
163163
for i in range(len(array1)):
164-
self.assertEquals(array1[i], 0)
165-
self.assertEquals(array1[i], array2[i])
164+
self.assertEqual(array1[i], 0)
165+
self.assertEqual(array1[i], array2[i])
166166

167167
# 2-dimensional
168168
array3 = System.Array[System.Byte](3, 4)
169-
self.assertEquals(array3.Rank, 2)
169+
self.assertEqual(array3.Rank, 2)
170170
for x in range(array3.GetLength(0)):
171171
for y in range(array3.GetLength(1)):
172-
self.assertEquals(array3[x, y], 0)
172+
self.assertEqual(array3[x, y], 0)
173173

174174
def test_nonzero_lowerbound(self):
175175
a = System.Array.CreateInstance(int, (5,), (5,))

Tests/test_bytes.py

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -607,60 +607,60 @@ def test_iterator_length_hint(self):
607607
b = testType(b"abc")
608608

609609
it = iter(b)
610-
self.assertEquals(it.__length_hint__(), 3)
611-
self.assertEquals(next(it), ord("a"))
612-
self.assertEquals(it.__length_hint__(), 2)
613-
self.assertEquals(next(it), ord("b"))
614-
self.assertEquals(it.__length_hint__(), 1)
615-
self.assertEquals(next(it), ord("c"))
616-
self.assertEquals(it.__length_hint__(), 0)
610+
self.assertEqual(it.__length_hint__(), 3)
611+
self.assertEqual(next(it), ord("a"))
612+
self.assertEqual(it.__length_hint__(), 2)
613+
self.assertEqual(next(it), ord("b"))
614+
self.assertEqual(it.__length_hint__(), 1)
615+
self.assertEqual(next(it), ord("c"))
616+
self.assertEqual(it.__length_hint__(), 0)
617617

618618
self.assertRaises(StopIteration, next, it)
619-
self.assertEquals(it.__length_hint__(), 0)
619+
self.assertEqual(it.__length_hint__(), 0)
620620

621621
def test_iterator_reduce(self):
622622
for testType in types:
623623
b = testType(b"abc")
624624

625625
it = iter(b)
626-
self.assertEquals(it.__reduce__(), (iter, (b"abc",), 0))
627-
self.assertEquals(next(it), ord("a"))
628-
self.assertEquals(it.__reduce__(), (iter, (b"abc",), 1))
629-
self.assertEquals(next(it), ord("b"))
630-
self.assertEquals(it.__reduce__(), (iter, (b"abc",), 2))
631-
self.assertEquals(next(it), ord("c"))
632-
self.assertEquals(it.__reduce__(), (iter, (b"abc",), 3))
626+
self.assertEqual(it.__reduce__(), (iter, (b"abc",), 0))
627+
self.assertEqual(next(it), ord("a"))
628+
self.assertEqual(it.__reduce__(), (iter, (b"abc",), 1))
629+
self.assertEqual(next(it), ord("b"))
630+
self.assertEqual(it.__reduce__(), (iter, (b"abc",), 2))
631+
self.assertEqual(next(it), ord("c"))
632+
self.assertEqual(it.__reduce__(), (iter, (b"abc",), 3))
633633

634634
self.assertRaises(StopIteration, next, it)
635635
empty_reduce = it.__reduce__()
636-
self.assertEquals(len(empty_reduce), 2)
637-
self.assertEquals(empty_reduce[0], iter)
638-
self.assertEquals(len(empty_reduce[1]), 1)
639-
self.assertEquals(len(empty_reduce[1][0]), 0)
636+
self.assertEqual(len(empty_reduce), 2)
637+
self.assertEqual(empty_reduce[0], iter)
638+
self.assertEqual(len(empty_reduce[1]), 1)
639+
self.assertEqual(len(empty_reduce[1][0]), 0)
640640

641641
it = iter(testType(b""))
642-
self.assertEquals(it.__reduce__(), (iter, (b"",), 0))
642+
self.assertEqual(it.__reduce__(), (iter, (b"",), 0))
643643

644644
def test_iterator_setstate(self):
645645
for testType in types:
646646
b = testType(b"abc")
647647

648648
it = iter(b)
649-
self.assertEquals(next(it), ord("a"))
650-
self.assertEquals(next(it), ord("b"))
651-
self.assertEquals(next(it), ord("c"))
649+
self.assertEqual(next(it), ord("a"))
650+
self.assertEqual(next(it), ord("b"))
651+
self.assertEqual(next(it), ord("c"))
652652
self.assertRaises(StopIteration, next, it)
653653

654654
it = iter(b)
655-
self.assertEquals(next(it), ord("a"))
655+
self.assertEqual(next(it), ord("a"))
656656
it.__setstate__(0)
657-
self.assertEquals(next(it), ord("a"))
657+
self.assertEqual(next(it), ord("a"))
658658
it.__setstate__(-10)
659-
self.assertEquals(next(it), ord("a"))
659+
self.assertEqual(next(it), ord("a"))
660660
it.__setstate__(2)
661-
self.assertEquals(next(it), ord("c"))
661+
self.assertEqual(next(it), ord("c"))
662662
it.__setstate__(1)
663-
self.assertEquals(next(it), ord("b"))
663+
self.assertEqual(next(it), ord("b"))
664664
it.__setstate__(3)
665665
self.assertRaises(StopIteration, next, it)
666666
it.__setstate__(0)

Tests/test_iterator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def test_discarded_indexer_reduces_empty(self):
299299
list(it)
300300
with self.assertRaises(StopIteration):
301301
it.__next__()
302-
self.assertEquals(it.__reduce__(), (iter, ((),)))
302+
self.assertEqual(it.__reduce__(), (iter, ((),)))
303303
# Ensure that the iterator is discarded instead of being
304304
# reset by __setstate__()
305305
it.__setstate__(0)

Tests/test_str.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ def __str__(self) -> str:
307307

308308
self.assertIs(type(repr(A())), mystr)
309309
self.assertIs(type(str(A())), mystr)
310-
self.assertEquals(repr(A()), "__repr__ called")
311-
self.assertEquals(str(A()), "__str__ called")
310+
self.assertEqual(repr(A()), "__repr__ called")
311+
self.assertEqual(str(A()), "__str__ called")
312312

313313
@skipUnlessIronPython()
314314
def test_str_char_hash(self):

0 commit comments

Comments
 (0)