diff --git a/kitty_tests/__init__.py b/kitty_tests/__init__.py index 6a7e2cc32..306f99e94 100644 --- a/kitty_tests/__init__.py +++ b/kitty_tests/__init__.py @@ -83,17 +83,3 @@ class BaseTest(TestCase): self.assertEqual(c1, c2) finally: c1.x, c1.y, c2.x, c2.y = x1, y1, x2, y2 - - def assertChanges(self, s, ignore='', **expected_changes): - actual_changes = s.consolidate_changes() - ignore = frozenset(ignore.split()) - for k, v in actual_changes.items(): - if k not in ignore: - if isinstance(v, dict): - v = {ky: tuple(vy) for ky, vy in v.items()} - if k == 'lines': - v = set(v) - if k in expected_changes: - self.ae(expected_changes[k], v) - else: - self.assertFalse(v, 'The property {} was expected to be empty but is: {}'.format(k, v)) diff --git a/kitty_tests/screen.py b/kitty_tests/screen.py index fb5c2ee7b..8ded76a81 100644 --- a/kitty_tests/screen.py +++ b/kitty_tests/screen.py @@ -18,7 +18,6 @@ class TestScreen(BaseTest): s.draw('a' * 5) self.ae(str(s.line(0)), 'a' * 5) self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 0) - self.assertChanges(s, ignore='cursor', cells={0: ((0, 4),)}) s.draw('b' * 7) self.assertTrue(s.linebuf.is_continued(1)) self.assertTrue(s.linebuf.is_continued(2)) @@ -26,7 +25,6 @@ class TestScreen(BaseTest): self.ae(str(s.line(1)), 'b' * 5) self.ae(str(s.line(2)), 'b' * 2 + ' ' * 3) self.ae(s.cursor.x, 2), self.ae(s.cursor.y, 2) - self.assertChanges(s, ignore='cursor', cells={1: ((0, 4),), 2: ((0, 1),)}) s.draw('c' * 15) self.ae(str(s.line(0)), 'b' * 5) self.ae(str(s.line(1)), 'bbccc') @@ -37,11 +35,9 @@ class TestScreen(BaseTest): s.draw('0123456789') self.ae(str(s.line(0)), '01239') self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 0) - self.assertChanges(s, ignore='cursor', cells={0: ((0, 4),)}) s.draw('ab') self.ae(str(s.line(0)), '0123b') self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 0) - self.assertChanges(s, ignore='cursor', cells={0: ((4, 4),)}) # Now test in insert mode s.reset(), s.reset_dirty() @@ -53,7 +49,6 @@ class TestScreen(BaseTest): s.draw('ab') self.ae(str(s.line(4)), 'ab123') self.ae((s.cursor.x, s.cursor.y), (2, 4)) - self.assertChanges(s, ignore='cursor', cells={4: ((0, 4),)}) @skipIf('ANCIENT_WCWIDTH' in os.environ, 'wcwidth() is too old') def test_draw_char(self): @@ -63,21 +58,17 @@ class TestScreen(BaseTest): self.ae(str(s.line(0)), 'ココx') self.ae(tuple(map(s.line(0).width, range(5))), (2, 0, 2, 0, 1)) self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 0) - self.assertChanges(s, ignore='cursor', cells={0: ((0, 4),)}) s.draw('ニチハ') self.ae(str(s.line(0)), 'ココx') self.ae(str(s.line(1)), 'ニチ ') self.ae(str(s.line(2)), 'ハ ') - self.assertChanges(s, ignore='cursor', cells={1: ((0, 3),), 2: ((0, 1),)}) self.ae(s.cursor.x, 2), self.ae(s.cursor.y, 2) s.draw('Ƶ̧\u0308') self.ae(str(s.line(2)), 'ハƵ̧\u0308 ') self.ae(s.cursor.x, 3), self.ae(s.cursor.y, 2) - self.assertChanges(s, ignore='cursor', cells={2: ((2, 2),)}) s.draw('xy'), s.draw('\u0306') self.ae(str(s.line(2)), 'ハƵ̧\u0308xy\u0306') self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 2) - self.assertChanges(s, ignore='cursor', cells={2: ((3, 4),)}) s.draw('c' * 15) self.ae(str(s.line(0)), 'ニチ ') @@ -87,11 +78,9 @@ class TestScreen(BaseTest): s.draw('0\u030612345\u03066789\u0306') self.ae(str(s.line(0)), '0\u03061239\u0306') self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 0) - self.assertChanges(s, ignore='cursor', cells={0: ((0, 4),)}) s.draw('ab\u0306') self.ae(str(s.line(0)), '0\u0306123b\u0306') self.ae(s.cursor.x, 5), self.ae(s.cursor.y, 0) - self.assertChanges(s, ignore='cursor', cells={0: ((4, 4),)}) # Now test in insert mode s.reset(), s.reset_dirty() @@ -103,7 +92,6 @@ class TestScreen(BaseTest): s.draw('a\u0306b') self.ae(str(s.line(4)), 'a\u0306b1\u030623') self.ae((s.cursor.x, s.cursor.y), (2, 4)) - self.assertChanges(s, ignore='cursor', cells={4: ((0, 4),)}) @skipIf('ANCIENT_WCWIDTH' in os.environ, 'wcwidth() is too old') def test_char_manipulation(self): @@ -121,17 +109,14 @@ class TestScreen(BaseTest): s.insert_characters(2) self.ae(str(s.line(0)), 'a bc') self.assertTrue(s.line(0).cursor_from(1).bold) - self.assertChanges(s, ignore='cursor', cells={0: ((1, 4),)}) s.cursor_back(1) s.insert_characters(20) self.ae(str(s.line(0)), ' ') - self.assertChanges(s, ignore='cursor', cells={0: ((0, 4),)}) s.draw('xココ') s.cursor_back(5) s.reset_dirty() s.insert_characters(1) self.ae(str(s.line(0)), ' xコ ') - self.assertChanges(s, ignore='cursor', cells={0: ((0, 4),)}) c = Cursor() c.italic = True s.line(0).apply_cursor(c, 0, 5) @@ -144,14 +129,12 @@ class TestScreen(BaseTest): self.ae(str(s.line(0)), 'ade ') self.assertTrue(s.line(0).cursor_from(4).bold) self.assertFalse(s.line(0).cursor_from(2).bold) - self.assertChanges(s, ignore='cursor', cells={0: ((1, 4),)}) init() s.erase_characters(2) self.ae(str(s.line(0)), 'a de') self.assertTrue(s.line(0).cursor_from(1).bold) self.assertFalse(s.line(0).cursor_from(4).bold) - self.assertChanges(s, cells={0: ((1, 2),)}) s.erase_characters(20) self.ae(str(s.line(0)), 'a ') @@ -160,15 +143,12 @@ class TestScreen(BaseTest): self.ae(str(s.line(0)), 'a ') self.assertTrue(s.line(0).cursor_from(1).bold) self.assertFalse(s.line(0).cursor_from(0).bold) - self.assertChanges(s, cells={0: ((1, 4),)}) init() s.erase_in_line(1) self.ae(str(s.line(0)), ' cde') - self.assertChanges(s, cells={0: ((0, 1),)}) init() s.erase_in_line(2) self.ae(str(s.line(0)), ' ') - self.assertChanges(s, cells={0: ((0, 4),)}) init() s.erase_in_line(2, True) self.ae((False, False, False, False, False), tuple(map(lambda i: s.line(0).cursor_from(i).bold, range(5)))) @@ -189,22 +169,18 @@ class TestScreen(BaseTest): init() s.erase_in_display() self.ae(all_lines(s), ('12345', '12 ', ' ', ' ', ' ')) - self.assertChanges(s, lines={2, 3, 4}, cells={1: ((2, 4),)}) init() s.erase_in_display(1) self.ae(all_lines(s), (' ', ' 45', '12345', '12345', '12345')) - self.assertChanges(s, lines={0}, cells={1: ((0, 2),)}) init() s.erase_in_display(2) self.ae(all_lines(s), (' ', ' ', ' ', ' ', ' ')) - self.assertChanges(s, lines=set(range(5))) self.assertTrue(s.line(0).cursor_from(1).bold) init() s.erase_in_display(2, True) self.ae(all_lines(s), (' ', ' ', ' ', ' ', ' ')) - self.assertChanges(s, lines=set(range(5))) self.assertFalse(s.line(0).cursor_from(1).bold) def test_cursor_movement(self):