diff options
Diffstat (limited to 'text_tests.lua')
| -rw-r--r-- | text_tests.lua | 624 |
1 files changed, 280 insertions, 344 deletions
diff --git a/text_tests.lua b/text_tests.lua index 3ba9eed..cafac79 100644 --- a/text_tests.lua +++ b/text_tests.lua @@ -1,21 +1,19 @@ -- major tests for text editing flows function test_initial_state() - io.write('\ntest_initial_state') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{} Text.redraw_all(Editor_state) edit.draw(Editor_state) - check_eq(#Editor_state.lines, 1, 'F - test_initial_state/#lines') - check_eq(Editor_state.cursor1.line, 1, 'F - test_initial_state/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_initial_state/cursor:pos') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_initial_state/screen_top:line') - check_eq(Editor_state.screen_top1.pos, 1, 'F - test_initial_state/screen_top:pos') + check_eq(#Editor_state.lines, 1, '#lines') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos') end function test_move_left() - io.write('\ntest_move_left') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'a'} @@ -23,11 +21,10 @@ function test_move_left() Editor_state.cursor1 = {line=1, pos=2} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'left') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_left') + check_eq(Editor_state.cursor1.pos, 1, 'check') end function test_move_right() - io.write('\ntest_move_right') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'a'} @@ -35,11 +32,10 @@ function test_move_right() Editor_state.cursor1 = {line=1, pos=1} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'right') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_right') + check_eq(Editor_state.cursor1.pos, 2, 'check') end function test_move_left_to_previous_line() - io.write('\ntest_move_left_to_previous_line') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def'} @@ -47,12 +43,11 @@ function test_move_left_to_previous_line() Editor_state.cursor1 = {line=2, pos=1} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'left') - check_eq(Editor_state.cursor1.line, 1, 'F - test_move_left_to_previous_line/line') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_left_to_previous_line/pos') -- past end of line + check_eq(Editor_state.cursor1.line, 1, 'line') + check_eq(Editor_state.cursor1.pos, 4, 'pos') -- past end of line end function test_move_right_to_next_line() - io.write('\ntest_move_right_to_next_line') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def'} @@ -60,12 +55,11 @@ function test_move_right_to_next_line() Editor_state.cursor1 = {line=1, pos=4} -- past end of line edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'right') - check_eq(Editor_state.cursor1.line, 2, 'F - test_move_right_to_next_line/line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_right_to_next_line/pos') + check_eq(Editor_state.cursor1.line, 2, 'line') + check_eq(Editor_state.cursor1.pos, 1, 'pos') end function test_move_to_start_of_word() - io.write('\ntest_move_to_start_of_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc'} @@ -73,11 +67,10 @@ function test_move_to_start_of_word() Editor_state.cursor1 = {line=1, pos=3} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-left') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_to_start_of_word') + check_eq(Editor_state.cursor1.pos, 1, 'check') end function test_move_to_start_of_previous_word() - io.write('\ntest_move_to_start_of_previous_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def'} @@ -85,11 +78,10 @@ function test_move_to_start_of_previous_word() Editor_state.cursor1 = {line=1, pos=4} -- at the space between words edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-left') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_to_start_of_previous_word') + check_eq(Editor_state.cursor1.pos, 1, 'check') end function test_skip_to_previous_word() - io.write('\ntest_skip_to_previous_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def'} @@ -97,11 +89,10 @@ function test_skip_to_previous_word() Editor_state.cursor1 = {line=1, pos=5} -- at the start of second word edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-left') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_skip_to_previous_word') + check_eq(Editor_state.cursor1.pos, 1, 'check') end function test_skip_past_tab_to_previous_word() - io.write('\ntest_skip_past_tab_to_previous_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def\tghi'} @@ -109,11 +100,10 @@ function test_skip_past_tab_to_previous_word() Editor_state.cursor1 = {line=1, pos=10} -- within third word edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-left') - check_eq(Editor_state.cursor1.pos, 9, 'F - test_skip_past_tab_to_previous_word') + check_eq(Editor_state.cursor1.pos, 9, 'check') end function test_skip_multiple_spaces_to_previous_word() - io.write('\ntest_skip_multiple_spaces_to_previous_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def'} @@ -121,11 +111,10 @@ function test_skip_multiple_spaces_to_previous_word() Editor_state.cursor1 = {line=1, pos=6} -- at the start of second word edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-left') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_skip_multiple_spaces_to_previous_word') + check_eq(Editor_state.cursor1.pos, 1, 'check') end function test_move_to_start_of_word_on_previous_line() - io.write('\ntest_move_to_start_of_word_on_previous_line') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def', 'ghi'} @@ -133,12 +122,11 @@ function test_move_to_start_of_word_on_previous_line() Editor_state.cursor1 = {line=2, pos=1} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-left') - check_eq(Editor_state.cursor1.line, 1, 'F - test_move_to_start_of_word_on_previous_line/line') - check_eq(Editor_state.cursor1.pos, 5, 'F - test_move_to_start_of_word_on_previous_line/pos') + check_eq(Editor_state.cursor1.line, 1, 'line') + check_eq(Editor_state.cursor1.pos, 5, 'pos') end function test_move_past_end_of_word() - io.write('\ntest_move_past_end_of_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def'} @@ -146,11 +134,10 @@ function test_move_past_end_of_word() Editor_state.cursor1 = {line=1, pos=1} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-right') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_past_end_of_word') + check_eq(Editor_state.cursor1.pos, 4, 'check') end function test_skip_to_next_word() - io.write('\ntest_skip_to_next_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def'} @@ -158,11 +145,10 @@ function test_skip_to_next_word() Editor_state.cursor1 = {line=1, pos=4} -- at the space between words edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-right') - check_eq(Editor_state.cursor1.pos, 8, 'F - test_skip_to_next_word') + check_eq(Editor_state.cursor1.pos, 8, 'check') end function test_skip_past_tab_to_next_word() - io.write('\ntest_skip_past_tab_to_next_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc\tdef'} @@ -170,11 +156,10 @@ function test_skip_past_tab_to_next_word() Editor_state.cursor1 = {line=1, pos=1} -- at the space between words edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-right') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_skip_past_tab_to_next_word') + check_eq(Editor_state.cursor1.pos, 4, 'check') end function test_skip_multiple_spaces_to_next_word() - io.write('\ntest_skip_multiple_spaces_to_next_word') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def'} @@ -182,11 +167,10 @@ function test_skip_multiple_spaces_to_next_word() Editor_state.cursor1 = {line=1, pos=4} -- at the start of second word edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-right') - check_eq(Editor_state.cursor1.pos, 9, 'F - test_skip_multiple_spaces_to_next_word') + check_eq(Editor_state.cursor1.pos, 9, 'check') end function test_move_past_end_of_word_on_next_line() - io.write('\ntest_move_past_end_of_word_on_next_line') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def', 'ghi'} @@ -194,12 +178,11 @@ function test_move_past_end_of_word_on_next_line() Editor_state.cursor1 = {line=1, pos=8} edit.draw(Editor_state) edit.run_after_keychord(Editor_state, 'M-right') - check_eq(Editor_state.cursor1.line, 2, 'F - test_move_past_end_of_word_on_next_line/line') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_past_end_of_word_on_next_line/pos') + check_eq(Editor_state.cursor1.line, 2, 'line') + check_eq(Editor_state.cursor1.pos, 4, 'pos') end function test_click_moves_cursor() - io.write('\ntest_click_moves_cursor') App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'xyz'} @@ -210,15 +193,14 @@ function test_click_moves_cursor() Editor_state.selection1 = {} edit.draw(Editor_state) -- populate line_cache.starty for each line Editor_state.line_cache edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_moves_cursor/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_moves_cursor/cursor:pos') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') -- selection is empty to avoid perturbing future edits - check_nil(Editor_state.selection1.line, 'F - test_click_moves_cursor/selection:line') - check_nil(Editor_state.selection1.pos, 'F - test_click_moves_cursor/selection:pos') + check_nil(Editor_state.selection1.line, 'selection:line') + check_nil(Editor_state.selection1.pos, 'selection:pos') end function test_click_to_left_of_line() - io.write('\ntest_click_to_left_of_line') -- display a line with the cursor in the middle App.screen.init{width=50, height=80} Editor_state = edit.initialize_test_state() @@ -231,13 +213,12 @@ function test_click_to_left_of_line() edit.draw(Editor_state) edit.run_after_mouse_click(Editor_state, Editor_state.left-4,Editor_state.top+5, 1) -- cursor moves to start of line - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_to_left_of_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_to_left_of_line/cursor:pos') - check_nil(Editor_state.selection1.line, 'F - test_click_to_left_of_line/selection is empty to avoid perturbing future edits') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') + check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits') end function test_click_takes_margins_into_account() - io.write('\ntest_click_takes_margins_into_account') -- display two lines with cursor on one of them App.screen.init{width=100, height=80} Editor_state = edit.initialize_test_state() @@ -251,13 +232,12 @@ function test_click_takes_margins_into_account() edit.draw(Editor_state) edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) -- cursor moves - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_takes_margins_into_account/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_takes_margins_into_account/cursor:pos') - check_nil(Editor_state.selection1.line, 'F - test_click_takes_margins_into_account/selection is empty to avoid perturbing future edits') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') + check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits') end function test_click_on_empty_line() - io.write('\ntest_click_on_empty_line') -- display two lines with the first one empty App.screen.init{width=50, height=80} Editor_state = edit.initialize_test_state() @@ -270,11 +250,10 @@ function test_click_on_empty_line() edit.draw(Editor_state) edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) -- cursor moves - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_empty_line/cursor') + check_eq(Editor_state.cursor1.line, 1, 'cursor') end function test_draw_text() - io.write('\ntest_draw_text') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'ghi'} @@ -284,15 +263,14 @@ function test_draw_text() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_draw_text/screen:1') + App.screen.check(y, 'abc', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_draw_text/screen:2') + App.screen.check(y, 'def', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_draw_text/screen:3') + App.screen.check(y, 'ghi', 'screen:3') end function test_draw_wrapping_text() - io.write('\ntest_draw_wrapping_text') App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'defgh', 'xyz'} @@ -302,15 +280,14 @@ function test_draw_wrapping_text() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_draw_wrapping_text/screen:1') + App.screen.check(y, 'abc', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'de', 'F - test_draw_wrapping_text/screen:2') + App.screen.check(y, 'de', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'fgh', 'F - test_draw_wrapping_text/screen:3') + App.screen.check(y, 'fgh', 'screen:3') end function test_draw_word_wrapping_text() - io.write('\ntest_draw_word_wrapping_text') App.screen.init{width=60, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc def ghi', 'jkl'} @@ -320,15 +297,14 @@ function test_draw_word_wrapping_text() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc ', 'F - test_draw_word_wrapping_text/screen:1') + App.screen.check(y, 'abc ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def ', 'F - test_draw_word_wrapping_text/screen:2') + App.screen.check(y, 'def ', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_draw_word_wrapping_text/screen:3') + App.screen.check(y, 'ghi', 'screen:3') end function test_click_on_wrapping_line() - io.write('\ntest_click_on_wrapping_line') -- display two lines with cursor on one of them App.screen.init{width=50, height=80} Editor_state = edit.initialize_test_state() @@ -341,13 +317,12 @@ function test_click_on_wrapping_line() edit.draw(Editor_state) edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) -- cursor moves - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line/cursor:pos') - check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line/selection is empty to avoid perturbing future edits') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') + check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits') end function test_click_on_wrapping_line_takes_margins_into_account() - io.write('\ntest_click_on_wrapping_line_takes_margins_into_account') -- display two lines with cursor on one of them App.screen.init{width=100, height=80} Editor_state = edit.initialize_test_state() @@ -361,14 +336,13 @@ function test_click_on_wrapping_line_takes_margins_into_account() edit.draw(Editor_state) edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) -- cursor moves - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:pos') - check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line_takes_margins_into_account/selection is empty to avoid perturbing future edits') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') + check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits') end function test_draw_text_wrapping_within_word() -- arrange a screen line that needs to be split within a word - io.write('\ntest_draw_text_wrapping_within_word') App.screen.init{width=60, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abcd e fghijk', 'xyz'} @@ -378,16 +352,15 @@ function test_draw_text_wrapping_within_word() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abcd ', 'F - test_draw_text_wrapping_within_word/screen:1') + App.screen.check(y, 'abcd ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'e fgh', 'F - test_draw_text_wrapping_within_word/screen:2') + App.screen.check(y, 'e fgh', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ijk', 'F - test_draw_text_wrapping_within_word/screen:3') + App.screen.check(y, 'ijk', 'screen:3') end function test_draw_wrapping_text_containing_non_ascii() -- draw a long line containing non-ASCII - io.write('\ntest_draw_wrapping_text_containing_non_ascii') App.screen.init{width=60, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'madam I’m adam', 'xyz'} -- notice the non-ASCII apostrophe @@ -397,15 +370,14 @@ function test_draw_wrapping_text_containing_non_ascii() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'mad', 'F - test_draw_wrapping_text_containing_non_ascii/screen:1') + App.screen.check(y, 'mad', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'am I', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2') + App.screen.check(y, 'am I', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, '’m a', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3') + App.screen.check(y, '’m a', 'screen:3') end function test_click_on_wrapping_line() - io.write('\ntest_click_on_wrapping_line') -- display a wrapping line App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -417,19 +389,18 @@ function test_click_on_wrapping_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'madam ', 'F - test_click_on_wrapping_line/baseline/screen:1') + App.screen.check(y, 'madam ', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, "I'm ad", 'F - test_click_on_wrapping_line/baseline/screen:2') + App.screen.check(y, "I'm ad", 'baseline/screen:2') y = y + Editor_state.line_height -- click past end of second screen line edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1) -- cursor moves to end of screen line - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line/cursor:pos') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos') end function test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen() - io.write('\ntest_click_on_wrapping_line_rendered_from_partway_at_top_of_screen') -- display a wrapping line from its second screen line App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -441,17 +412,16 @@ function test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, "I'm ad", 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/baseline/screen:2') + App.screen.check(y, "I'm ad", 'baseline/screen:2') y = y + Editor_state.line_height -- click past end of second screen line edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1) -- cursor moves to end of screen line - check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:line') - check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:pos') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos') end function test_click_past_end_of_wrapping_line() - io.write('\ntest_click_past_end_of_wrapping_line') -- display a wrapping line App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -463,20 +433,19 @@ function test_click_past_end_of_wrapping_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line/baseline/screen:1') + App.screen.check(y, 'madam ', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, "I'm ad", 'F - test_click_past_end_of_wrapping_line/baseline/screen:2') + App.screen.check(y, "I'm ad", 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line/baseline/screen:3') + App.screen.check(y, 'am', 'baseline/screen:3') y = y + Editor_state.line_height -- click past the end of it edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1) -- cursor moves to end of line - check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line/cursor') -- one more than the number of UTF-8 code-points + check_eq(Editor_state.cursor1.pos, 15, 'cursor') -- one more than the number of UTF-8 code-points end function test_click_past_end_of_wrapping_line_containing_non_ascii() - io.write('\ntest_click_past_end_of_wrapping_line_containing_non_ascii') -- display a wrapping line containing non-ASCII App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -488,20 +457,19 @@ function test_click_past_end_of_wrapping_line_containing_non_ascii() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:1') + App.screen.check(y, 'madam ', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'I’m ad', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:2') + App.screen.check(y, 'I’m ad', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:3') + App.screen.check(y, 'am', 'baseline/screen:3') y = y + Editor_state.line_height -- click past the end of it edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1) -- cursor moves to end of line - check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/cursor') -- one more than the number of UTF-8 code-points + check_eq(Editor_state.cursor1.pos, 15, 'cursor') -- one more than the number of UTF-8 code-points end function test_click_past_end_of_word_wrapping_line() - io.write('\ntest_click_past_end_of_word_wrapping_line') -- display a long line wrapping at a word boundary on a screen of more realistic length App.screen.init{width=160, height=80} Editor_state = edit.initialize_test_state() @@ -514,16 +482,15 @@ function test_click_past_end_of_word_wrapping_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'the quick brown fox ', 'F - test_click_past_end_of_word_wrapping_line/baseline/screen:1') + App.screen.check(y, 'the quick brown fox ', 'baseline/screen:1') y = y + Editor_state.line_height -- click past the end of the screen line edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1) -- cursor moves to end of screen line - check_eq(Editor_state.cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor') + check_eq(Editor_state.cursor1.pos, 20, 'cursor') end function test_select_text() - io.write('\ntest_select_text') -- display a line of text App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -539,14 +506,13 @@ function test_select_text() App.fake_key_release('lshift') edit.key_release(Editor_state, 'lshift') -- selection persists even after shift is released - check_eq(Editor_state.selection1.line, 1, 'F - test_select_text/selection:line') - check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text/selection:pos') - check_eq(Editor_state.cursor1.line, 1, 'F - test_select_text/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text/cursor:pos') + check_eq(Editor_state.selection1.line, 1, 'selection:line') + check_eq(Editor_state.selection1.pos, 1, 'selection:pos') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') end function test_cursor_movement_without_shift_resets_selection() - io.write('\ntest_cursor_movement_without_shift_resets_selection') -- display a line of text with some part selected App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -560,12 +526,11 @@ function test_cursor_movement_without_shift_resets_selection() -- press an arrow key without shift edit.run_after_keychord(Editor_state, 'right') -- no change to data, selection is reset - check_nil(Editor_state.selection1.line, 'F - test_cursor_movement_without_shift_resets_selection') - check_eq(Editor_state.lines[1].data, 'abc', 'F - test_cursor_movement_without_shift_resets_selection/data') + check_nil(Editor_state.selection1.line, 'check') + check_eq(Editor_state.lines[1].data, 'abc', 'data') end function test_copy_does_not_reset_selection() - io.write('\ntest_copy_does_not_reset_selection') -- display a line of text with a selection App.screen.init{width=75, height=80} Editor_state = edit.initialize_test_state() @@ -578,13 +543,12 @@ function test_copy_does_not_reset_selection() edit.draw(Editor_state) -- copy selection edit.run_after_keychord(Editor_state, 'C-c') - check_eq(App.clipboard, 'a', 'F - test_copy_does_not_reset_selection/clipboard') + check_eq(App.clipboard, 'a', 'clipboard') -- selection is reset since shift key is not pressed - check(Editor_state.selection1.line, 'F - test_copy_does_not_reset_selection') + check(Editor_state.selection1.line, 'check') end function test_move_cursor_using_mouse() - io.write('\ntest_move_cursor_using_mouse') App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'xyz'} @@ -595,14 +559,13 @@ function test_move_cursor_using_mouse() Editor_state.selection1 = {} edit.draw(Editor_state) -- populate line_cache.starty for each line Editor_state.line_cache edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) - check_eq(Editor_state.cursor1.line, 1, 'F - test_move_cursor_using_mouse/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_cursor_using_mouse/cursor:pos') - check_nil(Editor_state.selection1.line, 'F - test_move_cursor_using_mouse/selection:line') - check_nil(Editor_state.selection1.pos, 'F - test_move_cursor_using_mouse/selection:pos') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') + check_nil(Editor_state.selection1.line, 'selection:line') + check_nil(Editor_state.selection1.pos, 'selection:pos') end function test_select_text_using_mouse() - io.write('\ntest_select_text_using_mouse') App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'xyz'} @@ -616,14 +579,13 @@ function test_select_text_using_mouse() edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+5, 1) -- drag and release somewhere else edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1) - check_eq(Editor_state.selection1.line, 1, 'F - test_select_text_using_mouse/selection:line') - check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_using_mouse/selection:pos') - check_eq(Editor_state.cursor1.line, 2, 'F - test_select_text_using_mouse/cursor:line') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_select_text_using_mouse/cursor:pos') + check_eq(Editor_state.selection1.line, 1, 'selection:line') + check_eq(Editor_state.selection1.pos, 2, 'selection:pos') + check_eq(Editor_state.cursor1.line, 2, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos') end function test_select_text_using_mouse_and_shift() - io.write('\ntest_select_text_using_mouse_and_shift') App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'xyz'} @@ -641,14 +603,13 @@ function test_select_text_using_mouse_and_shift() edit.run_after_mouse_press(Editor_state, Editor_state.left+20,Editor_state.top+5, 1) edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1) App.fake_key_release('lshift') - check_eq(Editor_state.selection1.line, 1, 'F - test_select_text_using_mouse_and_shift/selection:line') - check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_using_mouse_and_shift/selection:pos') - check_eq(Editor_state.cursor1.line, 2, 'F - test_select_text_using_mouse_and_shift/cursor:line') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_select_text_using_mouse_and_shift/cursor:pos') + check_eq(Editor_state.selection1.line, 1, 'selection:line') + check_eq(Editor_state.selection1.pos, 2, 'selection:pos') + check_eq(Editor_state.cursor1.line, 2, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos') end function test_select_text_repeatedly_using_mouse_and_shift() - io.write('\ntest_select_text_repeatedly_using_mouse_and_shift') App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'xyz'} @@ -672,14 +633,13 @@ function test_select_text_repeatedly_using_mouse_and_shift() edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height+5, 1) App.fake_key_release('lshift') -- selection is between first and third location. forget the second location, not the first. - check_eq(Editor_state.selection1.line, 1, 'F - test_select_text_repeatedly_using_mouse_and_shift/selection:line') - check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/selection:pos') - check_eq(Editor_state.cursor1.line, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/cursor:line') - check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/cursor:pos') + check_eq(Editor_state.selection1.line, 1, 'selection:line') + check_eq(Editor_state.selection1.pos, 2, 'selection:pos') + check_eq(Editor_state.cursor1.line, 2, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos') end function test_pagedown() - io.write('\ntest_pagedown') App.screen.init{width=120, height=45} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'ghi'} @@ -690,21 +650,20 @@ function test_pagedown() -- initially the first two lines are displayed edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_pagedown/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_pagedown/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') -- after pagedown the bottom line becomes the top edit.run_after_keychord(Editor_state, 'pagedown') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown/screen_top') - check_eq(Editor_state.cursor1.line, 2, 'F - test_pagedown/cursor') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top') + check_eq(Editor_state.cursor1.line, 2, 'cursor') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_pagedown/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_pagedown/screen:2') + App.screen.check(y, 'ghi', 'screen:2') end function test_pagedown_often_shows_start_of_wrapping_line() - io.write('\ntest_pagedown_often_shows_start_of_wrapping_line') -- draw a few lines ending in part of a wrapping line App.screen.init{width=50, height=60} Editor_state = edit.initialize_test_state() @@ -715,27 +674,26 @@ function test_pagedown_often_shows_start_of_wrapping_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_pagedown_often_shows_start_of_wrapping_line/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def ', 'F - test_pagedown_often_shows_start_of_wrapping_line/baseline/screen:2') + App.screen.check(y, 'def ', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_pagedown_often_shows_start_of_wrapping_line/baseline/screen:3') + App.screen.check(y, 'ghi ', 'baseline/screen:3') -- after pagedown we start drawing from the bottom _line_ (multiple screen lines) edit.run_after_keychord(Editor_state, 'pagedown') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown_often_shows_start_of_wrapping_line/screen_top:line') - check_eq(Editor_state.screen_top1.pos, 1, 'F - test_pagedown_often_shows_start_of_wrapping_line/screen_top:pos') - check_eq(Editor_state.cursor1.line, 2, 'F - test_pagedown_often_shows_start_of_wrapping_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_often_shows_start_of_wrapping_line/cursor:pos') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos') + check_eq(Editor_state.cursor1.line, 2, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'def ', 'F - test_pagedown_often_shows_start_of_wrapping_line/screen:1') + App.screen.check(y, 'def ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_pagedown_often_shows_start_of_wrapping_line/screen:2') + App.screen.check(y, 'ghi ', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_pagedown_often_shows_start_of_wrapping_line/screen:3') + App.screen.check(y, 'jkl', 'screen:3') end function test_pagedown_can_start_from_middle_of_long_wrapping_line() - io.write('\ntest_pagedown_can_start_from_middle_of_long_wrapping_line') -- draw a few lines starting from a very long wrapping line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -746,25 +704,24 @@ function test_pagedown_can_start_from_middle_of_long_wrapping_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:1') + App.screen.check(y, 'abc ', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:2') + App.screen.check(y, 'def ', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:3') + App.screen.check(y, 'ghi ', 'baseline/screen:3') -- after pagedown we scroll down the very long wrapping line edit.run_after_keychord(Editor_state, 'pagedown') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen_top:line') - check_eq(Editor_state.screen_top1.pos, 9, 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen_top:pos') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 9, 'screen_top:pos') y = Editor_state.top - App.screen.check(y, 'ghi ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:1') + App.screen.check(y, 'ghi ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'jkl ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:2') + App.screen.check(y, 'jkl ', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:3') + App.screen.check(y, 'mno ', 'screen:3') end function test_pagedown_never_moves_up() - io.write('\ntest_pagedown_never_moves_up') -- draw the final screen line of a wrapping line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -776,12 +733,11 @@ function test_pagedown_never_moves_up() edit.draw(Editor_state) -- pagedown makes no change edit.run_after_keychord(Editor_state, 'pagedown') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_pagedown_never_moves_up/screen_top:line') - check_eq(Editor_state.screen_top1.pos, 9, 'F - test_pagedown_never_moves_up/screen_top:pos') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 9, 'screen_top:pos') end function test_down_arrow_moves_cursor() - io.write('\ntest_down_arrow_moves_cursor') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'} @@ -792,26 +748,25 @@ function test_down_arrow_moves_cursor() -- initially the first three lines are displayed edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_down_arrow_moves_cursor/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_down_arrow_moves_cursor/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_down_arrow_moves_cursor/baseline/screen:3') + App.screen.check(y, 'ghi', 'baseline/screen:3') -- after hitting the down arrow, the cursor moves down by 1 line edit.run_after_keychord(Editor_state, 'down') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_down_arrow_moves_cursor/screen_top') - check_eq(Editor_state.cursor1.line, 2, 'F - test_down_arrow_moves_cursor/cursor') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 2, 'cursor') -- the screen is unchanged y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_down_arrow_moves_cursor/screen:1') + App.screen.check(y, 'abc', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_down_arrow_moves_cursor/screen:2') + App.screen.check(y, 'def', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_down_arrow_moves_cursor/screen:3') + App.screen.check(y, 'ghi', 'screen:3') end function test_down_arrow_scrolls_down_by_one_line() - io.write('\ntest_down_arrow_scrolls_down_by_one_line') -- display the first three lines with the cursor on the bottom line App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() @@ -822,25 +777,24 @@ function test_down_arrow_scrolls_down_by_one_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:3') + App.screen.check(y, 'ghi', 'baseline/screen:3') -- after hitting the down arrow the screen scrolls down by one line edit.run_after_keychord(Editor_state, 'down') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_line/screen_top') - check_eq(Editor_state.cursor1.line, 4, 'F - test_down_arrow_scrolls_down_by_one_line/cursor') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top') + check_eq(Editor_state.cursor1.line, 4, 'cursor') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_line/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_down_arrow_scrolls_down_by_one_line/screen:2') + App.screen.check(y, 'ghi', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_down_arrow_scrolls_down_by_one_line/screen:3') + App.screen.check(y, 'jkl', 'screen:3') end function test_down_arrow_scrolls_down_by_one_screen_line() - io.write('\ntest_down_arrow_scrolls_down_by_one_screen_line') -- display the first three lines with the cursor on the bottom line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -851,26 +805,25 @@ function test_down_arrow_scrolls_down_by_one_screen_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:3') -- line wrapping includes trailing whitespace + App.screen.check(y, 'ghi ', 'baseline/screen:3') -- line wrapping includes trailing whitespace -- after hitting the down arrow the screen scrolls down by one line edit.run_after_keychord(Editor_state, 'down') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:pos') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:2') + App.screen.check(y, 'ghi ', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:3') + App.screen.check(y, 'jkl', 'screen:3') end function test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word() - io.write('\ntest_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word') -- display the first three lines with the cursor on the bottom line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -881,26 +834,25 @@ function test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_ Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:3') + App.screen.check(y, 'ghij', 'baseline/screen:3') -- after hitting the down arrow the screen scrolls down by one line edit.run_after_keychord(Editor_state, 'down') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:line') - check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:pos') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:2') + App.screen.check(y, 'ghij', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'kl', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:3') + App.screen.check(y, 'kl', 'screen:3') end function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up() - io.write('\ntest_pagedown_followed_by_down_arrow_does_not_scroll_screen_up') App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'ghijkl', 'mno'} @@ -910,31 +862,30 @@ function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3') + App.screen.check(y, 'ghij', 'baseline/screen:3') -- after hitting pagedown the screen scrolls down to start of a long line edit.run_after_keychord(Editor_state, 'pagedown') - check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos') + check_eq(Editor_state.screen_top1.line, 3, 'baseline2/screen_top') + check_eq(Editor_state.cursor1.line, 3, 'baseline2/cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'baseline2/cursor:pos') -- after hitting down arrow the screen doesn't scroll down further, and certainly doesn't scroll up edit.run_after_keychord(Editor_state, 'down') - check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line') - check_eq(Editor_state.cursor1.pos, 5, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos') + check_eq(Editor_state.screen_top1.line, 3, 'screen_top') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:1') + App.screen.check(y, 'ghij', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'kl', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:2') + App.screen.check(y, 'kl', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:3') + App.screen.check(y, 'mno', 'screen:3') end function test_up_arrow_moves_cursor() - io.write('\ntest_up_arrow_moves_cursor') -- display the first 3 lines with the cursor on the bottom line App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() @@ -945,26 +896,25 @@ function test_up_arrow_moves_cursor() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_up_arrow_moves_cursor/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_up_arrow_moves_cursor/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_up_arrow_moves_cursor/baseline/screen:3') + App.screen.check(y, 'ghi', 'baseline/screen:3') -- after hitting the up arrow the cursor moves up by 1 line edit.run_after_keychord(Editor_state, 'up') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_moves_cursor/screen_top') - check_eq(Editor_state.cursor1.line, 2, 'F - test_up_arrow_moves_cursor/cursor') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 2, 'cursor') -- the screen is unchanged y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_up_arrow_moves_cursor/screen:1') + App.screen.check(y, 'abc', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_up_arrow_moves_cursor/screen:2') + App.screen.check(y, 'def', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_up_arrow_moves_cursor/screen:3') + App.screen.check(y, 'ghi', 'screen:3') end function test_up_arrow_scrolls_up_by_one_line() - io.write('\ntest_up_arrow_scrolls_up_by_one_line') -- display the lines 2/3/4 with the cursor on line 2 App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() @@ -975,25 +925,24 @@ function test_up_arrow_scrolls_up_by_one_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:1') + App.screen.check(y, 'def', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:2') + App.screen.check(y, 'ghi', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:3') + App.screen.check(y, 'jkl', 'baseline/screen:3') -- after hitting the up arrow the screen scrolls up by one line edit.run_after_keychord(Editor_state, 'up') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_by_one_line/screen_top') - check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_by_one_line/cursor') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 1, 'cursor') y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_by_one_line/screen:1') + App.screen.check(y, 'abc', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_by_one_line/screen:2') + App.screen.check(y, 'def', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_by_one_line/screen:3') + App.screen.check(y, 'ghi', 'screen:3') end function test_up_arrow_scrolls_up_by_one_screen_line() - io.write('\ntest_up_arrow_scrolls_up_by_one_screen_line') -- display lines starting from second screen line of a line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1004,25 +953,24 @@ function test_up_arrow_scrolls_up_by_one_screen_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_screen_line/baseline/screen:1') + App.screen.check(y, 'jkl', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_by_one_screen_line/baseline/screen:2') + App.screen.check(y, 'mno', 'baseline/screen:2') -- after hitting the up arrow the screen scrolls up to first screen line edit.run_after_keychord(Editor_state, 'up') y = Editor_state.top - App.screen.check(y, 'ghi ', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:1') + App.screen.check(y, 'ghi ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:2') + App.screen.check(y, 'jkl', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:3') - check_eq(Editor_state.screen_top1.line, 3, 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen_top') - check_eq(Editor_state.screen_top1.pos, 1, 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_up_arrow_scrolls_up_by_one_screen_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_up_arrow_scrolls_up_by_one_screen_line/cursor:pos') + App.screen.check(y, 'mno', 'screen:3') + check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') end function test_up_arrow_scrolls_up_to_final_screen_line() - io.write('\ntest_up_arrow_scrolls_up_to_final_screen_line') -- display lines starting just after a long line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1033,27 +981,26 @@ function test_up_arrow_scrolls_up_to_final_screen_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:1') + App.screen.check(y, 'ghi', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:2') + App.screen.check(y, 'jkl', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:3') + App.screen.check(y, 'mno', 'baseline/screen:3') -- after hitting the up arrow the screen scrolls up to final screen line of previous line edit.run_after_keychord(Editor_state, 'up') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:2') + App.screen.check(y, 'ghi', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:3') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen_top') - check_eq(Editor_state.screen_top1.pos, 5, 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen_top') - check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_to_final_screen_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 5, 'F - test_up_arrow_scrolls_up_to_final_screen_line/cursor:pos') + App.screen.check(y, 'jkl', 'screen:3') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 5, 'screen_top:pos') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos') end function test_up_arrow_scrolls_up_to_empty_line() - io.write('\ntest_up_arrow_scrolls_up_to_empty_line') -- display a screenful of text with an empty line just above it outside the screen App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() @@ -1064,25 +1011,24 @@ function test_up_arrow_scrolls_up_to_empty_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:3') + App.screen.check(y, 'ghi', 'baseline/screen:3') -- after hitting the up arrow the screen scrolls up by one line edit.run_after_keychord(Editor_state, 'up') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_to_empty_line/screen_top') - check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_to_empty_line/cursor') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 1, 'cursor') y = Editor_state.top -- empty first line y = y + Editor_state.line_height - App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_to_empty_line/screen:2') + App.screen.check(y, 'abc', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_empty_line/screen:3') + App.screen.check(y, 'def', 'screen:3') end function test_pageup() - io.write('\ntest_pageup') App.screen.init{width=120, height=45} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'ghi'} @@ -1093,21 +1039,20 @@ function test_pageup() -- initially the last two lines are displayed edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'def', 'F - test_pageup/baseline/screen:1') + App.screen.check(y, 'def', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_pageup/baseline/screen:2') + App.screen.check(y, 'ghi', 'baseline/screen:2') -- after pageup the cursor goes to first line edit.run_after_keychord(Editor_state, 'pageup') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup/screen_top') - check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup/cursor') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 1, 'cursor') y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_pageup/screen:1') + App.screen.check(y, 'abc', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_pageup/screen:2') + App.screen.check(y, 'def', 'screen:2') end function test_pageup_scrolls_up_by_screen_line() - io.write('\ntest_pageup_scrolls_up_by_screen_line') -- display the first three lines with the cursor on the bottom line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1118,26 +1063,25 @@ function test_pageup_scrolls_up_by_screen_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'ghi', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:1') + App.screen.check(y, 'ghi', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:2') + App.screen.check(y, 'jkl', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:3') -- line wrapping includes trailing whitespace + App.screen.check(y, 'mno', 'baseline/screen:3') -- line wrapping includes trailing whitespace -- after hitting the page-up key the screen scrolls up to top edit.run_after_keychord(Editor_state, 'pageup') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup_scrolls_up_by_screen_line/screen_top') - check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup_scrolls_up_by_screen_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_pageup_scrolls_up_by_screen_line/cursor:pos') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'abc ', 'F - test_pageup_scrolls_up_by_screen_line/screen:1') + App.screen.check(y, 'abc ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_pageup_scrolls_up_by_screen_line/screen:2') + App.screen.check(y, 'def', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi', 'F - test_pageup_scrolls_up_by_screen_line/screen:3') + App.screen.check(y, 'ghi', 'screen:3') end function test_pageup_scrolls_up_from_middle_screen_line() - io.write('\ntest_pageup_scrolls_up_from_middle_screen_line') -- display a few lines starting from the middle of a line (Editor_state.cursor1.pos > 1) App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1148,24 +1092,23 @@ function test_pageup_scrolls_up_from_middle_screen_line() Editor_state.screen_bottom1 = {} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'jkl', 'F - test_pageup_scrolls_up_from_middle_screen_line/baseline/screen:2') + App.screen.check(y, 'jkl', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_pageup_scrolls_up_from_middle_screen_line/baseline/screen:3') -- line wrapping includes trailing whitespace + App.screen.check(y, 'mno', 'baseline/screen:3') -- line wrapping includes trailing whitespace -- after hitting the page-up key the screen scrolls up to top edit.run_after_keychord(Editor_state, 'pageup') - check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/screen_top') - check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/cursor:pos') + check_eq(Editor_state.screen_top1.line, 1, 'screen_top') + check_eq(Editor_state.cursor1.line, 1, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'abc ', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:1') + App.screen.check(y, 'abc ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:2') + App.screen.check(y, 'def', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:3') + App.screen.check(y, 'ghi ', 'screen:3') end function test_left_arrow_scrolls_up_in_wrapped_line() - io.write('\ntest_left_arrow_scrolls_up_in_wrapped_line') -- display lines starting from second screen line of a line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1177,25 +1120,24 @@ function test_left_arrow_scrolls_up_in_wrapped_line() Editor_state.cursor1 = {line=3, pos=5} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'jkl', 'F - test_left_arrow_scrolls_up_in_wrapped_line/baseline/screen:1') + App.screen.check(y, 'jkl', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_left_arrow_scrolls_up_in_wrapped_line/baseline/screen:2') + App.screen.check(y, 'mno', 'baseline/screen:2') -- after hitting the left arrow the screen scrolls up to first screen line edit.run_after_keychord(Editor_state, 'left') y = Editor_state.top - App.screen.check(y, 'ghi ', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:1') + App.screen.check(y, 'ghi ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:2') + App.screen.check(y, 'jkl', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:3') - check_eq(Editor_state.screen_top1.line, 3, 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen_top') - check_eq(Editor_state.screen_top1.pos, 1, 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_left_arrow_scrolls_up_in_wrapped_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 4, 'F - test_left_arrow_scrolls_up_in_wrapped_line/cursor:pos') + App.screen.check(y, 'mno', 'screen:3') + check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos') end function test_right_arrow_scrolls_down_in_wrapped_line() - io.write('\ntest_right_arrow_scrolls_down_in_wrapped_line') -- display the first three lines with the cursor on the bottom line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1207,26 +1149,25 @@ function test_right_arrow_scrolls_down_in_wrapped_line() Editor_state.cursor1 = {line=3, pos=5} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:3') -- line wrapping includes trailing whitespace + App.screen.check(y, 'ghi ', 'baseline/screen:3') -- line wrapping includes trailing whitespace -- after hitting the right arrow the screen scrolls down by one line edit.run_after_keychord(Editor_state, 'right') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_right_arrow_scrolls_down_in_wrapped_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 6, 'F - test_right_arrow_scrolls_down_in_wrapped_line/cursor:pos') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 6, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:2') + App.screen.check(y, 'ghi ', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:3') + App.screen.check(y, 'jkl', 'screen:3') end function test_home_scrolls_up_in_wrapped_line() - io.write('\ntest_home_scrolls_up_in_wrapped_line') -- display lines starting from second screen line of a line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1238,25 +1179,24 @@ function test_home_scrolls_up_in_wrapped_line() Editor_state.cursor1 = {line=3, pos=5} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'jkl', 'F - test_home_scrolls_up_in_wrapped_line/baseline/screen:1') + App.screen.check(y, 'jkl', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_home_scrolls_up_in_wrapped_line/baseline/screen:2') + App.screen.check(y, 'mno', 'baseline/screen:2') -- after hitting home the screen scrolls up to first screen line edit.run_after_keychord(Editor_state, 'home') y = Editor_state.top - App.screen.check(y, 'ghi ', 'F - test_home_scrolls_up_in_wrapped_line/screen:1') + App.screen.check(y, 'ghi ', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_home_scrolls_up_in_wrapped_line/screen:2') + App.screen.check(y, 'jkl', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'mno', 'F - test_home_scrolls_up_in_wrapped_line/screen:3') - check_eq(Editor_state.screen_top1.line, 3, 'F - test_home_scrolls_up_in_wrapped_line/screen_top') - check_eq(Editor_state.screen_top1.pos, 1, 'F - test_home_scrolls_up_in_wrapped_line/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_home_scrolls_up_in_wrapped_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_home_scrolls_up_in_wrapped_line/cursor:pos') + App.screen.check(y, 'mno', 'screen:3') + check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line') + check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos') end function test_end_scrolls_down_in_wrapped_line() - io.write('\ntest_end_scrolls_down_in_wrapped_line') -- display the first three lines with the cursor on the bottom line App.screen.init{width=Editor_state.left+30, height=60} Editor_state = edit.initialize_test_state() @@ -1268,26 +1208,25 @@ function test_end_scrolls_down_in_wrapped_line() Editor_state.cursor1 = {line=3, pos=5} edit.draw(Editor_state) local y = Editor_state.top - App.screen.check(y, 'abc', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:1') + App.screen.check(y, 'abc', 'baseline/screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'def', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:2') + App.screen.check(y, 'def', 'baseline/screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:3') -- line wrapping includes trailing whitespace + App.screen.check(y, 'ghi ', 'baseline/screen:3') -- line wrapping includes trailing whitespace -- after hitting end the screen scrolls down by one line edit.run_after_keychord(Editor_state, 'end') - check_eq(Editor_state.screen_top1.line, 2, 'F - test_end_scrolls_down_in_wrapped_line/screen_top') - check_eq(Editor_state.cursor1.line, 3, 'F - test_end_scrolls_down_in_wrapped_line/cursor:line') - check_eq(Editor_state.cursor1.pos, 8, 'F - test_end_scrolls_down_in_wrapped_line/cursor:pos') + check_eq(Editor_state.screen_top1.line, 2, 'screen_top') + check_eq(Editor_state.cursor1.line, 3, 'cursor:line') + check_eq(Editor_state.cursor1.pos, 8, 'cursor:pos') y = Editor_state.top - App.screen.check(y, 'def', 'F - test_end_scrolls_down_in_wrapped_line/screen:1') + App.screen.check(y, 'def', 'screen:1') y = y + Editor_state.line_height - App.screen.check(y, 'ghi ', 'F - test_end_scrolls_down_in_wrapped_line/screen:2') + App.screen.check(y, 'ghi ', 'screen:2') y = y + Editor_state.line_height - App.screen.check(y, 'jkl', 'F - test_end_scrolls_down_in_wrapped_line/screen:3') + App.screen.check(y, 'jkl', 'screen:3') end function test_search() - io.write('\ntest_search') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc', 'def', 'ghi', 'deg'} @@ -1300,8 +1239,8 @@ function test_search() edit.run_after_keychord(Editor_state, 'C-f') edit.run_after_text_input(Editor_state, 'd') edit.run_after_keychord(Editor_state, 'return') - check_eq(Editor_state.cursor1.line, 2, 'F - test_search/1/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/1/cursor:pos') + check_eq(Editor_state.cursor1.line, 2, '1/cursor:line') + check_eq(Editor_state.cursor1.pos, 1, '1/cursor:pos') -- reset cursor Editor_state.cursor1 = {line=1, pos=1} Editor_state.screen_top1 = {line=1, pos=1} @@ -1310,12 +1249,11 @@ function test_search() edit.run_after_text_input(Editor_state, 'de') edit.run_after_keychord(Editor_state, 'down') edit.run_after_keychord(Editor_state, 'return') - check_eq(Editor_state.cursor1.line, 4, 'F - test_search/2/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/2/cursor:pos') + check_eq(Editor_state.cursor1.line, 4, '2/cursor:line') + check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos') end function test_search_upwards() - io.write('\ntest_search_upwards') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc abd'} @@ -1329,12 +1267,11 @@ function test_search_upwards() edit.run_after_text_input(Editor_state, 'a') -- search for previous occurrence edit.run_after_keychord(Editor_state, 'up') - check_eq(Editor_state.cursor1.line, 1, 'F - test_search_upwards/2/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_upwards/2/cursor:pos') + check_eq(Editor_state.cursor1.line, 1, '2/cursor:line') + check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos') end function test_search_wrap() - io.write('\ntest_search_wrap') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc'} @@ -1348,12 +1285,11 @@ function test_search_wrap() edit.run_after_text_input(Editor_state, 'a') edit.run_after_keychord(Editor_state, 'return') -- cursor wraps - check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap/1/cursor:line') - check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_wrap/1/cursor:pos') + check_eq(Editor_state.cursor1.line, 1, '1/cursor:line') + check_eq(Editor_state.cursor1.pos, 1, '1/cursor:pos') end function test_search_wrap_upwards() - io.write('\ntest_search_wrap_upwards') App.screen.init{width=120, height=60} Editor_state = edit.initialize_test_state() Editor_state.lines = load_array{'abc abd'} @@ -1367,6 +1303,6 @@ function test_search_wrap_upwards() edit.run_after_text_input(Editor_state, 'a') edit.run_after_keychord(Editor_state, 'up') -- cursor wraps - check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap_upwards/1/cursor:line') - check_eq(Editor_state.cursor1.pos, 5, 'F - test_search_wrap_upwards/1/cursor:pos') + check_eq(Editor_state.cursor1.line, 1, '1/cursor:line') + check_eq(Editor_state.cursor1.pos, 5, '1/cursor:pos') end |