From 903cccca948da1e3c02877f64b8d522de339eece Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 12 Nov 2025 01:25:45 +0100 Subject: [PATCH] More tests refactoring, and moving library files into subdirectory. --- src/tests/_timeout_retries.test | 14 +++++------ src/tests/caps.test | 14 +++++------ src/tests/channels.test | 14 +++++------ src/tests/config.test | 2 +- src/tests/connect_disconnect_legalities.test | 14 +++++------ src/tests/error_disconnects.test | 12 ++++----- .../attempting-to-connected} | 2 +- src/tests/{__bazbarfoo.lib => lib/bazbarfoo} | 2 +- src/tests/{__caps.lib => lib/caps} | 2 +- .../cmd-disconnect} | 0 src/tests/{__conn.lib => lib/conn} | 2 +- .../{__conn-error.lib => lib/conn-error} | 4 +-- .../connect-to-connected} | 4 +-- .../{__disconnect.lib => lib/disconnect} | 2 +- .../enter-list-start} | 0 .../{__enter_misc.lib => lib/enter_misc} | 0 .../error-to-disconnect} | 4 +-- .../isupport-clear} | 0 .../no-timely-pong} | 4 +-- src/tests/{__retry-in.lib => lib/retry-in} | 0 .../servermsglogged} | 0 src/tests/lib/servernotice | 6 +++++ src/tests/pingpong.test | 12 ++++----- src/tests/test.test | 25 ++++++++----------- src/tests/tui_draw.test | 8 +++--- src/tests/tui_line_formattings.test | 9 +++---- src/tests/tui_prompt_basics.test | 4 +-- 27 files changed, 80 insertions(+), 80 deletions(-) rename src/tests/{__attempting-to-connected.lib => lib/attempting-to-connected} (84%) rename src/tests/{__bazbarfoo.lib => lib/bazbarfoo} (89%) rename src/tests/{__caps.lib => lib/caps} (85%) rename src/tests/{__cmd-disconnect.lib => lib/cmd-disconnect} (100%) rename src/tests/{__conn.lib => lib/conn} (95%) rename src/tests/{__conn-error.lib => lib/conn-error} (65%) rename src/tests/{__connect-to-connected.lib => lib/connect-to-connected} (68%) rename src/tests/{__disconnect.lib => lib/disconnect} (88%) rename src/tests/{__enter-list-start.lib => lib/enter-list-start} (100%) rename src/tests/{__enter_misc.lib => lib/enter_misc} (100%) rename src/tests/{__error-to-disconnect.lib => lib/error-to-disconnect} (67%) rename src/tests/{__isupport-clear.lib => lib/isupport-clear} (100%) rename src/tests/{__no-timely-pong.lib => lib/no-timely-pong} (82%) rename src/tests/{__retry-in.lib => lib/retry-in} (100%) rename src/tests/{__servermsglogged.lib => lib/servermsglogged} (100%) create mode 100644 src/tests/lib/servernotice diff --git a/src/tests/_timeout_retries.test b/src/tests/_timeout_retries.test index 17049c2..6cb30a3 100644 --- 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 0c8642f..70c84ef 100644 --- 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 efb0313..c5c90c0 100644 --- 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 dcf409b..3593348 100644 --- 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 8d6b208..2319c1c 100644 --- 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 35810df..1759636 100644 --- 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/__attempting-to-connected.lib b/src/tests/lib/attempting-to-connected similarity index 84% rename from src/tests/__attempting-to-connected.lib rename to src/tests/lib/attempting-to-connected index 75ea13a..608ed65 100644 --- a/src/tests/__attempting-to-connected.lib +++ b/src/tests/lib/attempting-to-connected @@ -1,4 +1,4 @@ -insert ./__conn.lib +insert ./lib/conn # for: attempting, connected × attempting-to-connected diff --git a/src/tests/__bazbarfoo.lib b/src/tests/lib/bazbarfoo similarity index 89% rename from src/tests/__bazbarfoo.lib rename to src/tests/lib/bazbarfoo index 8744b1f..c12c744 100644 --- a/src/tests/__bazbarfoo.lib +++ b/src/tests/lib/bazbarfoo @@ -1,4 +1,4 @@ -insert ./__conn.lib +insert ./lib/conn # for: attempting, connect × connect-bazbarfoo diff --git a/src/tests/__caps.lib b/src/tests/lib/caps similarity index 85% rename from src/tests/__caps.lib rename to src/tests/lib/caps index 0619211..48cc4bf 100644 --- a/src/tests/__caps.lib +++ b/src/tests/lib/caps @@ -1,4 +1,4 @@ -insert ./__servermsglogged.lib +insert ./lib/servermsglogged × cap-msg insert servermsglogged : +0 MSG :*.?.net CAP ??? diff --git a/src/tests/__cmd-disconnect.lib b/src/tests/lib/cmd-disconnect similarity index 100% rename from src/tests/__cmd-disconnect.lib rename to src/tests/lib/cmd-disconnect diff --git a/src/tests/__conn.lib b/src/tests/lib/conn similarity index 95% rename from src/tests/__conn.lib rename to src/tests/lib/conn index 7453889..dc3ae36 100644 --- a/src/tests/__conn.lib +++ b/src/tests/lib/conn @@ -1,4 +1,4 @@ -insert ./__isupport-clear.lib +insert ./lib/isupport-clear × attempting log 1 $ connection_state set to: [connecting] diff --git a/src/tests/__conn-error.lib b/src/tests/lib/conn-error similarity index 65% rename from src/tests/__conn-error.lib rename to src/tests/lib/conn-error index 7ebcc39..c15366b 100644 --- a/src/tests/__conn-error.lib +++ b/src/tests/lib/conn-error @@ -1,6 +1,6 @@ -insert ./__disconnect.lib +insert ./lib/disconnect # for: disconnect1 -insert ./__error-to-disconnect.lib +insert ./lib/error-to-disconnect × conn-error insert error-to-disconnect :-1 +0 ? §§§ diff --git a/src/tests/__connect-to-connected.lib b/src/tests/lib/connect-to-connected similarity index 68% rename from src/tests/__connect-to-connected.lib rename to src/tests/lib/connect-to-connected index 3f717b1..20ca772 100644 --- a/src/tests/__connect-to-connected.lib +++ b/src/tests/lib/connect-to-connected @@ -1,6 +1,6 @@ -insert ./__attempting-to-connected.lib +insert ./lib/attempting-to-connected # for: attempting-to-connected -insert ./__conn.lib +insert ./lib/conn # for: connect × connect-to-connected diff --git a/src/tests/__disconnect.lib b/src/tests/lib/disconnect similarity index 88% rename from src/tests/__disconnect.lib rename to src/tests/lib/disconnect index 70a6796..b21b9e7 100644 --- a/src/tests/__disconnect.lib +++ b/src/tests/lib/disconnect @@ -1,4 +1,4 @@ -insert ./__isupport-clear.lib +insert ./lib/isupport-clear × disconnect0 log 1 $ connection_state set to: [EXIT_MSG] diff --git a/src/tests/__enter-list-start.lib b/src/tests/lib/enter-list-start similarity index 100% rename from src/tests/__enter-list-start.lib rename to src/tests/lib/enter-list-start diff --git a/src/tests/__enter_misc.lib b/src/tests/lib/enter_misc similarity index 100% rename from src/tests/__enter_misc.lib rename to src/tests/lib/enter_misc diff --git a/src/tests/__error-to-disconnect.lib b/src/tests/lib/error-to-disconnect similarity index 67% rename from src/tests/__error-to-disconnect.lib rename to src/tests/lib/error-to-disconnect index c1b4761..03f1559 100644 --- a/src/tests/__error-to-disconnect.lib +++ b/src/tests/lib/error-to-disconnect @@ -1,6 +1,6 @@ -insert ./__disconnect.lib +insert ./lib/disconnect # for: disconnect0 -insert ./__servermsglogged.lib +insert ./lib/servermsglogged × error-to-disconnect insert servermsglogged : +0 MSG ERROR :? diff --git a/src/tests/__isupport-clear.lib b/src/tests/lib/isupport-clear similarity index 100% rename from src/tests/__isupport-clear.lib rename to src/tests/lib/isupport-clear diff --git a/src/tests/__no-timely-pong.lib b/src/tests/lib/no-timely-pong similarity index 82% rename from src/tests/__no-timely-pong.lib rename to src/tests/lib/no-timely-pong index bda6692..8b6f837 100644 --- a/src/tests/__no-timely-pong.lib +++ b/src/tests/lib/no-timely-pong @@ -1,6 +1,6 @@ -insert ./__disconnect.lib +insert ./lib/disconnect # for: disconnect0, disconnect1 -insert ./__retry-in.lib +insert ./lib/retry-in × no-timely-pong servermsg 0 timeout diff --git a/src/tests/__retry-in.lib b/src/tests/lib/retry-in similarity index 100% rename from src/tests/__retry-in.lib rename to src/tests/lib/retry-in diff --git a/src/tests/__servermsglogged.lib b/src/tests/lib/servermsglogged similarity index 100% rename from src/tests/__servermsglogged.lib rename to src/tests/lib/servermsglogged diff --git a/src/tests/lib/servernotice b/src/tests/lib/servernotice new file mode 100644 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 5783169..dd32390 100644 --- 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 260abcb..81938bc 100644 --- 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 e1994de..7398119 100644 --- 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 4ecb885..7948a16 100644 --- 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 1a0d1b6..0d43a7d 100644 --- 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 × ×--------------------------- -- 2.30.2