More tests refactoring, and moving library files into subdirectory.

diff --git a/src/tests/__attempting-to-connected.lib b/src/tests/__attempting-to-connected.lib
deleted file mode 100644 (file)
index 75ea13a..0000000
--- a/src/tests/__attempting-to-connected.lib
+++ /dev/null
@@ -1,7 +0,0 @@
-insert ./__conn.lib
-# for: attempting, connected
-
-× attempting-to-connected
-insert attempting
-insert connected : +1 WIN_IDS 2
-

diff --git a/src/tests/__bazbarfoo.lib b/src/tests/__bazbarfoo.lib
deleted file mode 100644 (file)
index 8744b1f..0000000
--- a/src/tests/__bazbarfoo.lib
+++ /dev/null
@@ -1,8 +0,0 @@
-insert ./__conn.lib
-# for: attempting, connect
-
-× connect-bazbarfoo
-insert connect : +3 foo.bar.baz baz.bar.foo
-
-× attempting-bazbarfoo
-insert attempting : +3 foo.bar.baz baz.bar.foo

diff --git a/src/tests/__caps.lib b/src/tests/__caps.lib
deleted file mode 100644 (file)
index 0619211..0000000
--- a/src/tests/__caps.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-insert ./__servermsglogged.lib
-
-× cap-msg
-insert servermsglogged : +0 MSG :*.?.net CAP ???
-
-× caps-neg-empty
-insert cap-msg : +0 ??? * LS :
-log 1 > CAP :LIST
-insert cap-msg : +0 ??? * LIST :
-log 1 > CAP :END

diff --git a/src/tests/__cmd-disconnect.lib b/src/tests/__cmd-disconnect.lib
deleted file mode 100644 (file)
index 3158756..0000000
--- a/src/tests/__cmd-disconnect.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-× cmd-disconnect
-> /disconnect
-log 1 > QUIT :ircplom says bye

diff --git a/src/tests/__conn-error.lib b/src/tests/__conn-error.lib
deleted file mode 100644 (file)
index 7ebcc39..0000000
--- a/src/tests/__conn-error.lib
+++ /dev/null
@@ -1,8 +0,0 @@
-insert ./__disconnect.lib
-# for: disconnect1
-insert ./__error-to-disconnect.lib
-
-× conn-error
-insert error-to-disconnect :-1 +0 ? §§§
-insert disconnect1 1:-1 +1 WIN_IDS 2
-

diff --git a/src/tests/__conn.lib b/src/tests/__conn.lib
deleted file mode 100644 (file)
index 7453889..0000000
--- a/src/tests/__conn.lib
+++ /dev/null
@@ -1,29 +0,0 @@
-insert ./__isupport-clear.lib
-
-× attempting
-log 1 $ connection_state set to: [connecting]
-log 2 $ attempting connection to foo.bar.baz:6697 identifying with …
-log 2 $ - nickname: foo
-log 2 $ - realname: bar
-log 2 $ - username: baz
-log 2 $ - no password
-
-× connect
-> /connect foo.bar.baz:6697 foo bar:baz
-insert isupport-clear : +1
-log 1 $ caps cleared
-log 1 $ users cleared
-log 1 $ channels cleared
-log , $ DISCONNECTED
-log 1 $ hostname set to: [foo.bar.baz]
-log 1 $ port set to: [6697]
-log 1 $ nick_wanted set to: [foo]
-log 1 $ user_wanted set to: [baz]
-log 1 $ realname set to: [bar]
-
-× connected
-log 1 $ connection_state set to: [connected]
-log WIN_IDS $ CONNECTED
-log 1 > CAP LS :302
-log 1 > USER baz 0 * :bar
-log 1 > NICK :foo

diff --git a/src/tests/__connect-to-connected.lib b/src/tests/__connect-to-connected.lib
deleted file mode 100644 (file)
index 3f717b1..0000000
--- a/src/tests/__connect-to-connected.lib
+++ /dev/null
@@ -1,9 +0,0 @@
-insert ./__attempting-to-connected.lib
-# for: attempting-to-connected
-insert ./__conn.lib
-# for: connect
-
-× connect-to-connected
-insert connect : +1
-insert attempting-to-connected : +1
-

diff --git a/src/tests/__disconnect.lib b/src/tests/__disconnect.lib
deleted file mode 100644 (file)
index 70a6796..0000000
--- a/src/tests/__disconnect.lib
+++ /dev/null
@@ -1,12 +0,0 @@
-insert ./__isupport-clear.lib
-
-× disconnect0
-log 1 $ connection_state set to: [EXIT_MSG]
-insert isupport-clear : +1
-log 1 $ caps cleared
-
-× disconnect1
-log 1 $ channels cleared
-log 1 $ connection_state set to: []
-log WIN_IDS $ DISCONNECTED
-log 1 $ users cleared

diff --git a/src/tests/__enter-list-start.lib b/src/tests/__enter-list-start.lib
deleted file mode 100644 (file)
index 12d7bfa..0000000
--- a/src/tests/__enter-list-start.lib
+++ /dev/null
@@ -1,4 +0,0 @@
-× enter-list-start
-> /list
-log 0 # windows available via /window:
-log 0 #   0) :start

diff --git a/src/tests/__enter_misc.lib b/src/tests/__enter_misc.lib
deleted file mode 100644 (file)
index 0960960..0000000
--- a/src/tests/__enter_misc.lib
+++ /dev/null
@@ -1,22 +0,0 @@
-× enter-help-win0
-> /help
-log 0 # commands available in this window:
-log 0 #   /connect HOST_PORT [NICKNAME_PW] [REALNAME_USERNAME]
-log 0 #   /help
-log 0 #   /list
-log 0 #   /prompt_enter
-log 0 #   /quit
-log 0 #   /window TOWARDS
-log 0 #   /window.history.scroll DIRECTION
-log 0 #   /window.paste
-log 0 #   /window.prompt.backspace
-log 0 #   /window.prompt.move_cursor DIRECTION
-log 0 #   /window.prompt.scroll DIRECTION
-
-× enter-unknown
-> /?
-log 0 # invalid prompt command: /? unknown
-
-× enter-unprefixed
-> ?
-log 0 # invalid prompt command: not prefixed by /

diff --git a/src/tests/__error-to-disconnect.lib b/src/tests/__error-to-disconnect.lib
deleted file mode 100644 (file)
index c1b4761..0000000
--- a/src/tests/__error-to-disconnect.lib
+++ /dev/null
@@ -1,8 +0,0 @@
-insert ./__disconnect.lib
-# for: disconnect0
-insert ./__servermsglogged.lib
-
-× error-to-disconnect
-insert servermsglogged : +0 MSG ERROR :?
-insert disconnect0 : +1 EXIT_MSG ?
-

diff --git a/src/tests/__isupport-clear.lib b/src/tests/__isupport-clear.lib
deleted file mode 100644 (file)
index dd944f9..0000000
--- a/src/tests/__isupport-clear.lib
+++ /dev/null
@@ -1,5 +0,0 @@
-× isupport-clear
-log 1 $ isupport cleared
-log 1 $ isupport:CHANTYPES set to: [#&]
-log 1 $ isupport:PREFIX set to: [(ov)@+]
-log 1 $ isupport:USERLEN set to: [10]

diff --git a/src/tests/__no-timely-pong.lib b/src/tests/__no-timely-pong.lib
deleted file mode 100644 (file)
index bda6692..0000000
--- a/src/tests/__no-timely-pong.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-insert ./__disconnect.lib
-# for: disconnect0, disconnect1
-insert ./__retry-in.lib
-
-× no-timely-pong
-servermsg 0 timeout
-servermsg 0 no timely PONG from server
-insert disconnect0 :-1 +1 EXIT_MSG broken: no timely PONG from server
-insert disconnect1 1:-1 +1 WIN_IDS 2
-insert retry-in : +1 ? 1

diff --git a/src/tests/__retry-in.lib b/src/tests/__retry-in.lib
deleted file mode 100644 (file)
index 316bffc..0000000
--- a/src/tests/__retry-in.lib
+++ /dev/null
@@ -1,2 +0,0 @@
-× retry-in
-log 1 $ will retry connecting in ? seconds

diff --git a/src/tests/__servermsglogged.lib b/src/tests/__servermsglogged.lib
deleted file mode 100644 (file)
index b2f21da..0000000
--- a/src/tests/__servermsglogged.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-× servermsglogged
-servermsg 0 MSG
-log 1 < MSG

diff --git a/src/tests/_timeout_retries.test b/src/tests/_timeout_retries.test
index 17049c2e43d10b4e58a55d37f666717f7c629146..6cb30a31add4f88f4cfb9171d4bbea3a7e86e830 100644 (file)
--- a/src/tests/_timeout_retries.test
+++ b/src/tests/_timeout_retries.test
@@ -1,12 +1,12 @@
-insert ./__attempting-to-connected.lib
-insert ./__bazbarfoo.lib
+insert ./lib/attempting-to-connected
+insert ./lib/bazbarfoo
 # for: attempting-bazbarfoo, connect-bazbarfoo
-insert ./__conn.lib
+insert ./lib/conn
 # for: attempting, connect, connected
-insert ./__cmd-disconnect.lib
-insert ./__enter-list-start.lib
-insert ./__no-timely-pong.lib
-insert ./__retry-in.lib
+insert ./lib/cmd-disconnect
+insert ./lib/enter-list-start
+insert ./lib/no-timely-pong
+insert ./lib/retry-in
 
 × fake-testing-timeout
 log 1 $ connection_state set to: [failed to connect: FAKE TESTING TIMEOUT]

diff --git a/src/tests/caps.test b/src/tests/caps.test
index 0c8642fb3da11de943775dd86ef5f64c272f5944..70c84efe55660c4d6d44ae1314c0062a9bddee3c 100644 (file)
--- a/src/tests/caps.test
+++ b/src/tests/caps.test
@@ -1,12 +1,12 @@
-insert ./__attempting-to-connected.lib
-insert ./__connect-to-connected.lib
-insert ./__caps.lib
+insert ./lib/attempting-to-connected
+insert ./lib/connect-to-connected
+insert ./lib/caps
 # for: cap-msg, caps-neg-empty
-insert ./__cmd-disconnect.lib
-insert ./__disconnect.lib
+insert ./lib/cmd-disconnect
+insert ./lib/disconnect
 # for: disconnect1
-insert ./__error-to-disconnect.lib
-insert ./__servermsglogged.lib
+insert ./lib/error-to-disconnect
+insert ./lib/servermsglogged
 
 × disconnect-init
 insert cmd-disconnect : +1

diff --git a/src/tests/channels.test b/src/tests/channels.test
index efb0313b9877c9d54f730648d1296953dcda623c..c5c90c05acbfd759ceb97c7785a461a20cac6288 100644 (file)
--- a/src/tests/channels.test
+++ b/src/tests/channels.test
@@ -1,13 +1,13 @@
-insert ./__caps.lib
+insert ./lib/caps
 # for: caps-neg-empty
-insert ./__cmd-disconnect.lib
-insert ./__conn.lib
+insert ./lib/cmd-disconnect
+insert ./lib/conn
 # for: attempting, connected
-insert ./__connect-to-connected.lib
-insert ./__disconnect.lib
+insert ./lib/connect-to-connected
+insert ./lib/disconnect
 # for: disconnect0, disconnect1
-insert ./__error-to-disconnect.lib
-insert ./__servermsglogged.lib
+insert ./lib/error-to-disconnect
+insert ./lib/servermsglogged
 
 × JOIN0
 log 1 > JOIN :CHANNEL

diff --git a/src/tests/config.test b/src/tests/config.test
index dcf409b2da78dec0b32253ae0de2a9cbb4d75eec..359334886af96987ce63b08b3f61e3f2ce2a025f 100644 (file)
--- a/src/tests/config.test
+++ b/src/tests/config.test
@@ -1,4 +1,4 @@
-insert ./__conn.lib
+insert ./lib/conn
 # for: attempting, connect, connected
 
 × ×---------------------------------------------------

diff --git a/src/tests/connect_disconnect_legalities.test b/src/tests/connect_disconnect_legalities.test
index 8d6b20851541ffac8831a133f11807539a5fe55e..2319c1cf15be00a5cef71b54ee0ac811bf215645 100644 (file)
--- a/src/tests/connect_disconnect_legalities.test
+++ b/src/tests/connect_disconnect_legalities.test
@@ -1,12 +1,12 @@
-insert ./__attempting-to-connected.lib
-insert ./__cmd-disconnect.lib
-insert ./__conn.lib
+insert ./lib/attempting-to-connected
+insert ./lib/cmd-disconnect
+insert ./lib/conn
 # for: connect
-insert ./__conn-error.lib
-insert ./__disconnect.lib
+insert ./lib/conn-error
+insert ./lib/disconnect
 # for: disconnect1
-insert ./__error-to-disconnect.lib
-insert ./__retry-in.lib
+insert ./lib/error-to-disconnect
+insert ./lib/retry-in
 
 × ×××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××
 

diff --git a/src/tests/error_disconnects.test b/src/tests/error_disconnects.test
index 35810df987e295f5cc267be2005ebf3407fba694..1759636540633022ab1644d83487ba7eb5c9e468 100644 (file)
--- a/src/tests/error_disconnects.test
+++ b/src/tests/error_disconnects.test
@@ -1,10 +1,10 @@
-insert ./__attempting-to-connected.lib
-insert ./__conn-error.lib
-insert ./__connect-to-connected.lib
-insert ./__disconnect.lib
+insert ./lib/attempting-to-connected
+insert ./lib/conn-error
+insert ./lib/connect-to-connected
+insert ./lib/disconnect
 # for: disconnect1
-insert ./__error-to-disconnect.lib
-insert ./__retry-in.lib
+insert ./lib/error-to-disconnect
+insert ./lib/retry-in
 
 × reconnect-error-logged
 > /reconnect

diff --git a/src/tests/lib/attempting-to-connected b/src/tests/lib/attempting-to-connected
new file mode 100644 (file)
index 0000000..608ed65
--- /dev/null
+++ b/src/tests/lib/attempting-to-connected
@@ -0,0 +1,7 @@
+insert ./lib/conn
+# for: attempting, connected
+
+× attempting-to-connected
+insert attempting
+insert connected : +1 WIN_IDS 2
+

diff --git a/src/tests/lib/bazbarfoo b/src/tests/lib/bazbarfoo
new file mode 100644 (file)
index 0000000..c12c744
--- /dev/null
+++ b/src/tests/lib/bazbarfoo
@@ -0,0 +1,8 @@
+insert ./lib/conn
+# for: attempting, connect
+
+× connect-bazbarfoo
+insert connect : +3 foo.bar.baz baz.bar.foo
+
+× attempting-bazbarfoo
+insert attempting : +3 foo.bar.baz baz.bar.foo

diff --git a/src/tests/lib/caps b/src/tests/lib/caps
new file mode 100644 (file)
index 0000000..48cc4bf
--- /dev/null
+++ b/src/tests/lib/caps
@@ -0,0 +1,10 @@
+insert ./lib/servermsglogged
+
+× cap-msg
+insert servermsglogged : +0 MSG :*.?.net CAP ???
+
+× caps-neg-empty
+insert cap-msg : +0 ??? * LS :
+log 1 > CAP :LIST
+insert cap-msg : +0 ??? * LIST :
+log 1 > CAP :END

diff --git a/src/tests/lib/cmd-disconnect b/src/tests/lib/cmd-disconnect
new file mode 100644 (file)
index 0000000..3158756
--- /dev/null
+++ b/src/tests/lib/cmd-disconnect
@@ -0,0 +1,3 @@
+× cmd-disconnect
+> /disconnect
+log 1 > QUIT :ircplom says bye

diff --git a/src/tests/lib/conn b/src/tests/lib/conn
new file mode 100644 (file)
index 0000000..dc3ae36
--- /dev/null
+++ b/src/tests/lib/conn
@@ -0,0 +1,29 @@
+insert ./lib/isupport-clear
+
+× attempting
+log 1 $ connection_state set to: [connecting]
+log 2 $ attempting connection to foo.bar.baz:6697 identifying with …
+log 2 $ - nickname: foo
+log 2 $ - realname: bar
+log 2 $ - username: baz
+log 2 $ - no password
+
+× connect
+> /connect foo.bar.baz:6697 foo bar:baz
+insert isupport-clear : +1
+log 1 $ caps cleared
+log 1 $ users cleared
+log 1 $ channels cleared
+log , $ DISCONNECTED
+log 1 $ hostname set to: [foo.bar.baz]
+log 1 $ port set to: [6697]
+log 1 $ nick_wanted set to: [foo]
+log 1 $ user_wanted set to: [baz]
+log 1 $ realname set to: [bar]
+
+× connected
+log 1 $ connection_state set to: [connected]
+log WIN_IDS $ CONNECTED
+log 1 > CAP LS :302
+log 1 > USER baz 0 * :bar
+log 1 > NICK :foo

diff --git a/src/tests/lib/conn-error b/src/tests/lib/conn-error
new file mode 100644 (file)
index 0000000..c15366b
--- /dev/null
+++ b/src/tests/lib/conn-error
@@ -0,0 +1,8 @@
+insert ./lib/disconnect
+# for: disconnect1
+insert ./lib/error-to-disconnect
+
+× conn-error
+insert error-to-disconnect :-1 +0 ? §§§
+insert disconnect1 1:-1 +1 WIN_IDS 2
+

diff --git a/src/tests/lib/connect-to-connected b/src/tests/lib/connect-to-connected
new file mode 100644 (file)
index 0000000..20ca772
--- /dev/null
+++ b/src/tests/lib/connect-to-connected
@@ -0,0 +1,9 @@
+insert ./lib/attempting-to-connected
+# for: attempting-to-connected
+insert ./lib/conn
+# for: connect
+
+× connect-to-connected
+insert connect : +1
+insert attempting-to-connected : +1
+

diff --git a/src/tests/lib/disconnect b/src/tests/lib/disconnect
new file mode 100644 (file)
index 0000000..b21b9e7
--- /dev/null
+++ b/src/tests/lib/disconnect
@@ -0,0 +1,12 @@
+insert ./lib/isupport-clear
+
+× disconnect0
+log 1 $ connection_state set to: [EXIT_MSG]
+insert isupport-clear : +1
+log 1 $ caps cleared
+
+× disconnect1
+log 1 $ channels cleared
+log 1 $ connection_state set to: []
+log WIN_IDS $ DISCONNECTED
+log 1 $ users cleared

diff --git a/src/tests/lib/enter-list-start b/src/tests/lib/enter-list-start
new file mode 100644 (file)
index 0000000..12d7bfa
--- /dev/null
+++ b/src/tests/lib/enter-list-start
@@ -0,0 +1,4 @@
+× enter-list-start
+> /list
+log 0 # windows available via /window:
+log 0 #   0) :start

diff --git a/src/tests/lib/enter_misc b/src/tests/lib/enter_misc
new file mode 100644 (file)
index 0000000..0960960
--- /dev/null
+++ b/src/tests/lib/enter_misc
@@ -0,0 +1,22 @@
+× enter-help-win0
+> /help
+log 0 # commands available in this window:
+log 0 #   /connect HOST_PORT [NICKNAME_PW] [REALNAME_USERNAME]
+log 0 #   /help
+log 0 #   /list
+log 0 #   /prompt_enter
+log 0 #   /quit
+log 0 #   /window TOWARDS
+log 0 #   /window.history.scroll DIRECTION
+log 0 #   /window.paste
+log 0 #   /window.prompt.backspace
+log 0 #   /window.prompt.move_cursor DIRECTION
+log 0 #   /window.prompt.scroll DIRECTION
+
+× enter-unknown
+> /?
+log 0 # invalid prompt command: /? unknown
+
+× enter-unprefixed
+> ?
+log 0 # invalid prompt command: not prefixed by /

diff --git a/src/tests/lib/error-to-disconnect b/src/tests/lib/error-to-disconnect
new file mode 100644 (file)
index 0000000..03f1559
--- /dev/null
+++ b/src/tests/lib/error-to-disconnect
@@ -0,0 +1,8 @@
+insert ./lib/disconnect
+# for: disconnect0
+insert ./lib/servermsglogged
+
+× error-to-disconnect
+insert servermsglogged : +0 MSG ERROR :?
+insert disconnect0 : +1 EXIT_MSG ?
+

diff --git a/src/tests/lib/isupport-clear b/src/tests/lib/isupport-clear
new file mode 100644 (file)
index 0000000..dd944f9
--- /dev/null
+++ b/src/tests/lib/isupport-clear
@@ -0,0 +1,5 @@
+× isupport-clear
+log 1 $ isupport cleared
+log 1 $ isupport:CHANTYPES set to: [#&]
+log 1 $ isupport:PREFIX set to: [(ov)@+]
+log 1 $ isupport:USERLEN set to: [10]

diff --git a/src/tests/lib/no-timely-pong b/src/tests/lib/no-timely-pong
new file mode 100644 (file)
index 0000000..8b6f837
--- /dev/null
+++ b/src/tests/lib/no-timely-pong
@@ -0,0 +1,10 @@
+insert ./lib/disconnect
+# for: disconnect0, disconnect1
+insert ./lib/retry-in
+
+× no-timely-pong
+servermsg 0 timeout
+servermsg 0 no timely PONG from server
+insert disconnect0 :-1 +1 EXIT_MSG broken: no timely PONG from server
+insert disconnect1 1:-1 +1 WIN_IDS 2
+insert retry-in : +1 ? 1

diff --git a/src/tests/lib/retry-in b/src/tests/lib/retry-in
new file mode 100644 (file)
index 0000000..316bffc
--- /dev/null
+++ b/src/tests/lib/retry-in
@@ -0,0 +1,2 @@
+× retry-in
+log 1 $ will retry connecting in ? seconds

diff --git a/src/tests/lib/servermsglogged b/src/tests/lib/servermsglogged
new file mode 100644 (file)
index 0000000..b2f21da
--- /dev/null
+++ b/src/tests/lib/servermsglogged
@@ -0,0 +1,3 @@
+× servermsglogged
+servermsg 0 MSG
+log 1 < MSG

diff --git a/src/tests/lib/servernotice b/src/tests/lib/servernotice
new file mode 100644 (file)
index 0000000..7d6b93f
--- /dev/null
+++ b/src/tests/lib/servernotice
@@ -0,0 +1,6 @@
+insert ./lib/servermsglogged
+
+× servernotice
+insert servermsglogged : +0 MSG :*.?.net NOTICE * :XXX
+log 2 < (server) XXX
+

diff --git a/src/tests/pingpong.test b/src/tests/pingpong.test
index 5783169267770d97bdf21a9acb3c3312a882b5d1..dd32390ec7445af74d05cce869faa31c30306d52 100644 (file)
--- a/src/tests/pingpong.test
+++ b/src/tests/pingpong.test
@@ -1,8 +1,9 @@
-insert ./__conn.lib
+insert ./lib/conn
 # for: attempting, connected
-insert ./__connect-to-connected.lib
-insert ./__no-timely-pong.lib
-insert ./__servermsglogged.lib
+insert ./lib/connect-to-connected
+insert ./lib/no-timely-pong
+insert ./lib/servermsglogged
+insert ./lib/servernotice
 
 × trigger-ping
 servermsg 0 timeout
@@ -12,8 +13,7 @@ log 1 > PING :what's up?
 # ping on timeout, go on as normal if PONG received 
 insert trigger-ping
 insert servermsglogged : +0 MSG :*.?.net PONG *.?.net :what's up?
-insert servermsglogged : +0 MSG :*.?.net NOTICE * :*** Looking up your ident...
-log 2 < (server) *** Looking up your ident...
+insert servernotice : +0 MSG XXX Looking up your ident...
 # another timeout instead of pong? disconnect
 insert trigger-ping
 insert no-timely-pong

diff --git a/src/tests/test.test b/src/tests/test.test
index 260abcb226446f3bb7ca7dabc5cfa64fde772b54..81938bc5a8550fcdcc478b7026d423e70040f2b2 100644 (file)
--- a/src/tests/test.test
+++ b/src/tests/test.test
@@ -1,15 +1,16 @@
-insert ./__bazbarfoo.lib
+insert ./lib/bazbarfoo
 # for: attempting-bazbarfoo, connect-bazbarfoo
-insert ./__cmd-disconnect.lib
-insert ./__conn.lib
+insert ./lib/cmd-disconnect
+insert ./lib/conn
 # for: attempting, connect, connected
-insert ./__disconnect.lib
+insert ./lib/disconnect
 # for: disconnect0, disconnect1
-insert ./__enter-list-start.lib
-insert ./__error-to-disconnect.lib
-insert ./__isupport-clear.lib
-insert ./__retry-in.lib
-insert ./__servermsglogged.lib
+insert ./lib/enter-list-start
+insert ./lib/error-to-disconnect
+insert ./lib/isupport-clear
+insert ./lib/retry-in
+insert ./lib/servermsglogged
+insert ./lib/servernotice
 
 
 
@@ -270,12 +271,6 @@ log 1 $ cannot send, connection seems closed
 > /privmsg #test test
 log 1 $ not sending, since not in channel
 
-
-
-× servernotice
-insert servermsglogged : +0 MSG :*.?.net NOTICE * :XXX
-log 2 < (server) XXX
-
 × ×××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××××
 
 # on /connect init databases, log in new windows, connect with values set by /connect, init CAP negotiation

diff --git a/src/tests/tui_draw.test b/src/tests/tui_draw.test
index e1994de238f795a30830349b41b9176d20177e01..73981196d67f7f87f09578d03cf76f82130f8757 100644 (file)
--- a/src/tests/tui_draw.test
+++ b/src/tests/tui_draw.test
@@ -1,8 +1,8 @@
-insert ./__connect-to-connected.lib
-insert ./__enter-list-start.lib
-insert ./__enter_misc.lib
+insert ./lib/connect-to-connected
+insert ./lib/enter-list-start
+insert ./lib/enter_misc
 # for: enter-help-win0, enter-unknown, enter-unprefixed
-insert ./__servermsglogged.lib
+insert ./lib/servermsglogged
 
 × lines-empty-1
 line 0 on_black,bright_white §§

diff --git a/src/tests/tui_line_formattings.test b/src/tests/tui_line_formattings.test
index 4ecb8856ff77c9ae52a6960049a99df4488c5ff9..7948a16e0558b565c191242515e34afb3737b298 100644 (file)
--- a/src/tests/tui_line_formattings.test
+++ b/src/tests/tui_line_formattings.test
@@ -1,5 +1,6 @@
-insert ./__connect-to-connected.lib
-insert ./__servermsglogged.lib
+insert ./lib/connect-to-connected
+insert ./lib/servermsglogged
+insert ./lib/servernotice
 
 × servermsglogged-and-line-unwrapped
 insert servermsglogged : +0 MSG XXX
@@ -53,9 +54,7 @@ line 20 on_black,bright_white    :2345678_1_2345678_2_2345678_3_2345678_4_234567
 line 21 on_black,bright_white   💓§§
 
 # check interpretation and escape of formatting characters
-servermsg 0 :*.?.net NOTICE * :*** check that {esc|ape}s, formatting not counting into wrap
-log 1 < :*.?.net NOTICE * :*** check that {esc|ape}s, formatting not counting into wrap
-log 2 < (server) *** check that {esc|ape}s, formatting not counting into wrap
+insert servernotice : +0 XXX *** check that {esc|ape}s, formatting not counting into wrap
 line 20 on_black,bright_white < §§:§§:§§ :*.?.net NOTICE * :*** check that {esc|ape}s, formatting not counting§§
 line 21 on_black,bright_white    into wrap§§
 > /window 2

diff --git a/src/tests/tui_prompt_basics.test b/src/tests/tui_prompt_basics.test
index 1a0d1b6f5af4e58d0b2994deaa4e8606a5eaecb2..0d43a7d107c0c72eecdd604e109a5a29b92a4888 100644 (file)
--- a/src/tests/tui_prompt_basics.test
+++ b/src/tests/tui_prompt_basics.test
@@ -1,5 +1,5 @@
-insert ./__enter-list-start.lib
-insert ./__enter_misc.lib
+insert ./lib/enter-list-start
+insert ./lib/enter_misc
 # for: enter-help-win0, enter-unknown, enter-unprefixed
 
 × ×---------------------------