Minor test refactoring.

diff --git a/src/tests/tui_draw.test b/src/tests/tui_draw.test
index f259ffc8b8bdbbc6de596a8af82fe17babd51791..d0f80f88c9765648ac5212913e5b289e22dd2037 100644 (file)
--- a/src/tests/tui_draw.test
+++ b/src/tests/tui_draw.test
@@ -82,7 +82,9 @@ repeat lines-empty-16 +0
 repeat lines-empty-4 +16
 repeat history-lines-0:0:1 +20
 | topmost-scroll-out
+| scrolldown-2-in
 line 21 on_black,bright_white,reverse vvv [2] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+| scrolldown-2-out
 repeat status-[0]-prompt
 
 # check scrolling down on 3-lines history
@@ -102,7 +104,7 @@ repeat before-first-scroll
 # check history growing below up-scroll
 > /window.history.scroll up
 repeat topmost-scroll +0
-line 21 on_black,bright_white,reverse vvv [2] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-2
 repeat status-[0]-prompt
 > /help
 log 0 #.. commands available in this window:
@@ -119,7 +121,9 @@ log 0 #..   /window.prompt.move_cursor DIRECTION
 log 0 #..   /window.prompt.scroll DIRECTION
 | before-scrolldown-not-to-bottom-in
 repeat topmost-scroll
+| scrolldown-14-in
 line 21 on_black,bright_white,reverse vvv [14] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+| scrolldown-14-out
 | before-scrolldown-not-to-bottom-out
 line 22 on_black,bright_white :start)================================================================([(0:12)]§§
 repeat prompt-empty
@@ -156,7 +160,9 @@ line 19 on_black,bright_cyan #.. §§:§§:§§   /window.history.scroll DIRECTI
 line 20 on_black,bright_cyan #.. §§:§§:§§   /window.paste
 | history-lines-0:10:12-out
 | history-lines-0:8:12-out
+| scrolldown-3-in
 line 21 on_black,bright_white,reverse vvv [3] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+| scrolldown-3-out
 | status-[0:3]-prompt-in
 line 22 on_black,bright_white :start)=================================================================([(0:3)]§§
 repeat prompt-empty
@@ -241,7 +247,9 @@ repeat lines-empty-8
 repeat lines-empty-1 +8
 repeat history-lines-0:0:8 +9
 repeat history-lines-0:8:12 +17
+| scrolldown-11-in
 line 21 on_black,bright_white,reverse vvv [11] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+| scrolldown-11-out
 repeat status-[0]-prompt
 > /window.history.scroll down
 repeat at-bottom-before-wrapped
@@ -277,7 +285,9 @@ repeat history-lines-0:8:12 +14
 repeat history-lines-0:12:14 +18
 repeat history-lines-0:14:15 +20
 | scrollup-after-wrapped-out
+| scrolldown-10-in
 line 21 on_black,bright_white,reverse vvv [10] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+| scrolldown-10-out
 repeat status-[0]-prompt
 
 # check scroll-down fully reversible even if over wrapped
@@ -285,14 +295,14 @@ repeat status-[0]-prompt
 repeat at-bottom-after-wrapped
 > /window.history.scroll up
 repeat scrollup-after-wrapped
-line 21 on_black,bright_white,reverse vvv [10] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-10
 repeat status-[0]-prompt
 
 # check wrapped input only increases below-scroll count by one 
 > /bar_0123456789_0123456789_012345678
 log 0 #!. invalid prompt command: /bar_0123456789_0123456789_012345678 unknown
 repeat scrollup-after-wrapped
-line 21 on_black,bright_white,reverse vvv [11] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-11
 | status-[0:1]-prompt-in
 line 22 on_black,bright_white :start)=================================================================([(0:1)]§§
 repeat prompt-empty
@@ -316,7 +326,7 @@ repeat status-[0:1]-prompt
 # # check scrolls-up over longer history until top
 > /window.history.scroll up
 repeat scrollup-after-wrapped
-line 21 on_black,bright_white,reverse vvv [11] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-11
 repeat status-[0:1]-prompt
 > /window.history.scroll up
 repeat lines-empty-16 +0
@@ -327,7 +337,9 @@ line 21 on_black,bright_white,reverse vvv [22] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 repeat status-[0:1]-prompt
 > /window.history.scroll up
 repeat topmost-scroll
+| scrolldown-25-in
 line 21 on_black,bright_white,reverse vvv [25] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+| scrolldown-25-out
 repeat status-[0:1]-prompt
 
 # check that triggering creation of new window with new lines adds it to status, with unread-lines count
@@ -353,7 +365,7 @@ log 1 >.. CAP LS :302
 log 1 >.. USER baz 0 * :bar
 log 1 >.. NICK :foo
 repeat topmost-scroll
-line 21 on_black,bright_white,reverse vvv [25] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-25
 line 22 on_black,bright_white :start)==========================================================([(0:1)] (1:19)§§
 repeat prompt-empty
 
@@ -424,7 +436,7 @@ repeat lines-empty-8 +0
 repeat lines-empty-1 +8
 repeat history-lines-0:0:8 +9
 repeat history-lines-0:8:12 +17
-line 21 on_black,bright_white,reverse vvv [14] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-14
 repeat status-[0:1]-1-prompt
 > /window.history.scroll down
 | before-first-sight-of-bookmark-in
@@ -434,7 +446,7 @@ repeat history-lines-0:8:16 +6
 repeat history-lines-0:16:20 +14
 repeat history-lines-0:20:22 +18
 repeat history-lines-0:22:23 +20
-line 21 on_black,bright_white,reverse vvv [3] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-3
 repeat status-[0:1]-1-prompt
 | before-first-sight-of-bookmark-out
 > /window.history.scroll down
@@ -556,7 +568,7 @@ repeat history-lines-1:8:12 +14
 repeat history-lines-1:12:14 +18
 repeat history-lines-1:14:15 +20
 | early-win1-upscroll-out
-line 21 on_black,bright_white,reverse vvv [10] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-10
 | status-0-[1:2]-prompt-in
 line 22 on_black,bright_white foo.bar.baz:debug)====================================================(0 [(1:2)]§§
 repeat prompt-empty
@@ -571,7 +583,7 @@ repeat bookmark +14
 repeat history-lines-1:19:20 +15
 repeat history-lines-1:20:24 +16
 repeat history-lines-1:24:25 +20
-line 21 on_black,bright_white,reverse vvv [2] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-2
 repeat status-0-[1:2]-prompt
 
 # check that with new lines left unread, switch away and back into window moves bookmark below newest read line, counts unread lines in status
@@ -601,7 +613,7 @@ repeat history-lines-1:20:24 +15
 repeat history-lines-1:24:25 +19
 repeat bookmark +20
 | keep-bookmark-on-outside-growth-test-out
-line 21 on_black,bright_white,reverse vvv [2] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-2
 repeat status-0-[1:2]-prompt
 
 # check that growing lines below scroll in other preserves non-bottom bookmark (left in sight on previous window leave)
@@ -632,7 +644,7 @@ line 22 on_black,bright_white :start)===========================================
 repeat prompt-empty
 > /window 1
 repeat early-win1-upscroll
-line 21 on_black,bright_white,reverse vvv [14] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+repeat scrolldown-14
 | status-0-[1:6]-prompt-in
 line 22 on_black,bright_white foo.bar.baz:debug)====================================================(0 [(1:6)]§§
 repeat prompt-empty