Update unittest method names to work with Python 3.12.

2 files changed, 46 insertions, 46 deletions

diff --git a/test/performanceTests.py b/test/performanceTests.py
index e9eff9e6a..2da14db03 100644
--- a/test/performanceTests.py
+++ b/test/performanceTests.py
@@ -28,24 +28,24 @@ class TestPerformance(unittest.TestCase):
 		start = timer()
 		for i in range(2000):
 			self.ed.AddText(len(data), data)
-			self.assertEquals(self.ed.LineCount, i + 2)
+			self.assertEqual(self.ed.LineCount, i + 2)
 		end = timer()
 		duration = end - start
 		print("%6.3f testAddLine" % duration)
 		self.xite.DoEvents()
-		self.assert_(self.ed.Length > 0)
+		self.assertTrue(self.ed.Length > 0)
 
 	def testAddLineMiddle(self):
 		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
 		start = timer()
 		for i in range(2000):
 			self.ed.AddText(len(data), data)
-			self.assertEquals(self.ed.LineCount, i + 2)
+			self.assertEqual(self.ed.LineCount, i + 2)
 		end = timer()
 		duration = end - start
 		print("%6.3f testAddLineMiddle" % duration)
 		self.xite.DoEvents()
-		self.assert_(self.ed.Length > 0)
+		self.assertTrue(self.ed.Length > 0)
 
 	def testHuge(self):
 		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
@@ -56,7 +56,7 @@ class TestPerformance(unittest.TestCase):
 		duration = end - start
 		print("%6.3f testHuge" % duration)
 		self.xite.DoEvents()
-		self.assert_(self.ed.Length > 0)
+		self.assertTrue(self.ed.Length > 0)
 
 	def testHugeInserts(self):
 		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
@@ -70,7 +70,7 @@ class TestPerformance(unittest.TestCase):
 		duration = end - start
 		print("%6.3f testHugeInserts" % duration)
 		self.xite.DoEvents()
-		self.assert_(self.ed.Length > 0)
+		self.assertTrue(self.ed.Length > 0)
 
 	def testHugeReplace(self):
 		oneLine = (string.ascii_letters + string.digits + "\n").encode('utf-8')
@@ -86,7 +86,7 @@ class TestPerformance(unittest.TestCase):
 		duration = end - start
 		print("%6.3f testHugeReplace" % duration)
 		self.xite.DoEvents()
-		self.assert_(self.ed.Length > 0)
+		self.assertTrue(self.ed.Length > 0)
 
 	def testUTF8CaseSearches(self):
 		self.ed.SetCodePage(65001)
@@ -101,7 +101,7 @@ class TestPerformance(unittest.TestCase):
 			self.ed.TargetEnd = self.ed.Length-1
 			self.ed.SearchFlags = self.ed.SCFIND_MATCHCASE
 			pos = self.ed.SearchInTarget(len(searchString), searchString)
-			self.assert_(pos > 0)
+			self.assertTrue(pos > 0)
 		end = timer()
 		duration = end - start
 		print("%6.3f testUTF8CaseSearches" % duration)
@@ -120,7 +120,7 @@ class TestPerformance(unittest.TestCase):
 			self.ed.TargetEnd = self.ed.Length-1
 			self.ed.SearchFlags = 0
 			pos = self.ed.SearchInTarget(len(searchString), searchString)
-			self.assert_(pos > 0)
+			self.assertTrue(pos > 0)
 		end = timer()
 		duration = end - start
 		print("%6.3f testUTF8Searches" % duration)
@@ -139,7 +139,7 @@ class TestPerformance(unittest.TestCase):
 			self.ed.TargetEnd = self.ed.Length-1
 			self.ed.SearchFlags = 0
 			pos = self.ed.SearchInTarget(len(searchString), searchString)
-			self.assert_(pos > 0)
+			self.assertTrue(pos > 0)
 		end = timer()
 		duration = end - start
 		print("%6.3f testUTF8AsciiSearches" % duration)
diff --git a/test/win32Tests.py b/test/win32Tests.py
index d1fc3652f..b50e7b6e9 100644
--- a/test/win32Tests.py
+++ b/test/win32Tests.py
@@ -43,13 +43,13 @@ class TestWins(unittest.TestCase):
 		return self.Send("WM_GETTEXT", n, s)
 
 	def TextValue(self):
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		lenValue = self.GetTextLength()
 		lenValueWithNUL = lenValue + 1
 		value = ctypes.create_unicode_buffer(lenValueWithNUL)
 		lenData = self.GetText(lenValueWithNUL, value)
-		self.assertEquals(self.ed.GetStatus(), 0)
-		self.assertEquals(lenData, lenValue)
+		self.assertEqual(self.ed.GetStatus(), 0)
+		self.assertEqual(lenData, lenValue)
 		return value.value
 
 	def SetText(self, s):
@@ -59,19 +59,19 @@ class TestWins(unittest.TestCase):
 
 	def testSetText(self):
 		self.SetText(b"ab")
-		self.assertEquals(self.ed.Length, 2)
+		self.assertEqual(self.ed.Length, 2)
 
 	def testGetTextLength(self):
 		self.SetText(b"ab")
-		self.assertEquals(self.GetTextLength(), 2)
+		self.assertEqual(self.GetTextLength(), 2)
 
 	def testGetText(self):
 		self.SetText(b"ab")
 		data = ctypes.create_unicode_buffer(100)
 		lenData = self.GetText(100, data)
-		self.assertEquals(lenData, 2)
-		self.assertEquals(len(data.value), 2)
-		self.assertEquals(data.value, "ab")
+		self.assertEqual(lenData, 2)
+		self.assertEqual(len(data.value), 2)
+		self.assertEqual(data.value, "ab")
 
 	def testGetUTF8Text(self):
 		self.ed.SetCodePage(65001)
@@ -79,7 +79,7 @@ class TestWins(unittest.TestCase):
 		tu8 = t.encode("UTF-8")
 		self.SetText(tu8)
 		value = self.TextValue()
-		self.assertEquals(value, t)
+		self.assertEqual(value, t)
 
 	def testGetBadUTF8Text(self):
 		self.ed.SetCodePage(65001)
@@ -87,8 +87,8 @@ class TestWins(unittest.TestCase):
 		t = "t\xc2"
 		self.SetText(tu8)
 		value = self.TextValue()
-		self.assertEquals(len(value), 2)
-		self.assertEquals(value, t)
+		self.assertEqual(len(value), 2)
+		self.assertEqual(value, t)
 
 	def testGetJISText(self):
 		self.ed.SetCodePage(932)
@@ -96,8 +96,8 @@ class TestWins(unittest.TestCase):
 		tu8 = t.encode("shift-jis")
 		self.SetText(tu8)
 		value = self.TextValue()
-		self.assertEquals(len(value), 1)
-		self.assertEquals(value, t)
+		self.assertEqual(len(value), 1)
+		self.assertEqual(value, t)
 
 	def testGetBadJISText(self):
 		self.ed.SetCodePage(932)
@@ -110,24 +110,24 @@ class TestWins(unittest.TestCase):
 		privateBad = '[\uf8f3]'
 		self.SetText(tu8)
 		value = self.TextValue()
-		self.assertEquals(len(value), 3)
-		self.assertEquals(value, katakanaMiddleDot)
+		self.assertEqual(len(value), 3)
+		self.assertEqual(value, katakanaMiddleDot)
 
 		# This is even less valid Shift-JIS
 		tu8 = b'[\xff]'
 		self.SetText(tu8)
 		value = self.TextValue()
-		self.assertEquals(len(value), 3)
-		self.assertEquals(value, privateBad)
+		self.assertEqual(len(value), 3)
+		self.assertEqual(value, privateBad)
 
 	def testGetTextLong(self):
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		self.SetText(b"ab")
 		data = ctypes.create_unicode_buffer(100)
 		lenData = self.GetText(4, data)
-		self.assertEquals(self.ed.GetStatus(), 0)
-		self.assertEquals(lenData, 2)
-		self.assertEquals(data.value, "ab")
+		self.assertEqual(self.ed.GetStatus(), 0)
+		self.assertEqual(lenData, 2)
+		self.assertEqual(data.value, "ab")
 
 	def testGetTextLongNonASCII(self):
 		# With 1 multibyte character in document ask for 4 and ensure 1 character
@@ -138,38 +138,38 @@ class TestWins(unittest.TestCase):
 		self.SetText(tu8)
 		data = ctypes.create_unicode_buffer(100)
 		lenData = self.GetText(4, data)
-		self.assertEquals(self.ed.GetStatus(), 0)
-		self.assertEquals(lenData, 1)
-		self.assertEquals(data.value, t)
+		self.assertEqual(self.ed.GetStatus(), 0)
+		self.assertEqual(lenData, 1)
+		self.assertEqual(data.value, t)
 
 	def testGetTextShort(self):
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		self.SetText(b"ab")
 		data = ctypes.create_unicode_buffer(100)
 		lenData = self.GetText(2, data)
-		self.assertEquals(self.ed.GetStatus(), 0)
-		self.assertEquals(lenData, 1)
-		self.assertEquals(data.value, "a")
+		self.assertEqual(self.ed.GetStatus(), 0)
+		self.assertEqual(lenData, 1)
+		self.assertEqual(data.value, "a")
 
 	def testGetTextJustNUL(self):
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		self.SetText(b"ab")
 		data = ctypes.create_unicode_buffer(100)
 		lenData = self.GetText(1, data)
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		#~ print(data)
-		self.assertEquals(lenData, 0)
-		self.assertEquals(data.value, "")
+		self.assertEqual(lenData, 0)
+		self.assertEqual(data.value, "")
 
 	def testGetTextZeroLength(self):
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		self.SetText(b"ab")
 		data = ctypes.create_unicode_buffer(100)
 		lenData = self.GetText(0, data)
-		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEqual(self.ed.GetStatus(), 0)
 		#~ print(data)
-		self.assertEquals(lenData, 0)
-		self.assertEquals(data.value, "")
+		self.assertEqual(lenData, 0)
+		self.assertEqual(data.value, "")
 
 if __name__ == '__main__':
 	uu = Xite.main("win32Tests")