From 0deeb1c805265a7d263496db92414efff319d9b5 Mon Sep 17 00:00:00 2001 From: Mats Linander Date: Tue, 20 Feb 2024 17:51:48 -0500 Subject: [PATCH] test: s/assertEquals/assertEqual/ --- test/386_linux_test.py | 2 +- test/backend.py | 4 ++-- test/frontend_test.py | 14 +++++++------- test/go_test.py | 2 +- test/java_test.py | 2 +- test/lang_c_test.py | 4 ++-- test/ruby_test.py | 2 +- test/tcl_test.py | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/386_linux_test.py b/test/386_linux_test.py index 43fba09..231076c 100644 --- a/test/386_linux_test.py +++ b/test/386_linux_test.py @@ -13,7 +13,7 @@ def run_program(self, path, input): stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdout, stderr = p.communicate(input) - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) return stdout def test_deep_nested_loops(self): diff --git a/test/backend.py b/test/backend.py index 9b78a79..b184313 100644 --- a/test/backend.py +++ b/test/backend.py @@ -83,9 +83,9 @@ def run_ir(self, code, input, expected_output, steps=5000000): # compare output for i, (o, e) in enumerate(zip(prog_out, expected_output)): - self.assertEquals(o, e, "outputs differ at position %d: " + self.assertEqual(o, e, "outputs differ at position %d: " "expected %d, got %d" % (i, e, o)) - self.assertEquals(len(prog_out), len(expected_output)) + self.assertEqual(len(prog_out), len(expected_output)) def test_empty_program(self): self.run_ir([],[],[]) diff --git a/test/frontend_test.py b/test/frontend_test.py index d05602b..b59756f 100644 --- a/test/frontend_test.py +++ b/test/frontend_test.py @@ -25,12 +25,12 @@ def _check_post_condition(self, mem, code, target=None, maxdepth=None): self.assert_(len(mem) >= 6, "post exec memory must span at least 6 " "cells, only got %d" % len(mem)) if target is not None: - self.assertEquals(mem[0], target, + self.assertEqual(mem[0], target, "bad target platform (%d!=%d)" % (mem[0],target)) else: self.assert_(mem[0] in (_LANG_C, _386_LINUX), "frontend chose bad target platform T (=%d)" % mem[0]) - self.assertEquals(mem[1], 0, "frontend should leave cell 1 blank") + self.assertEqual(mem[1], 0, "frontend should leave cell 1 blank") self.assert_(mem[2], "frontend marked bytecode as not OK") # find end of compiled code block @@ -43,7 +43,7 @@ def _check_post_condition(self, mem, code, target=None, maxdepth=None): self.assert_( not (len(mem) > i+3), "junk data beyond max loop depth") if maxdepth is not None: Mm = mem[i+1]*0xff + mem[i+2] - self.assertEquals(Mm, maxdepth, "wrong max depth, got %d not %d" % + self.assertEqual(Mm, maxdepth, "wrong max depth, got %d not %d" % (Mm, maxdepth)) @@ -69,7 +69,7 @@ def _check_post_condition(self, mem, code, target=None, maxdepth=None): def _run_and_check_ir(self, program, ir, maxdepth=1): out, mem = self.run_bf(self.code, program, precondition=[1], steps=10000000) - self.assertEquals(out, [], "frontend should not produce output") + self.assertEqual(out, [], "frontend should not produce output") self._check_post_condition(mem, ir, maxdepth=maxdepth) def test_empty_input(self): @@ -419,7 +419,7 @@ def _run_and_check_target(self, default_target, target, program, ir=[]): default_target = 17 # some target out, mem = self.run_bf(self.code, program, precondition=[default_target], steps=500000) - self.assertEquals(out, [], "frontend should not produce output") + self.assertEqual(out, [], "frontend should not produce output") self._check_post_condition(mem, ir, target=target) def test_target_empty(self): @@ -470,9 +470,9 @@ def test_target_386_linux(self): def _run_and_check_mismatched(self, program): out, mem = self.run_bf(self.code, program, precondition=[1], steps=5000000) - self.assertEquals(''.join(chr(c) for c in out), + self.assertEqual(''.join(chr(c) for c in out), 'Error: unbalanced brackets!\n') - self.assertEquals(mem[2], 0, "code should not be marked as ok") + self.assertEqual(mem[2], 0, "code should not be marked as ok") def test_unbalanced_loop(self): self._run_and_check_mismatched("[") diff --git a/test/go_test.py b/test/go_test.py index e56228b..b087d8e 100644 --- a/test/go_test.py +++ b/test/go_test.py @@ -15,7 +15,7 @@ def run_program(self, path, input): stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdout, stderr = p.communicate(input) - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) return stdout diff --git a/test/java_test.py b/test/java_test.py index 2768cd4..585d23c 100644 --- a/test/java_test.py +++ b/test/java_test.py @@ -17,7 +17,7 @@ def run_program(self, path, input): stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdout, stderr = p.communicate(input) - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) return stdout def test_deep_nested_loops(self): diff --git a/test/lang_c_test.py b/test/lang_c_test.py index 11eace0..2ed37b0 100644 --- a/test/lang_c_test.py +++ b/test/lang_c_test.py @@ -15,7 +15,7 @@ def __init__(self, *args, **kwargs): p = subprocess.Popen(['gcc', '-v'], stderr=subprocess.PIPE) stdout, stderr = p.communicate() - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) if "clang" in stderr.decode("utf-8"): self.cc_flags = ["-fbracket-depth=512"] @@ -27,7 +27,7 @@ def run_program(self, path, input): stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdout, stderr = p.communicate(input) - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) return stdout diff --git a/test/ruby_test.py b/test/ruby_test.py index b845b5e..95b4136 100644 --- a/test/ruby_test.py +++ b/test/ruby_test.py @@ -12,7 +12,7 @@ def run_program(self, path, input): stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdout, stderr = p.communicate(input) - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) return stdout diff --git a/test/tcl_test.py b/test/tcl_test.py index e260817..67fcb76 100644 --- a/test/tcl_test.py +++ b/test/tcl_test.py @@ -12,7 +12,7 @@ def run_program(self, path, input): stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdout, stderr = p.communicate(input) - self.assertEquals(p.returncode, 0) + self.assertEqual(p.returncode, 0) return stdout