Minor test optimization.

diff --git a/src/tests/tui_draw.test b/src/tests/tui_draw.test
index 5abf93f7297ae7e2b837b1f5bffe8dd0b8bc80b2..bbec77d522853ce7ebd6abf9ae0625b8d2017b66 100644 (file)
--- a/src/tests/tui_draw.test
+++ b/src/tests/tui_draw.test
@@ -48,7 +48,9 @@ repeat lines-empty-4 +16
 | history-lines-0:0:1-in
 line 20 on_black,bright_white 20§§-§§-§§ §§
 | history-lines-0:0:1-out
+| history-lines-0:1:2-in
 line 21 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: not prefixed by / §§
+| history-lines-0:1:2-out
 | history-lines-0:0:2-out
 repeat status-prompt-empty
 | with-only-2-lines-history-out
@@ -87,20 +89,20 @@ repeat status-prompt-empty
 > /window.history.scroll down
 repeat before-first-scroll
 
-> /bar
-log 0 #!. invalid prompt command: /bar unknown
-| history-lines-0:0:4-in
-repeat history-lines-0:0:2 +18
-| history-lines-0:2:4-in
-repeat history-lines-0:2:3 +20
-line 21 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /bar unknown §§
-| history-lines-0:2:4-out
-| history-lines-0:0:4-out
+# > /bar
+# log 0 #!. invalid prompt command: /bar unknown
+# | history-lines-0:0:4-in
+# repeat history-lines-0:0:2 +18
+# | history-lines-0:2:4-in
+# repeat history-lines-0:2:3 +20
+# line 21 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /bar unknown §§
+# | history-lines-0:2:4-out
+# | history-lines-0:0:4-out
 
 # check history growing below up-scroll
 > /window.history.scroll up
 repeat topmost-scroll +0
-line 21 on_black,bright_white,reverse vvv [3] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [2] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 > /help
 log 0 #.. commands available in this window:
@@ -117,7 +119,7 @@ log 0 #..   /window.prompt.move_cursor DIRECTION
 log 0 #..   /window.prompt.scroll DIRECTION
 | before-scrolldown-not-to-bottom-in
 repeat topmost-scroll
-line 21 on_black,bright_white,reverse vvv [15] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [14] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 | before-scrolldown-not-to-bottom-out
 
@@ -127,29 +129,33 @@ repeat status-prompt-empty
 repeat lines-empty-8 +0
 repeat lines-empty-1 +8
 | history-lines-0:0:8-in
-repeat history-lines-0:0:4 +9
+repeat history-lines-0:0:2 +9
+| history-lines-0:2:4-in
+repeat history-lines-0:2:3 +11
+line 12 on_black,bright_cyan #.. §§:§§:§§ commands available in this window:§§
+| history-lines-0:2:4-out
 | history-lines-0:4:8-in
-| history-lines-0:4:5-in
-line 13 on_black,bright_cyan #.. §§:§§:§§ commands available in this window:§§
-| history-lines-0:4:5-out
+line 13 on_black,bright_cyan #.. §§:§§:§§   /connect HOST_PORT [NICKNAME_PW] [REALNAME_USERNAME]§§
 | history-lines-0:5:6-in
-line 14 on_black,bright_cyan #.. §§:§§:§§   /connect HOST_PORT [NICKNAME_PW] [REALNAME_USERNAME]§§
+line 14 on_black,bright_cyan #.. §§:§§:§§   /help§§
 | history-lines-0:5:6-out
 | history-lines-0:6:8-in
-line 15 on_black,bright_cyan #.. §§:§§:§§   /help§§
-line 16 on_black,bright_cyan #.. §§:§§:§§   /list§§
+line 15 on_black,bright_cyan #.. §§:§§:§§   /list§§
+| history-lines-0:7:8-in
+line 16 on_black,bright_cyan #.. §§:§§:§§   /prompt_enter§§
+| history-lines-0:7:8-out
 | history-lines-0:6:8-out
 | history-lines-0:4:8-out
 | history-lines-0:0:8-out
 | history-lines-0:8:12-in
-line 17 on_black,bright_cyan #.. §§:§§:§§   /prompt_enter§§
-line 18 on_black,bright_cyan #.. §§:§§:§§   /quit§§
-line 19 on_black,bright_cyan #.. §§:§§:§§   /window TOWARDS§§
-| history-lines-0:11:12-in
-line 20 on_black,bright_cyan #.. §§:§§:§§   /window.history.scroll DIRECTION§§
-| history-lines-0:11:12-out
+line 17 on_black,bright_cyan #.. §§:§§:§§   /quit§§
+line 18 on_black,bright_cyan #.. §§:§§:§§   /window TOWARDS§§
+| history-lines-0:10:12-in
+line 19 on_black,bright_cyan #.. §§:§§:§§   /window.history.scroll DIRECTION§§
+line 20 on_black,bright_cyan #.. §§:§§:§§   /window.paste
+| history-lines-0:10:12-out
 | history-lines-0:8:12-out
-line 21 on_black,bright_white,reverse vvv [4] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [3] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 | after-scrolldown-not-to-bottom-out
 
@@ -163,18 +169,16 @@ repeat after-scrolldown-not-to-bottom
 > /window.history.scroll down
 repeat lines-empty-4 +0
 repeat lines-empty-2 +4
-| history-lines-0:0:16-in
-repeat history-lines-0:0:8 +6
-repeat history-lines-0:8:12 +14
-| history-lines-0:12:16-in
-| history-lines-0:12:13-in
-line 18 on_black,bright_cyan #.. §§:§§:§§   /window.paste§§
-| history-lines-0:12:13-out
+repeat lines-empty-1 +6
+repeat history-lines-0:0:8 +7
+repeat history-lines-0:8:12 +15
+| history-lines-0:12:14-in
 line 19 on_black,bright_cyan #.. §§:§§:§§   /window.prompt.backspace§§
 line 20 on_black,bright_cyan #.. §§:§§:§§   /window.prompt.move_cursor DIRECTION§§
+| history-lines-0:12:14-out
+| history-lines-0:14:15-in
 line 21 on_black,bright_cyan #.. §§:§§:§§   /window.prompt.scroll DIRECTION§§
-| history-lines-0:12:16-out
-| history-lines-0:0:16-out
+| history-lines-0:14:15-out
 repeat status-prompt-empty
 > /0
 log 0 #!. invalid prompt command: /0 unknown
@@ -193,30 +197,32 @@ log 0 #!. invalid prompt command: /6 unknown
 > /7
 log 0 #!. invalid prompt command: /7 unknown
 | at-bottom-before-wrapped-in
-repeat history-lines-0:2:4 +0
-repeat history-lines-0:4:8 +2
-repeat history-lines-0:8:12 +6
-repeat history-lines-0:12:16 +10
-| history-lines-0:16:24-in
+repeat history-lines-0:1:2 +0
+repeat history-lines-0:2:4 +1
+repeat history-lines-0:4:8 +3
+| history-lines-0:8:16-in
+repeat history-lines-0:8:12 +7
+| history-lines-0:12:16-in
+repeat history-lines-0:12:14 +11
+repeat history-lines-0:14:15 +13
+line 14 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /0 unknown§§
+| history-lines-0:12:16-out
+| history-lines-0:8:16-out
 | history-lines-0:16:20-in
 | history-lines-0:16:18-in
-line 14 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /0 unknown§§
 line 15 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /1 unknown§§
-| history-lines-0:16:18-out
-| history-lines-0:18:19-in
 line 16 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /2 unknown§§
-| history-lines-0:18:19-out
+| history-lines-0:16:18-out
 line 17 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /3 unknown§§
+line 18 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /4 unknown§§
 | history-lines-0:16:20-out
 | history-lines-0:20:22-in
-line 18 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /4 unknown§§
 line 19 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /5 unknown§§
+line 20 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /6 unknown§§
 | history-lines-0:20:22-out
 | history-lines-0:22:23-in
-line 20 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /6 unknown§§
-| history-lines-0:22:23-out
 line 21 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /7 unknown§§
-| history-lines-0:16:24-out
+| history-lines-0:22:23-out
 repeat status-prompt-empty
 | at-bottom-before-wrapped-out
 
@@ -227,34 +233,32 @@ repeat at-bottom-before-wrapped
 # quick look one scroll up to check single-scroll increase of below-scroll count (when up-scroll not limited, and all lines un-wrapped)
 > /window.history.scroll up
 repeat lines-empty-8
-repeat history-lines-0:0:8 +8
-repeat history-lines-0:8:12 +16
-repeat history-lines-0:12:13 +20
+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 [11] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 > /window.history.scroll down
 repeat at-bottom-before-wrapped
 
-# # check wrapping
+# check wrapping
 > /foo_0123456789_0123456789_01234567
 log 0 #!. invalid prompt command: /foo_0123456789_0123456789_01234567 unknown
 > /foo_0123456789_0123456789_012345678
 log 0 #!. invalid prompt command: /foo_0123456789_0123456789_012345678 unknown
 | at-bottom-after-wrapped-in
-repeat history-lines-0:5:6 +0
-repeat history-lines-0:6:8 +1
-| history-lines-0:8:16-in
-repeat history-lines-0:8:12 +3
-repeat history-lines-0:12:16 +7
-| history-lines-0:8:16-out
-repeat history-lines-0:16:24 +11
-| history-lines-0:24:26-in
+repeat history-lines-0:4:8 +0
+repeat history-lines-0:8:16 +4
+repeat history-lines-0:16:20 +12
+repeat history-lines-0:20:22 +16
+repeat history-lines-0:22:23 +18
+| history-lines-0:23:24-in
 line 19 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /foo_0123456789_0123456789_01234567 unknown§§
+| history-lines-0:23:24-out
+| history-lines-0:24:26-in
 line 20 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /foo_0123456789_0123456789_012345678§§
-| history-lines-0:24:26-out
-| history-lines-0:26:27-in
 line 21 on_black,bright_red,bold     unknown§§
-| history-lines-0:26:27-out
+| history-lines-0:24:26-out
 repeat status-prompt-empty
 | at-bottom-after-wrapped-out
 
@@ -262,8 +266,11 @@ repeat status-prompt-empty
 > /window.history.scroll up
 | scrollup-after-wrapped-in
 repeat lines-empty-4 +0
-repeat lines-empty-1 +4
-repeat history-lines-0:0:16 +5
+repeat lines-empty-2 +4
+repeat history-lines-0:0:8 +6
+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
 line 21 on_black,bright_white,reverse vvv [10] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
@@ -285,11 +292,16 @@ repeat status-prompt-empty
 
 # check scroll-down over wrapped will snap down to bottom of wrapped
 > /window.history.scroll down
-repeat history-lines-0:6:8 +0
-repeat history-lines-0:8:16 +2
-repeat history-lines-0:16:24 +10
-repeat history-lines-0:24:26 +18
-repeat history-lines-0:26:27 +20
+repeat history-lines-0:5:6 +0
+repeat history-lines-0:6:8 +1
+repeat history-lines-0:8:16 +3
+| history-lines-0:16:24-in
+repeat history-lines-0:16:20 +11
+repeat history-lines-0:20:22 +15
+repeat history-lines-0:22:23 +17
+repeat history-lines-0:23:24 +18
+| history-lines-0:16:24-out
+repeat history-lines-0:24:26 +19
 line 21 on_black,bright_white,reverse vvv [1] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 
@@ -300,13 +312,14 @@ line 21 on_black,bright_white,reverse vvv [11] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 repeat status-prompt-empty
 > /window.history.scroll up
 repeat lines-empty-16 +0
-repeat history-lines-0:0:4 +16
-repeat history-lines-0:4:5 +20
+repeat lines-empty-1 +16
+repeat history-lines-0:0:2 +17
+repeat history-lines-0:2:4 +19
 line 21 on_black,bright_white,reverse vvv [22] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 > /window.history.scroll up
 repeat topmost-scroll
-line 21 on_black,bright_white,reverse vvv [26] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [25] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-empty
 
 # check that triggering creation of new window with new lines adds it to status, with unread-lines count
@@ -332,7 +345,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 [26] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [25] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 line 22 on_black,bright_white :start)==========================================================([(0:1)] (1:19)§§
 repeat prompt-empty
 
@@ -391,7 +404,7 @@ repeat prompt-empty
 # check switch-back to window 0, retaining clearing of window 1's unread-lines count
 > /window 0
 repeat topmost-scroll
-line 21 on_black,bright_white,reverse vvv [26] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [25] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-after-first-return
 | status-prompt-after-first-return-in
 line 22 on_black,bright_white :start)===============================================================([(0:1)] 1§§
@@ -404,7 +417,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 [15] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [14] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-after-first-return
 > /window.history.scroll down
 | before-first-sight-of-bookmark-in
@@ -414,33 +427,32 @@ 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 [4] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
+line 21 on_black,bright_white,reverse vvv [3] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-after-first-return
 | before-first-sight-of-bookmark-out
 > /window.history.scroll down
 | first-sight-of-bookmark-in
-repeat history-lines-0:8:16 +0
-repeat history-lines-0:16:24 +8
-repeat history-lines-0:24:26 +16
-repeat history-lines-0:26:27 +18
+repeat history-lines-0:7:8 +0
+repeat history-lines-0:8:16 +1
+repeat history-lines-0:16:24 +9
+repeat history-lines-0:24:26 +17
 | bookmark-in
 line 19 on_black,bright_white --------------------------------------------------------------------------------§§
 | bookmark-out
-| history-lines-0:27:28-in
+| history-lines-0:26:28-in
 line 20 on_black,bright_red,bold #!. §§:§§:§§ invalid prompt command: /bar_0123456789_0123456789_012345678§§
-| history-lines-0:27:28-out
-| history-lines-0:28:29-in
 line 21 on_black,bright_red,bold     unknown§§
-| history-lines-0:28:29-out
+| history-lines-0:26:28-out
 repeat status-prompt-after-first-return
 | first-sight-of-bookmark-out
 
 # check that scrolling non-bottom bookmark out of sight, then scrolling it back into view again does not by itself move its position in the log history
 > /window.history.scroll up
 repeat lines-empty-2 +0
-repeat history-lines-0:0:16 +2
-repeat history-lines-0:16:18 +18
-repeat history-lines-0:18:19 +20
+repeat lines-empty-1 +2
+repeat history-lines-0:0:8 +3
+repeat history-lines-0:8:16 +11
+repeat history-lines-0:16:18 +19
 line 21 on_black,bright_white,reverse vvv [8] vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv§§
 repeat status-prompt-after-first-return
 > /window.history.scroll down
@@ -460,14 +472,13 @@ repeat prompt-empty
 
 # check second switch-back places bookmark at bottom there too, since the newest lines previously succeeding it have now been read by us
 > /window 0
-repeat history-lines-0:8:16 +0
-repeat history-lines-0:16:24 +8
+repeat history-lines-0:7:8 +0
+repeat history-lines-0:8:16 +1
+repeat history-lines-0:16:24 +9
 | history-lines-0:24:28-in
-repeat history-lines-0:24:26 +16
-repeat history-lines-0:26:27 +18
-repeat history-lines-0:27:28 +19
+repeat history-lines-0:24:26 +17
+repeat history-lines-0:26:28 +19
 | history-lines-0:24:28-out
-repeat history-lines-0:28:29 +20
 repeat bookmark +21
 line 22 on_black,bright_white :start)===================================================================([0] 1§§
 repeat prompt-empty
@@ -478,19 +489,18 @@ log 0 #.. windows available via /window:
 log 0 #..   0) :start
 log 0 #..   1) foo.bar.baz:debug
 | before-first-server-responses-in
-repeat history-lines-0:11:12 +0
-repeat history-lines-0:12:16 +1
-repeat history-lines-0:16:24 +5
-repeat history-lines-0:24:28 +13
-repeat history-lines-0:28:29 +17
+repeat history-lines-0:10:12 +0
+repeat history-lines-0:12:16 +2
+repeat history-lines-0:16:24 +6
+repeat history-lines-0:24:28 +14
 repeat bookmark +18
-| history-lines-0:29:30-in
+| history-lines-0:28:30-in
 line 19 on_black,bright_cyan #.. §§:§§:§§ windows available via /window:§§
-| history-lines-0:29:30-out
-| history-lines-0:30:32-in
 line 20 on_black,bright_cyan #.. §§:§§:§§   0) :start§§
+| history-lines-0:28:30-out
+| history-lines-0:30:31-in
 line 21 on_black,bright_cyan #.. §§:§§:§§   1) foo.bar.baz:debug§§
-| history-lines-0:30:32-out
+| history-lines-0:30:31-out
 | before-first-server-responses-out
 line 22 on_black,bright_white :start)===================================================================([0] 1§§
 repeat prompt-empty
@@ -555,13 +565,12 @@ repeat status-prompt-both-empty
 # check that with new lines left unread, switch away and back into window moves bookmark below newest read line, counts unread lines in status
 > /window 0
 | win-0-only-for-win-1-tests-in
-repeat history-lines-0:11:12 +0
-repeat history-lines-0:12:16 +1
-repeat history-lines-0:16:24 +5
-repeat history-lines-0:24:28 +13
-repeat history-lines-0:28:29 +17
-repeat history-lines-0:29:30 +18
-repeat history-lines-0:30:32 +19
+repeat history-lines-0:10:12 +0
+repeat history-lines-0:12:16 +2
+repeat history-lines-0:16:24 +6
+repeat history-lines-0:24:28 +14
+repeat history-lines-0:28:30 +18
+repeat history-lines-0:30:31 +20
 repeat bookmark +21
 | win-0-only-for-win-1-tests-out
 line 22 on_black,bright_white :start)===============================================================([0] (1:2)§§