ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

editor: Remove blanket catch of IndexError in tests

Browse source 
- Occurs when the cursor tries to move out of bounds.
This commit is contained in:
Andrew Hamilton 2022-01-13 19:25:18 +10:00
parent ac340dd0ca
commit 38706e89d4
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/editor_test.py
View file

@ -65,7 +65,6 @@ class EditorTestCase(unittest.TestCase):
self.editor.cursor_x, self.editor.cursor_y = cursor_position self.editor.cursor_x, self.editor.cursor_y = cursor_position
def _assert_change(self, method, expected_text, expected_cursor_position): def _assert_change(self, method, expected_text, expected_cursor_position):
with contextlib.suppress(IndexError):
method() method()
self._assert_editor(expected_text, expected_cursor_position) self._assert_editor(expected_text, expected_cursor_position)
@ -92,7 +91,7 @@ class EditorTestCase(unittest.TestCase):
self._assert_change(self.editor.delete_character, "a\nc", (1, 0)) self._assert_change(self.editor.delete_character, "a\nc", (1, 0))
self._assert_change(self.editor.delete_character, "ac", (1, 0)) self._assert_change(self.editor.delete_character, "ac", (1, 0))
self._assert_change(self.editor.delete_character, "a", (1, 0)) self._assert_change(self.editor.delete_character, "a", (1, 0))
self._assert_change(self.editor.delete_character, "a", (1, 0)) self.assertRaises(IndexError, self.editor.delete_character)
def test_backspace(self): def test_backspace(self):
self._set_editor("a\n" self._set_editor("a\n"
@ -107,14 +106,14 @@ class EditorTestCase(unittest.TestCase):
text = ("a\n" text = ("a\n"
"bc") "bc")
self._set_editor(text, (0, 0)) self._set_editor(text, (0, 0))
self._assert_change(self.editor.cursor_up, text, (0, 0)) self.assertRaises(IndexError, self.editor.cursor_up)
self._assert_change(self.editor.cursor_left, text, (0, 0)) self.assertRaises(IndexError, self.editor.cursor_left)
self._assert_change(self.editor.cursor_right, text, (1, 0)) self._assert_change(self.editor.cursor_right, text, (1, 0))
self._assert_change(self.editor.cursor_right, text, (0, 1)) self._assert_change(self.editor.cursor_right, text, (0, 1))
self._assert_change(self.editor.cursor_left, text, (1, 0)) self._assert_change(self.editor.cursor_left, text, (1, 0))
self._assert_change(self.editor.cursor_down, text, (1, 1)) self._assert_change(self.editor.cursor_down, text, (1, 1))
self._assert_change(self.editor.cursor_right, text, (2, 1)) self._assert_change(self.editor.cursor_right, text, (2, 1))
self._assert_change(self.editor.cursor_right, text, (2, 1)) self.assertRaises(IndexError, self.editor.cursor_right)
self._assert_change(self.editor.cursor_up, text, (1, 0)) self._assert_change(self.editor.cursor_up, text, (1, 0))
self._assert_change(self.editor.cursor_down, text, (2, 1)) self._assert_change(self.editor.cursor_down, text, (2, 1))
self._assert_change(self.editor.jump_to_start_of_line, text, (0, 1)) self._assert_change(self.editor.jump_to_start_of_line, text, (0, 1))
@ -128,20 +127,24 @@ class EditorTestCase(unittest.TestCase):
self._assert_change(self.editor.next_word, text, (6, 0)) self._assert_change(self.editor.next_word, text, (6, 0))
self._assert_change(self.editor.next_word, text, (3, 1)) self._assert_change(self.editor.next_word, text, (3, 1))
self._assert_change(self.editor.next_word, text, (5, 1)) self._assert_change(self.editor.next_word, text, (5, 1))
self._assert_change(self.editor.next_word, text, (5, 1)) self.assertRaises(IndexError, self.editor.next_word)
self._assert_change(self.editor.previous_word, text, (4, 1)) self._assert_change(self.editor.previous_word, text, (4, 1))
self._assert_change(self.editor.previous_word, text, (1, 1)) self._assert_change(self.editor.previous_word, text, (1, 1))
self._assert_change(self.editor.previous_word, text, (4, 0)) self._assert_change(self.editor.previous_word, text, (4, 0))
self._assert_change(self.editor.previous_word, text, (0, 0)) self.assertRaises(IndexError, self.editor.previous_word)
self._assert_change(self.editor.previous_word, text, (0, 0)) self._assert_editor(text, (0, 0))
self.assertRaises(IndexError, self.editor.previous_word)
self._assert_editor(text, (0, 0))
def test_jumping_blocks(self): def test_jumping_blocks(self):
text = "a\nb\n\nc\nd" text = "a\nb\n\nc\nd"
self._set_editor(text, (0, 0)) self._set_editor(text, (0, 0))
self._assert_change(self.editor.jump_to_block_start, text, (0, 0)) self.assertRaises(IndexError, self.editor.jump_to_block_start)
self._assert_change(self.editor.jump_to_block_end, text, (0, 2)) self._assert_change(self.editor.jump_to_block_end, text, (0, 2))
self._assert_change(self.editor.jump_to_block_end, text, (0, 4)) self.assertRaises(IndexError, self.editor.jump_to_block_end)
self._assert_change(self.editor.jump_to_block_end, text, (0, 4)) self._assert_editor(text, (0, 4))
self.assertRaises(IndexError, self.editor.jump_to_block_end)
self._assert_editor(text, (0, 4))
def test_page_up_and_down(self): def test_page_up_and_down(self):
text = "a\nbb\nc\nd" text = "a\nbb\nc\nd"
@ -164,7 +167,7 @@ class EditorTestCase(unittest.TestCase):
self._set_editor("\nabc", (0, 0)) self._set_editor("\nabc", (0, 0))
self._assert_change(self.editor.delete_line, "abc", (0, 0)) self._assert_change(self.editor.delete_line, "abc", (0, 0))
self._assert_change(self.editor.delete_line, "", (0, 0)) self._assert_change(self.editor.delete_line, "", (0, 0))
self._assert_change(self.editor.delete_line, "", (0, 0)) self.assertRaises(IndexError, self.editor.delete_line)
def test_tab_align(self): def test_tab_align(self):
text = " a\n b" text = " a\n b"