diff options
| -rw-r--r-- | tests/tests-record.cpp | 20 | ||||
| -rw-r--r-- | tests/tests-record.h | 2 | ||||
| -rw-r--r-- | tests/unit/core/test-core-command.cpp | 4 | ||||
| -rw-r--r-- | tests/unit/plugins/irc/test-irc-protocol.cpp | 1688 |
4 files changed, 1107 insertions, 607 deletions
diff --git a/tests/tests-record.cpp b/tests/tests-record.cpp index 0a7d8ef45..f286ac7d7 100644 --- a/tests/tests-record.cpp +++ b/tests/tests-record.cpp @@ -183,11 +183,14 @@ record_match (struct t_hashtable *recorded_msg, */ int -record_search (const char *buffer, const char *prefix, const char *message) +record_search (const char *buffer, const char *prefix, const char *message, + const char *tags) { - int i, size; + int i, rc, size; struct t_hashtable *rec_msg; + rc = -1; + size = arraylist_size (recorded_messages); for (i = 0; i < size; i++) @@ -197,13 +200,15 @@ record_search (const char *buffer, const char *prefix, const char *message) continue; if (record_match (rec_msg, "buffer_name", buffer) && record_match (rec_msg, "prefix_no_color", prefix) - && record_match (rec_msg, "message_no_color", message)) + && record_match (rec_msg, "message_no_color", message) + && (!tags || !tags[0] || record_match (rec_msg, "tags", tags))) { - return i; + rc = i; + break; } } - return -1; + return rc; } /* @@ -214,7 +219,7 @@ void record_dump (char **msg) { struct t_hashtable *rec_msg; - const char *ptr_buffer_name, *ptr_prefix, *ptr_msg; + const char *ptr_buffer_name, *ptr_prefix, *ptr_msg, *ptr_tags; int i, size; size = arraylist_size (recorded_messages); @@ -227,12 +232,15 @@ record_dump (char **msg) ptr_buffer_name = (const char *)hashtable_get (rec_msg, "buffer_name"); ptr_prefix = (const char *)hashtable_get (rec_msg, "prefix_no_color"); ptr_msg = (const char *)hashtable_get (rec_msg, "message_no_color"); + ptr_tags = (const char *)hashtable_get (rec_msg, "tags"); string_dyn_concat (msg, " ", -1); string_dyn_concat (msg, ptr_buffer_name, -1); string_dyn_concat (msg, ": prefix=\"", -1); string_dyn_concat (msg, ptr_prefix, -1); string_dyn_concat (msg, "\", message=\"", -1); string_dyn_concat (msg, ptr_msg, -1); + string_dyn_concat (msg, "\", tags=\"", -1); + string_dyn_concat (msg, ptr_tags, -1); string_dyn_concat (msg, "\"\n", -1); } } diff --git a/tests/tests-record.h b/tests/tests-record.h index bbc535ae8..5c3df599b 100644 --- a/tests/tests-record.h +++ b/tests/tests-record.h @@ -25,7 +25,7 @@ extern struct t_arraylist *recorded_messages; extern void record_start (); extern void record_stop (); extern int record_search (const char *buffer, const char *prefix, - const char *message); + const char *message, const char *tags); extern void record_dump (char **msg); extern void record_error_missing (const char *message); diff --git a/tests/unit/core/test-core-command.cpp b/tests/unit/core/test-core-command.cpp index a8f7de1a2..b417a23a0 100644 --- a/tests/unit/core/test-core-command.cpp +++ b/tests/unit/core/test-core-command.cpp @@ -43,7 +43,7 @@ extern "C" command_record ("core.weechat", __command); #define WEE_CHECK_MSG_BUFFER(__buffer_name, __prefix, __message) \ - if (record_search (__buffer_name, __prefix, __message) < 0) \ + if (record_search (__buffer_name, __prefix, __message, NULL) < 0) \ { \ char **msg = command_build_error (__buffer_name, __prefix, \ __message); \ @@ -54,7 +54,7 @@ extern "C" #define WEE_CHECK_MSG_CORE(__prefix, __message) \ WEE_CHECK_MSG_BUFFER("core.weechat", __prefix, __message); #define WEE_SEARCH_MSG_CORE(__prefix, __message) \ - record_search ("core.weechat", __prefix, __message) + record_search ("core.weechat", __prefix, __message, NULL) TEST_GROUP(CoreCommand) diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp index 70fab76b1..2112960d1 100644 --- a/tests/unit/plugins/irc/test-irc-protocol.cpp +++ b/tests/unit/plugins/irc/test-irc-protocol.cpp @@ -43,6 +43,7 @@ extern "C" #include "src/plugins/irc/irc-config.h" #include "src/plugins/irc/irc-nick.h" #include "src/plugins/irc/irc-server.h" +#include "src/plugins/logger/logger-config.h" #include "src/plugins/typing/typing-config.h" #include "src/plugins/typing/typing-status.h" #include "src/plugins/xfer/xfer-buffer.h" @@ -80,25 +81,27 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities, server_recv (__irc_msg); #define CHECK_CORE(__prefix, __message) \ - if (record_search ("core.weechat", __prefix, __message) < 0) \ + if (record_search ("core.weechat", __prefix, __message, NULL) < 0) \ { \ char **msg = server_build_error ( \ "Core message not displayed", \ __prefix, \ __message, \ + NULL, \ "All messages displayed"); \ record_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ } -#define CHECK_SRV(__prefix, __message) \ +#define CHECK_SRV(__prefix, __message, __tags) \ if (record_search ("irc.server." IRC_FAKE_SERVER, __prefix, \ - __message) < 0) \ + __message, __tags) < 0) \ { \ char **msg = server_build_error ( \ "Server message not displayed", \ __prefix, \ __message, \ + __tags, \ "All messages displayed"); \ record_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ @@ -108,39 +111,43 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities, CHECK_SRV("=!=", \ "irc: too few parameters received in command " \ "\"" __command "\" (received: " #__params ", " \ - "expected: at least " #__expected_params ")"); + "expected: at least " #__expected_params ")", \ + ""); #define CHECK_ERROR_NICK(__command) \ CHECK_SRV("=!=", \ - "irc: command \"" __command "\" received without " \ - "nick"); + "irc: command \"" __command "\" received without nick", \ + ""); #define CHECK_ERROR_PARSE(__command, __message) \ CHECK_SRV("=!=", \ "irc: failed to parse command \"" __command "\" " \ - "(please report to developers): \"" __message "\""); + "(please report to developers): \"" __message "\"", \ + ""); -#define CHECK_CHAN(__prefix, __message) \ +#define CHECK_CHAN(__prefix, __message, __tags) \ if (record_search ("irc." IRC_FAKE_SERVER ".#test", __prefix, \ - __message) < 0) \ + __message, __tags) < 0) \ { \ char **msg = server_build_error ( \ "Channel message not displayed", \ __prefix, \ __message, \ + __tags, \ "All messages displayed"); \ record_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ } -#define CHECK_PV(__nick, __prefix, __message) \ - if (record_search ("irc." IRC_FAKE_SERVER "." __nick, \ - __prefix, __message) < 0) \ +#define CHECK_PV(__nick, __prefix, __message, __tags) \ + if (record_search ("irc." IRC_FAKE_SERVER "." __nick, \ + __prefix, __message, __tags) < 0) \ { \ char **msg = server_build_error ( \ "Private message not displayed", \ __prefix, \ __message, \ + __tags, \ "All messages displayed"); \ record_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ @@ -153,6 +160,7 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities, "Unexpected message(s) displayed", \ NULL, \ NULL, \ + NULL, \ NULL); \ record_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ @@ -167,6 +175,7 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities, "Message not sent to server", \ NULL, \ __message, \ + NULL, \ "All messages sent"); \ sent_msg_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ @@ -178,6 +187,7 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities, "Unexpected response(s) sent to the IRC server", \ NULL, \ NULL, \ + NULL, \ NULL); \ sent_msg_dump (msg); \ FAIL(string_dyn_free (msg, 0)); \ @@ -185,17 +195,21 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities, #define SRV_INIT \ RECV(":server 001 alice :Welcome on this server, alice!"); \ - CHECK_SRV("--", "Welcome on this server, alice!"); + CHECK_SRV("--", "Welcome on this server, alice!", \ + "irc_001,irc_numeric,log3"); #define SRV_INIT_JOIN \ SRV_INIT; \ RECV(":alice!user_a@host_a JOIN #test"); \ - CHECK_CHAN("-->", "alice (user_a@host_a) has joined #test"); + CHECK_CHAN("-->", "alice (user_a@host_a) has joined #test", \ + "irc_join,nick_alice,host_user_a@host_a,log4"); #define SRV_INIT_JOIN2 \ SRV_INIT_JOIN; \ RECV(":bob!user_b@host_b JOIN #test"); \ - CHECK_CHAN("-->", "bob (user_b@host_b) has joined #test"); + CHECK_CHAN("-->", "bob (user_b@host_b) has joined #test", \ + "irc_join,irc_smart_filter,nick_bob,host_user_b@host_b," \ + "log4"); struct t_irc_server *ptr_server = NULL; struct t_arraylist *sent_messages = NULL; @@ -438,6 +452,7 @@ TEST_GROUP(IrcProtocolWithServer) char **server_build_error (const char *msg1, const char *prefix, const char *message, + const char *tags, const char *msg2) { char **msg; @@ -450,6 +465,8 @@ TEST_GROUP(IrcProtocolWithServer) string_dyn_concat (msg, prefix, -1); string_dyn_concat (msg, "\", message=\"", -1); string_dyn_concat (msg, message, -1); + string_dyn_concat (msg, "\", tags=\"", -1); + string_dyn_concat (msg, tags, -1); string_dyn_concat (msg, "\"\n", -1); } else @@ -535,6 +552,12 @@ TEST_GROUP(IrcProtocolWithServer) &signal_irc_out_cb, NULL, NULL); } + /* + * disable backlog feature during tests, so we are not polluted by + * these messages when buffers are opened + */ + config_file_option_set (logger_config_look_backlog, "0", 1); + /* create a fake server (no I/O) */ run_cmd_quiet ("/mute /server add " IRC_FAKE_SERVER " fake:127.0.0.1 " "-nicks=nick1,nick2,nick3"); @@ -552,6 +575,9 @@ TEST_GROUP(IrcProtocolWithServer) run_cmd_quiet ("/mute /disconnect " IRC_FAKE_SERVER); run_cmd_quiet ("/mute /server del " IRC_FAKE_SERVER); ptr_server = NULL; + + /* restore backlog feature */ + config_file_option_reset (logger_config_look_backlog, 1); } }; @@ -635,17 +661,19 @@ TEST(IrcProtocolWithServer, recv_command_not_found) SRV_INIT; RECV(":alice!user@host XYZ"); - CHECK_SRV("=!=", "irc: command \"XYZ\" not found: \":alice!user@host XYZ\""); + CHECK_SRV("=!=", "irc: command \"XYZ\" not found: \":alice!user@host XYZ\"", + ""); RECV(":alice!user@host XYZ abc def"); CHECK_SRV("=!=", - "irc: command \"XYZ\" not found: \":alice!user@host XYZ abc def\""); + "irc: command \"XYZ\" not found: \":alice!user@host XYZ abc def\"", + ""); RECV(":alice!user@host 099"); CHECK_ERROR_PARAMS("099", 0, 1); RECV(":alice!user@host 099 abc def"); - CHECK_SRV("--", "abc def"); + CHECK_SRV("--", "abc def", "irc_099,irc_numeric,log3"); } /* @@ -661,16 +689,16 @@ TEST(IrcProtocolWithServer, recv_command_invalid_message) CHECK_NO_MSG; RECV("abc"); - CHECK_SRV("=!=", "irc: command \"abc\" not found: \"abc\""); + CHECK_SRV("=!=", "irc: command \"abc\" not found: \"abc\"", ""); RECV(":alice!user@host"); CHECK_NO_MSG; RECV("@"); - CHECK_SRV("=!=", "irc: command \"@\" not found: \"@\""); + CHECK_SRV("=!=", "irc: command \"@\" not found: \"@\"", ""); RECV("@test"); - CHECK_SRV("=!=", "irc: command \"@test\" not found: \"@test\""); + CHECK_SRV("=!=", "irc: command \"@test\" not found: \"@test\"", ""); RECV("@test :"); CHECK_NO_MSG; @@ -703,23 +731,31 @@ TEST(IrcProtocolWithServer, account_without_account_notify_cap) POINTERS_EQUAL(NULL, ptr_nick->account); RECV(":bob!user@host ACCOUNT *"); - CHECK_CHAN("--", "bob has unidentified"); - CHECK_PV("bob", "--", "bob has unidentified"); + CHECK_CHAN("--", "bob has unidentified", + "irc_account,irc_smart_filter,nick_bob,host_user@host,log3"); + CHECK_PV("bob", "--", "bob has unidentified", + "irc_account,nick_bob,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_nick->account); RECV(":bob!user@host ACCOUNT :*"); - CHECK_CHAN("--", "bob has unidentified"); - CHECK_PV("bob", "--", "bob has unidentified"); + CHECK_CHAN("--", "bob has unidentified", + "irc_account,irc_smart_filter,nick_bob,host_user@host,log3"); + CHECK_PV("bob", "--", "bob has unidentified", + "irc_account,nick_bob,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_nick->account); RECV(":bob!user@host ACCOUNT new_account"); - CHECK_CHAN("--", "bob has identified as new_account"); - CHECK_PV("bob", "--", "bob has identified as new_account"); + CHECK_CHAN("--", "bob has identified as new_account", + "irc_account,irc_smart_filter,nick_bob,host_user@host,log3"); + CHECK_PV("bob", "--", "bob has identified as new_account", + "irc_account,nick_bob,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_nick->account); RECV(":bob!user@host ACCOUNT :new_account"); - CHECK_CHAN("--", "bob has identified as new_account"); - CHECK_PV("bob", "--", "bob has identified as new_account"); + CHECK_CHAN("--", "bob has identified as new_account", + "irc_account,irc_smart_filter,nick_bob,host_user@host,log3"); + CHECK_PV("bob", "--", "bob has identified as new_account", + "irc_account,nick_bob,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_nick->account); } @@ -742,23 +778,28 @@ TEST(IrcProtocolWithServer, account_with_account_notify_cap) POINTERS_EQUAL(NULL, ptr_nick->account); RECV(":alice!user@host ACCOUNT new_account"); - CHECK_CHAN("--", "alice has identified as new_account"); + CHECK_CHAN("--", "alice has identified as new_account", + "irc_account,nick_alice,host_user@host,log3"); STRCMP_EQUAL("new_account", ptr_nick->account); RECV(":alice!user@host ACCOUNT :new_account2"); - CHECK_CHAN("--", "alice has identified as new_account2"); + CHECK_CHAN("--", "alice has identified as new_account2", + "irc_account,nick_alice,host_user@host,log3"); STRCMP_EQUAL("new_account2", ptr_nick->account); RECV(":alice!user@host ACCOUNT *"); - CHECK_CHAN("--", "alice has unidentified"); + CHECK_CHAN("--", "alice has unidentified", + "irc_account,nick_alice,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_nick->account); RECV(":alice!user@host ACCOUNT :new_account3"); - CHECK_CHAN("--", "alice has identified as new_account3"); + CHECK_CHAN("--", "alice has identified as new_account3", + "irc_account,nick_alice,host_user@host,log3"); STRCMP_EQUAL("new_account3", ptr_nick->account); RECV(":alice!user@host ACCOUNT :*"); - CHECK_CHAN("--", "alice has unidentified"); + CHECK_CHAN("--", "alice has unidentified", + "irc_account,nick_alice,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_nick->account); } @@ -844,11 +885,17 @@ TEST(IrcProtocolWithServer, batch_without_batch_cap) /* new messages with batch reference */ RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :this is a test"); - CHECK_CHAN("bob", "this is a test"); + CHECK_CHAN("bob", "this is a test", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :second test"); - CHECK_CHAN("bob", "second test"); + CHECK_CHAN("bob", "second test", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :third test"); - CHECK_CHAN("bob", "third test"); + CHECK_CHAN("bob", "third test", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); /* end batch */ RECV(":server BATCH -ref"); @@ -861,11 +908,17 @@ TEST(IrcProtocolWithServer, batch_without_batch_cap) /* new messages with batch reference */ RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :test 1"); - CHECK_CHAN("bob", "test 1"); + CHECK_CHAN("bob", "test 1", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :test 2"); - CHECK_CHAN("bob", "test 2"); + CHECK_CHAN("bob", "test 2", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :test 3"); - CHECK_CHAN("bob", "test 3"); + CHECK_CHAN("bob", "test 3", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); /* end batch */ RECV(":server BATCH -ref"); @@ -881,19 +934,29 @@ TEST(IrcProtocolWithServer, batch_without_batch_cap) RECV(":server BATCH +1 example"); CHECK_NO_MSG; RECV("@batch=1 :bob!user_b@host_b PRIVMSG #test :message 1"); - CHECK_CHAN("bob", "message 1"); + CHECK_CHAN("bob", "message 1", + "irc_privmsg,irc_tag_batch=1,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV(":server BATCH +2 example"); CHECK_NO_MSG; RECV("@batch=1 :bob!user_b@host_b PRIVMSG #test :message 2"); - CHECK_CHAN("bob", "message 2"); + CHECK_CHAN("bob", "message 2", + "irc_privmsg,irc_tag_batch=1,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=2 :bob!user_b@host_b PRIVMSG #test :message 4"); - CHECK_CHAN("bob", "message 4"); + CHECK_CHAN("bob", "message 4", + "irc_privmsg,irc_tag_batch=2,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=1 :bob!user_b@host_b PRIVMSG #test :message 3"); - CHECK_CHAN("bob", "message 3"); + CHECK_CHAN("bob", "message 3", + "irc_privmsg,irc_tag_batch=1,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV(":server BATCH -1"); CHECK_NO_MSG; RECV("@batch=2 :bob!user_b@host_b PRIVMSG #test :message 5"); - CHECK_CHAN("bob", "message 5"); + CHECK_CHAN("bob", "message 5", + "irc_privmsg,irc_tag_batch=2,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV(":server BATCH -2"); CHECK_NO_MSG; @@ -902,9 +965,13 @@ TEST(IrcProtocolWithServer, batch_without_batch_cap) CHECK_NO_MSG; RECV("@batch=ref1 :server BATCH +ref2 example2"); RECV("@batch=ref1 :bob!user_b@host_b PRIVMSG #test :test ref1"); - CHECK_CHAN("bob", "test ref1"); + CHECK_CHAN("bob", "test ref1", + "irc_privmsg,irc_tag_batch=ref1,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref2 :bob!user_b@host_b PRIVMSG #test :test ref2"); - CHECK_CHAN("bob", "test ref2"); + CHECK_CHAN("bob", "test ref2", + "irc_privmsg,irc_tag_batch=ref2,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV(":server BATCH -ref2"); CHECK_NO_MSG; RECV(":server BATCH -ref1"); @@ -914,9 +981,13 @@ TEST(IrcProtocolWithServer, batch_without_batch_cap) RECV(":server BATCH +ref draft/multiline #test"); CHECK_NO_MSG; RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :line 1"); - CHECK_CHAN("bob", "line 1"); + CHECK_CHAN("bob", "line 1", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :line 2"); - CHECK_CHAN("bob", "line 2"); + CHECK_CHAN("bob", "line 2", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV(":server BATCH -ref"); CHECK_NO_MSG; @@ -924,9 +995,13 @@ TEST(IrcProtocolWithServer, batch_without_batch_cap) RECV(":server BATCH +ref draft/multiline #test"); CHECK_NO_MSG; RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :\01ACTION is testing"); - CHECK_CHAN(" *", "bob is testing"); + CHECK_CHAN(" *", "bob is testing", + "irc_privmsg,irc_tag_batch=ref,irc_action,notify_message," + "nick_bob,host_user_b@host_b,log1"); RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :again\01"); - CHECK_CHAN("bob", "again\01"); + CHECK_CHAN("bob", "again\01", + "irc_privmsg,irc_tag_batch=ref,notify_message," + "prefix_nick_248,nick_bob,host_user_b@host_b,log1"); RECV(":server BATCH -ref"); CHECK_NO_MSG; } @@ -976,9 +1051,18 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) /* end batch */ RECV(":server BATCH -ref"); - CHECK_CHAN("bob", "this is a test"); - CHECK_CHAN("bob", "second test"); - CHECK_CHAN("bob", "third test"); + CHECK_CHAN("bob", "this is a test", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "second test", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "third test", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "ref")); /* start batch with parameters */ @@ -1001,9 +1085,18 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) /* end batch */ RECV(":server BATCH -ref"); - CHECK_CHAN("bob", "test 1"); - CHECK_CHAN("bob", "test 2"); - CHECK_CHAN("bob", "test 3"); + CHECK_CHAN("bob", "test 1", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "test 2", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "test 3", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "ref")); /* start/end batch without parameters */ @@ -1028,15 +1121,30 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) RECV("@batch=1 :bob!user_b@host_b PRIVMSG #test :message 3"); CHECK_NO_MSG; RECV(":server BATCH -1"); - CHECK_CHAN("bob", "message 1"); - CHECK_CHAN("bob", "message 2"); - CHECK_CHAN("bob", "message 3"); + CHECK_CHAN("bob", "message 1", + "irc_privmsg,irc_tag_batch=1,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "message 2", + "irc_privmsg,irc_tag_batch=1,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "message 3", + "irc_privmsg,irc_tag_batch=1,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "1")); RECV("@batch=2 :bob!user_b@host_b PRIVMSG #test :message 5"); CHECK_NO_MSG; RECV(":server BATCH -2"); - CHECK_CHAN("bob", "message 4"); - CHECK_CHAN("bob", "message 5"); + CHECK_CHAN("bob", "message 4", + "irc_privmsg,irc_tag_batch=2,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "message 5", + "irc_privmsg,irc_tag_batch=2,irc_batch_type_example," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "2")); /* nested batch */ @@ -1054,9 +1162,15 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) CHECK_NO_MSG; CHECK(irc_batch_search (ptr_server, "ref2")); RECV(":server BATCH -ref1"); - CHECK_CHAN("bob", "test ref1"); - CHECK_CHAN("bob", "test ref2"); - POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "ref1")); + CHECK_CHAN("bob", "test ref1", + "irc_privmsg,irc_tag_batch=ref1,irc_batch_type_example1," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "test ref2", + "irc_privmsg,irc_tag_batch=ref2,irc_batch_type_example2," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "ref1")); POINTERS_EQUAL(NULL, irc_batch_search (ptr_server, "ref2")); /* multiline */ @@ -1067,8 +1181,14 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :line 2"); CHECK_NO_MSG; RECV(":server BATCH -ref"); - CHECK_CHAN("bob", "line 1"); - CHECK_CHAN("bob", "line 2"); + CHECK_CHAN("bob", "line 1", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_draft/multiline," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); + CHECK_CHAN("bob", "line 2", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_draft/multiline," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); /* multiline with CTCP */ RECV(":server BATCH +ref draft/multiline #test"); @@ -1078,10 +1198,17 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) RECV("@batch=ref :bob!user_b@host_b PRIVMSG #test :again\01"); CHECK_NO_MSG; RECV(":server BATCH -ref"); - CHECK_CHAN(" *", "bob is testing"); - CHECK_CHAN("bob", "again\01"); + CHECK_CHAN(" *", "bob is testing", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_draft/multiline," + "irc_action,notify_message,nick_bob,host_user_b@host_b,log1"); + CHECK_CHAN("bob", "again\01", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_draft/multiline," + "notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); RECV(":bob!user_b@host_b PRIVMSG #test :prout\01"); - CHECK_CHAN("bob", "prout\01"); + CHECK_CHAN("bob", "prout\01", + "irc_privmsg,notify_message,prefix_nick_248,nick_bob," + "host_user_b@host_b,log1"); /* assume "draft/multiline" capability is enabled in server */ hashtable_set (ptr_server->cap_list, "draft/multiline", NULL); @@ -1096,7 +1223,10 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) CHECK_NO_MSG; RECV(":server BATCH -ref"); CHECK_CHAN("bob", "line 1\n" - "line 2"); + "line 2", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_draft/multiline," + "notify_message,prefix_nick_248,nick_bob,host_user_b@host_b," + "log1"); /* multiline with CTCP */ RECV(":server BATCH +ref draft/multiline #test"); @@ -1107,7 +1237,9 @@ TEST(IrcProtocolWithServer, batch_with_batch_cap) CHECK_NO_MSG; RECV(":server BATCH -ref"); CHECK_CHAN(" *", "bob is testing\n" - "again"); + "again", + "irc_privmsg,irc_tag_batch=ref,irc_batch_type_draft/multiline," + "irc_action,notify_message,nick_bob,host_user_b@host_b,log1"); } @@ -1151,47 +1283,55 @@ TEST(IrcProtocolWithServer, cap) /* CAP LS */ RECV("CAP * LS :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, server supports: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, server supports: multi-prefix sasl", + ""); RECV("CAP * LS * :multi-prefix sasl"); CHECK_NO_MSG; RECV(":server CAP * LS :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, server supports: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, server supports: multi-prefix sasl", + ""); RECV(":server CAP * LS * :multi-prefix sasl"); CHECK_NO_MSG; /* CAP LIST */ RECV("CAP * LIST :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, currently enabled: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, currently enabled: multi-prefix sasl", + ""); RECV("CAP * LIST * :multi-prefix sasl"); CHECK_NO_MSG; RECV(":server CAP * LIST :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, currently enabled: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, currently enabled: multi-prefix sasl", + ""); RECV(":server CAP * LIST * :multi-prefix sasl"); CHECK_NO_MSG; /* CAP NEW */ RECV("CAP * NEW :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, now available: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, now available: multi-prefix sasl", + ""); RECV(":server CAP * NEW :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, now available: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, now available: multi-prefix sasl", + ""); /* CAP DEL */ RECV("CAP * DEL :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, removed: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, removed: multi-prefix sasl", + ""); RECV(":server CAP * DEL :multi-prefix sasl"); - CHECK_SRV("--", "irc: client capability, removed: multi-prefix sasl"); + CHECK_SRV("--", "irc: client capability, removed: multi-prefix sasl", + ""); /* CAP ACK */ RECV("CAP * ACK :sasl"); - CHECK_SRV("--", "irc: client capability, enabled: sasl"); + CHECK_SRV("--", "irc: client capability, enabled: sasl", ""); RECV(":server CAP * ACK :sasl"); - CHECK_SRV("--", "irc: client capability, enabled: sasl"); + CHECK_SRV("--", "irc: client capability, enabled: sasl", ""); /* CAP NAK */ RECV("CAP * NAK :sasl"); - CHECK_SRV("=!=", "irc: client capability, refused: sasl"); + CHECK_SRV("=!=", "irc: client capability, refused: sasl", ""); RECV(":server CAP * NAK :sasl"); - CHECK_SRV("=!=", "irc: client capability, refused: sasl"); + CHECK_SRV("=!=", "irc: client capability, refused: sasl", ""); } /* @@ -1226,22 +1366,30 @@ TEST(IrcProtocolWithServer, chghost) /* self nick */ RECV(":alice!user@host CHGHOST user2 host2"); - CHECK_CHAN("--", "alice (user@host) has changed host to user2@host2"); + CHECK_CHAN("--", "alice (user@host) has changed host to user2@host2", + "irc_chghost,nick_alice,host_user@host,log3"); STRCMP_EQUAL("user2@host2", ptr_nick->host); RECV(":alice!user@host CHGHOST user2 host2"); - CHECK_CHAN("--", "alice (user@host) has changed host to user2@host2"); + CHECK_CHAN("--", "alice (user@host) has changed host to user2@host2", + "irc_chghost,nick_alice,host_user@host,log3"); STRCMP_EQUAL("user2@host2", ptr_nick->host); RECV(":alice!user2@host2 CHGHOST user3 :host3"); - CHECK_CHAN("--", "alice (user2@host2) has changed host to user3@host3"); + CHECK_CHAN("--", "alice (user2@host2) has changed host to user3@host3", + "irc_chghost,nick_alice,host_user2@host2,log3"); STRCMP_EQUAL("user3@host3", ptr_nick->host); /* another nick */ RECV(":bob!user@host CHGHOST user_bob_2 host_bob_2"); - CHECK_CHAN("--", "bob (user@host) has changed host to user_bob_2@host_bob_2"); + CHECK_CHAN("--", + "bob (user@host) has changed host to user_bob_2@host_bob_2", + "irc_chghost,irc_smart_filter,nick_bob,host_user@host,log3"); STRCMP_EQUAL("user_bob_2@host_bob_2", ptr_nick2->host); - CHECK_PV("bob", "--", "bob (user@host) has changed host to user_bob_2@host_bob_2"); + CHECK_PV("bob", + "--", + "bob (user@host) has changed host to user_bob_2@host_bob_2", + "irc_chghost,nick_bob,host_user@host,log3"); } /* @@ -1258,9 +1406,10 @@ TEST(IrcProtocolWithServer, error) CHECK_ERROR_PARAMS("error", 0, 1); RECV("ERROR test"); - CHECK_SRV("=!=", "test"); + CHECK_SRV("=!=", "test", "irc_error,log3"); RECV("ERROR :Closing Link: irc.server.org (Bad Password)"); - CHECK_SRV("=!=", "Closing Link: irc.server.org (Bad Password)"); + CHECK_SRV("=!=", "Closing Link: irc.server.org (Bad Password)", + "irc_error,log3"); } /* @@ -1281,22 +1430,23 @@ TEST(IrcProtocolWithServer, fail) CHECK_ERROR_PARAMS("fail", 1, 2); RECV(":server FAIL * TEST"); - CHECK_SRV("=!=", "Failure: [] TEST"); + CHECK_SRV("=!=", "Failure: [] TEST", "irc_fail,log3"); RECV(":server FAIL * TEST :the message"); - CHECK_SRV("=!=", "Failure: [TEST] the message"); + CHECK_SRV("=!=", "Failure: [TEST] the message", "irc_fail,log3"); RECV(":server FAIL * TEST TEST2"); - CHECK_SRV("=!=", "Failure: [TEST] TEST2"); + CHECK_SRV("=!=", "Failure: [TEST] TEST2", "irc_fail,log3"); RECV(":server FAIL * TEST TEST2 :the message"); - CHECK_SRV("=!=", "Failure: [TEST TEST2] the message"); + CHECK_SRV("=!=", "Failure: [TEST TEST2] the message", "irc_fail,log3"); RECV(":server FAIL COMMAND TEST"); - CHECK_SRV("=!=", "Failure: COMMAND [] TEST"); + CHECK_SRV("=!=", "Failure: COMMAND [] TEST", "irc_fail,log3"); RECV(":server FAIL COMMAND TEST :the message"); - CHECK_SRV("=!=", "Failure: COMMAND [TEST] the message"); + CHECK_SRV("=!=", "Failure: COMMAND [TEST] the message", "irc_fail,log3"); RECV(":server FAIL COMMAND TEST TEST2"); - CHECK_SRV("=!=", "Failure: COMMAND [TEST] TEST2"); + CHECK_SRV("=!=", "Failure: COMMAND [TEST] TEST2", "irc_fail,log3"); RECV(":server FAIL COMMAND TEST TEST2 :the message"); - CHECK_SRV("=!=", "Failure: COMMAND [TEST TEST2] the message"); + CHECK_SRV("=!=", "Failure: COMMAND [TEST TEST2] the message", + "irc_fail,log3"); } /* @@ -1319,9 +1469,11 @@ TEST(IrcProtocolWithServer, invite) CHECK_ERROR_NICK("invite"); RECV(":bob!user@host INVITE alice #channel"); - CHECK_SRV("--", "You have been invited to #channel by bob"); + CHECK_SRV("--", "You have been invited to #channel by bob", + "irc_invite,notify_highlight,nick_bob,host_user@host,log3"); RECV(":bob!user@host INVITE xxx #channel"); - CHECK_SRV("--", "bob has invited xxx to #channel"); + CHECK_SRV("--", "bob has invited xxx to #channel", + "irc_invite,nick_bob,host_user@host,log3"); } /* @@ -1353,7 +1505,8 @@ TEST(IrcProtocolWithServer, join) CHECK_NO_MSG; RECV(":alice!user@host JOIN #test"); - CHECK_CHAN("-->", "alice (user@host) has joined #test"); + CHECK_CHAN("-->", "alice (user@host) has joined #test", + "irc_join,nick_alice,host_user@host,log4"); ptr_channel = ptr_server->channels; @@ -1392,7 +1545,8 @@ TEST(IrcProtocolWithServer, join) CHECK(ptr_channel->buffer); RECV(":bob!user@host JOIN #test * :Bob Name"); - CHECK_CHAN("-->", "bob (Bob Name) (user@host) has joined #test"); + CHECK_CHAN("-->", "bob (Bob Name) (user@host) has joined #test", + "irc_join,irc_smart_filter,nick_bob,host_user@host,log4"); ptr_nick = ptr_channel->last_nick; @@ -1408,8 +1562,10 @@ TEST(IrcProtocolWithServer, join) CHECK(ptr_nick->color); RECV(":carol!user@host JOIN #test carol_account :Carol Name"); - CHECK_CHAN("-->", "carol [carol_account] (Carol Name) (user@host) " - "has joined #test"); + CHECK_CHAN("-->", + "carol [carol_account] (Carol Name) (user@host) " + "has joined #test", + "irc_join,irc_smart_filter,nick_carol,host_user@host,log4"); ptr_nick = ptr_channel->last_nick; @@ -1439,9 +1595,11 @@ TEST(IrcProtocolWithServer, kick) POINTERS_EQUAL(NULL, ptr_server->channels); RECV(":alice!user@host JOIN #test"); - CHECK_CHAN("-->", "alice (user@host) has joined #test"); + CHECK_CHAN("-->", "alice (user@host) has joined #test", + "irc_join,nick_alice,host_user@host,log4"); RECV(":bob!user@host JOIN #test"); - CHECK_CHAN("-->", "bob (user@host) has joined #test"); + CHECK_CHAN("-->", "bob (user@host) has joined #test", + "irc_join,irc_smart_filter,nick_bob,host_user@host,log4"); ptr_channel = ptr_server->channels; @@ -1469,25 +1627,30 @@ TEST(IrcProtocolWithServer, kick) /* kick without a reason */ RECV(":alice!user@host KICK #test bob"); - CHECK_CHAN("<--", "alice has kicked bob"); + CHECK_CHAN("<--", "alice has kicked bob", + "irc_kick,host_user@host,log3"); STRCMP_EQUAL("alice", ptr_channel->nicks->name); POINTERS_EQUAL(NULL, ptr_channel->nicks->next_nick); RECV(":bob!user@host JOIN #test"); - CHECK_CHAN("-->", "bob (user@host) has joined #test"); + CHECK_CHAN("-->", "bob (user@host) has joined #test", + "irc_join,irc_smart_filter,nick_bob,host_user@host,log4"); /* with kick a reason */ RECV(":alice!user@host KICK #test bob :no spam here! "); - CHECK_CHAN("<--", "alice has kicked bob (no spam here! )"); + CHECK_CHAN("<--", "alice has kicked bob (no spam here! )", + "irc_kick,host_user@host,log3"); STRCMP_EQUAL("alice", ptr_channel->nicks->name); POINTERS_EQUAL(NULL, ptr_channel->nicks->next_nick); RECV(":bob!user@host JOIN #test"); - CHECK_CHAN("-->", "bob (user@host) has joined #test"); + CHECK_CHAN("-->", "bob (user@host) has joined #test", + "irc_join,irc_smart_filter,nick_bob,host_user@host,log4"); /* kick of self nick */ RECV(":bob!user@host KICK #test alice :no spam here! "); - CHECK_CHAN("<--", "bob has kicked alice (no spam here! )"); + CHECK_CHAN("<--", "bob has kicked alice (no spam here! )", + "irc_kick,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_channel->nicks); } @@ -1522,17 +1685,21 @@ TEST(IrcProtocolWithServer, kill) /* kill without a reason */ RECV(":bob!user@host KILL alice"); - CHECK_CHAN("<--", "You were killed by bob"); + CHECK_CHAN("<--", "You were killed by bob", + "irc_kill,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_channel->nicks); RECV(":alice!user@host JOIN #test"); - CHECK_CHAN("-->", "alice (user@host) has joined #test"); + CHECK_CHAN("-->", "alice (user@host) has joined #test", + "irc_join,nick_alice,host_user@host,log4"); RECV(":bob!user@host JOIN #test"); - CHECK_CHAN("-->", "bob (user@host) has joined #test"); + CHECK_CHAN("-->", "bob (user@host) has joined #test", + "irc_join,irc_smart_filter,nick_bob,host_user@host,log4"); /* kill with a reason */ RECV(":bob!user@host KILL alice :killed by admin "); - CHECK_CHAN("<--", "You were killed by bob (killed by admin )"); + CHECK_CHAN("<--", "You were killed by bob (killed by admin )", + "irc_kill,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_channel->nicks); } @@ -1571,57 +1738,57 @@ TEST(IrcProtocolWithServer, mode) /* channel mode */ RECV(":admin MODE #test +nt"); - CHECK_CHAN("--", "Mode #test [+nt] by admin"); + CHECK_CHAN("--", "Mode #test [+nt] by admin", "irc_mode,log3"); STRCMP_EQUAL("+tn", ptr_channel->modes); /* channel mode removed */ RECV(":admin MODE #test -n"); - CHECK_CHAN("--", "Mode #test [-n] by admin"); + CHECK_CHAN("--", "Mode #test [-n] by admin", "irc_mode,log3"); STRCMP_EQUAL("+t", ptr_channel->modes); /* channel mode removed */ RECV(":admin MODE #test -t"); - CHECK_CHAN("--", "Mode #test [-t] by admin"); + CHECK_CHAN("--", "Mode #test [-t] by admin", "irc_mode,log3"); POINTERS_EQUAL(NULL, ptr_channel->modes); /* nick mode '@' on channel #test */ RECV(":admin MODE #test +o alice"); - CHECK_CHAN("--", "Mode #test [+o alice] by admin"); + CHECK_CHAN("--", "Mode #test [+o alice] by admin", "irc_mode,log3"); STRCMP_EQUAL("@ ", ptr_nick->prefixes); STRCMP_EQUAL("@", ptr_nick->prefix); /* another nick mode '+' on channel #test */ RECV(":admin MODE #test +v alice"); - CHECK_CHAN("--", "Mode #test [+v alice] by admin"); + CHECK_CHAN("--", "Mode #test [+v alice] by admin", "irc_mode,log3"); STRCMP_EQUAL("@+", ptr_nick->prefixes); STRCMP_EQUAL("@", ptr_nick->prefix); /* nick mode '@' removed on channel #test */ RECV(":admin MODE #test -o alice"); - CHECK_CHAN("--", "Mode #test [-o alice] by admin"); + CHECK_CHAN("--", "Mode #test [-o alice] by admin", "irc_mode,log3"); STRCMP_EQUAL(" +", ptr_nick->prefixes); STRCMP_EQUAL("+", ptr_nick->prefix); /* nick mode '+' removed on channel #test */ RECV(":admin MODE #test -v alice"); - CHECK_CHAN("--", "Mode #test [-v alice] by admin"); + CHECK_CHAN("--", "Mode #test [-v alice] by admin", "irc_mode,log3"); STRCMP_EQUAL(" ", ptr_nick->prefixes); STRCMP_EQUAL(" ", ptr_nick->prefix); /* nick mode 'i' */ POINTERS_EQUAL(NULL, ptr_server->nick_modes); RECV(":admin MODE alice +i"); - CHECK_SRV("--", "User mode [+i] by admin"); + CHECK_SRV("--", "User mode [+i] by admin", "irc_mode,log3"); STRCMP_EQUAL("i", ptr_server->nick_modes); /* nick mode 'R' */ RECV(":admin MODE alice +R"); - CHECK_SRV("--", "User mode [+R] by admin"); + CHECK_SRV("--", "User mode [+R] by admin", "irc_mode,log3"); STRCMP_EQUAL("iR", ptr_server->nick_modes); /* remove nick mode 'i' */ RECV(":admin MODE alice -i"); - CHECK_SRV("--", "User mode [-i] by admin"); + CHECK_SRV("--", "User mode [-i] by admin", "irc_mode,log3"); STRCMP_EQUAL("R", ptr_server->nick_modes); } @@ -1638,7 +1805,9 @@ TEST(IrcProtocolWithServer, nick) SRV_INIT_JOIN2; RECV(":bob!user@host PRIVMSG alice :hi Alice!"); - CHECK_PV("bob", "bob", "hi Alice!"); + CHECK_PV("bob", "bob", "hi Alice!", + "irc_privmsg,notify_private,prefix_nick_248,nick_bob," + "host_user@host,log1"); ptr_channel = ptr_server->channels; CHECK(ptr_channel); @@ -1661,26 +1830,42 @@ TEST(IrcProtocolWithServer, nick) /* new nick for alice */ RECV(":alice!user@host NICK alice_away"); - CHECK_SRV("--", "You are now known as alice_away"); - CHECK_CHAN("--", "You are now known as alice_away"); + CHECK_SRV("--", "You are now known as alice_away", + "irc_nick,irc_nick1_alice,irc_nick2_alice_away," + "host_user@host,log2"); + CHECK_CHAN("--", "You are now known as alice_away", + "irc_nick,irc_nick1_alice,irc_nick2_alice_away," + "host_user@host,log2"); STRCMP_EQUAL("alice_away", ptr_nick1->name); /* new nick for alice_away (with ":") */ RECV(":alice_away!user@host NICK :alice2"); - CHECK_SRV("--", "You are now known as alice2"); - CHECK_CHAN("--", "You are now known as alice2"); + CHECK_SRV("--", "You are now known as alice2", + "irc_nick,irc_nick1_alice_away,irc_nick2_alice2," + "host_user@host,log2"); + CHECK_CHAN("--", "You are now known as alice2", + "irc_nick,irc_nick1_alice_away,irc_nick2_alice2," + "host_user@host,log2"); STRCMP_EQUAL("alice2", ptr_nick1->name); /* new nick for bob */ RECV(":bob!user@host NICK bob_away"); - CHECK_CHAN("--", "bob is now known as bob_away"); - CHECK_PV("bob_away", "--", "bob is now known as bob_away"); + CHECK_CHAN("--", "bob is now known as bob_away", + "irc_nick,irc_smart_filter,irc_nick1_bob,irc_nick2_bob_away," + "host_user@host,log2"); + CHECK_PV("bob_away", "--", "bob is now known as bob_away", + "irc_nick,irc_nick1_bob,irc_nick2_bob_away,host_user@host," + "log2"); STRCMP_EQUAL("bob_away", ptr_nick2->name); /* new nick for bob_away (with ":") */ RECV(":bob_away!user@host NICK :bob2"); - CHECK_CHAN("--", "bob_away is now known as bob2"); - CHECK_PV("bob2", "--", "bob_away is now known as bob2"); + CHECK_CHAN("--", "bob_away is now known as bob2", + "irc_nick,irc_smart_filter,irc_nick1_bob_away," + "irc_nick2_bob2,host_user@host,log2"); + CHECK_PV("bob2", "--", "bob_away is now known as bob2", + "irc_nick,irc_nick1_bob_away,irc_nick2_bob2,host_user@host," + "log2"); STRCMP_EQUAL("bob2", ptr_nick2->name); STRCMP_EQUAL("bob2", ptr_server->last_channel->name); @@ -1704,22 +1889,23 @@ TEST(IrcProtocolWithServer, note) CHECK_ERROR_PARAMS("note", 1, 2); RECV(":server NOTE * TEST"); - CHECK_SRV("--", "Note: [] TEST"); + CHECK_SRV("--", "Note: [] TEST", "irc_note,log3"); RECV(":server NOTE * TEST :the message"); - CHECK_SRV("--", "Note: [TEST] the message"); + CHECK_SRV("--", "Note: [TEST] the message", "irc_note,log3"); RECV(":server NOTE * TEST TEST2"); - CHECK_SRV("--", "Note: [TEST] TEST2"); + CHECK_SRV("--", "Note: [TEST] TEST2", "irc_note,log3"); RECV(":server NOTE * TEST TEST2 :the message"); - CHECK_SRV("--", "Note: [TEST TEST2] the message"); + CHECK_SRV("--", "Note: [TEST TEST2] the message", "irc_note,log3"); RECV(":server NOTE COMMAND TEST"); - CHECK_SRV("--", "Note: COMMAND [] TEST"); + CHECK_SRV("--", "Note: COMMAND [] TEST", "irc_note,log3"); RECV(":server NOTE COMMAND TEST :the message"); - CHECK_SRV("--", "Note: COMMAND [TEST] the message"); + CHECK_SRV("--", "Note: COMMAND [TEST] the message", "irc_note,log3"); RECV(":server NOTE COMMAND TEST TEST2"); - CHECK_SRV("--", "Note: COMMAND [TEST] TEST2"); + CHECK_SRV("--", "Note: COMMAND [TEST] TEST2", "irc_note,log3"); RECV(":server NOTE COMMAND TEST TEST2 :the message"); - CHECK_SRV("--", "Note: COMMAND [TEST TEST2] the message"); + CHECK_SRV("--", "Note: COMMAND [TEST TEST2] the message", + "irc_note,log3"); } /* @@ -1745,113 +1931,158 @@ TEST(IrcProtocolWithServer, notice) /* notice from server */ RECV("NOTICE AUTH :*** Looking up your hostname... "); - CHECK_SRV("--", "*** Looking up your hostname... "); + CHECK_SRV("--", "*** Looking up your hostname... ", "irc_notice,log1"); RECV(":server.address NOTICE AUTH :*** Looking up your hostname... "); - CHECK_SRV("--", "server.address: *** Looking up your hostname... "); + CHECK_SRV("--", "server.address: *** Looking up your hostname... ", + "irc_notice,notify_private,nick_server.address,log1"); RECV(":server.address NOTICE * :*** Looking up your hostname... "); - CHECK_SRV("--", "server.address: *** Looking up your hostname... "); + CHECK_SRV("--", "server.address: *** Looking up your hostname... ", + "irc_notice,notify_private,nick_server.address,log1"); /* notice to channel/user */ RECV(":server.address NOTICE #test :a notice "); - CHECK_CHAN("--", "Notice(server.address): a notice "); + CHECK_CHAN("--", "Notice(server.address): a notice ", + "irc_notice,notify_message,nick_server.address,log1"); RECV(":server.address NOTICE alice :a notice "); - CHECK_SRV("--", "server.address: a notice "); + CHECK_SRV("--", "server.address: a notice ", + "irc_notice,notify_private,nick_server.address,log1"); RECV(":bob!user@host NOTICE #test :a notice "); - CHECK_CHAN("--", "Notice(bob): a notice "); + CHECK_CHAN("--", "Notice(bob): a notice ", + "irc_notice,notify_message,nick_bob,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :a notice "); - CHECK_SRV("--", "bob (user@host): a notice "); + CHECK_SRV("--", "bob (user@host): a notice ", + "irc_notice,notify_private,nick_bob,host_user@host,log1"); /* notice to ops of channel */ RECV(":server.address NOTICE @#test :a notice "); - CHECK_CHAN("--", "Notice:@(server.address): a notice "); + CHECK_CHAN("--", "Notice:@(server.address): a notice ", + "irc_notice,notify_message,nick_server.address,log1"); RECV(":bob!user@host NOTICE @#test :a notice "); - CHECK_CHAN("--", "Notice:@(bob): a notice "); + CHECK_CHAN("--", "Notice:@(bob): a notice ", + "irc_notice,notify_message,nick_bob,host_user@host,log1"); /* notice from self nick (case of bouncer) */ RECV(":alice!user@host NOTICE alice :a notice "); - CHECK_SRV("--", "Notice -> alice: a notice "); + CHECK_SRV("--", "Notice -> alice: a notice ", + "irc_notice,notify_private,nick_alice,host_user@host,log1"); /* notice with channel name at beginning */ RECV(":server.address NOTICE alice :[#test] a notice "); - CHECK_CHAN("--", "PvNotice(server.address): a notice "); + CHECK_CHAN("--", "PvNotice(server.address): a notice ", + "irc_notice,nick_server.address,log1"); RECV(":server.address NOTICE alice :(#test) a notice "); - CHECK_CHAN("--", "PvNotice(server.address): a notice "); + CHECK_CHAN("--", "PvNotice(server.address): a notice ", + "irc_notice,nick_server.address,log1"); RECV(":server.address NOTICE alice :{#test} a notice "); - CHECK_CHAN("--", "PvNotice(server.address): a notice "); + CHECK_CHAN("--", "PvNotice(server.address): a notice ", + "irc_notice,nick_server.address,log1"); RECV(":server.address NOTICE alice :<#test> a notice "); - CHECK_CHAN("--", "PvNotice(server.address): a notice "); + CHECK_CHAN("--", "PvNotice(server.address): a notice ", + "irc_notice,nick_server.address,log1"); RECV(":bob!user@host NOTICE alice :[#test] a notice "); - CHECK_CHAN("--", "PvNotice(bob): a notice "); + CHECK_CHAN("--", "PvNotice(bob): a notice ", + "irc_notice,nick_bob,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :(#test) a notice "); - CHECK_CHAN("--", "PvNotice(bob): a notice "); + CHECK_CHAN("--", "PvNotice(bob): a notice ", + "irc_notice,nick_bob,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :{#test} a notice "); - CHECK_CHAN("--", "PvNotice(bob): a notice "); + CHECK_CHAN("--", "PvNotice(bob): a notice ", + "irc_notice,nick_bob,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :<#test> a notice "); - CHECK_CHAN("--", "PvNotice(bob): a notice "); + CHECK_CHAN("--", "PvNotice(bob): a notice ", + "irc_notice,nick_bob,host_user@host,log1"); /* broken CTCP to channel */ RECV(":bob!user@host NOTICE #test :\01"); - CHECK_SRV("--", "CTCP reply from bob: "); + CHECK_SRV("--", "CTCP reply from bob: ", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01TEST"); - CHECK_SRV("--", "CTCP reply from bob: TEST"); + CHECK_SRV("--", "CTCP reply from bob: TEST", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01ACTION"); - CHECK_SRV("--", "CTCP reply from bob: ACTION"); + CHECK_SRV("--", "CTCP reply from bob: ACTION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01ACTION is testing"); - CHECK_SRV("--", "CTCP reply from bob: ACTION is testing"); + CHECK_SRV("--", "CTCP reply from bob: ACTION is testing", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01VERSION"); - CHECK_SRV("--", "CTCP reply from bob: VERSION"); + CHECK_SRV("--", "CTCP reply from bob: VERSION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01DCC"); - CHECK_SRV("--", "CTCP reply from bob: DCC"); + CHECK_SRV("--", "CTCP reply from bob: DCC", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01DCC SEND"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01DCC SEND file.txt"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01DCC SEND file.txt 1 2 3"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3", + "irc_notice,irc_ctcp,host_user@host,log1"); /* broken CTCP to user */ RECV(":bob!user@host NOTICE alice :\01"); - CHECK_SRV("--", "CTCP reply from bob: "); + CHECK_SRV("--", "CTCP reply from bob: ", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01TEST"); - CHECK_SRV("--", "CTCP reply from bob: TEST"); + CHECK_SRV("--", "CTCP reply from bob: TEST", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01ACTION"); - CHECK_SRV("--", "CTCP reply from bob: ACTION"); + CHECK_SRV("--", "CTCP reply from bob: ACTION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01ACTION is testing"); - CHECK_SRV("--", "CTCP reply from bob: ACTION is testing"); + CHECK_SRV("--", "CTCP reply from bob: ACTION is testing", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01VERSION"); - CHECK_SRV("--", "CTCP reply from bob: VERSION"); + CHECK_SRV("--", "CTCP reply from bob: VERSION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01DCC"); - CHECK_SRV("--", "CTCP reply from bob: DCC"); + CHECK_SRV("--", "CTCP reply from bob: DCC", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01DCC SEND"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01DCC SEND file.txt"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01DCC SEND file.txt 1 2 3"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3", + "irc_notice,irc_ctcp,host_user@host,log1"); /* valid CTCP to channel */ RECV(":bob!user@host NOTICE #test :\01TEST\01"); - CHECK_SRV("--", "CTCP reply from bob: TEST"); + CHECK_SRV("--", "CTCP reply from bob: TEST", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01ACTION\01"); - CHECK_SRV("--", "CTCP reply from bob: ACTION"); + CHECK_SRV("--", "CTCP reply from bob: ACTION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01ACTION is testing\01"); - CHECK_SRV("--", "CTCP reply from bob: ACTION is testing"); + CHECK_SRV("--", "CTCP reply from bob: ACTION is testing", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01VERSION\01"); - CHECK_SRV("--", "CTCP reply from bob: VERSION"); + CHECK_SRV("--", "CTCP reply from bob: VERSION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE #test :\01DCC SEND file.txt 1 2 3\01"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3", + "irc_notice,irc_ctcp,host_user@host,log1"); /* valid CTCP to user */ RECV(":bob!user@host NOTICE alice :\01TEST\01"); - CHECK_SRV("--", "CTCP reply from bob: TEST"); + CHECK_SRV("--", "CTCP reply from bob: TEST", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01ACTION\01"); - CHECK_SRV("--", "CTCP reply from bob: ACTION"); + CHECK_SRV("--", "CTCP reply from bob: ACTION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01ACTION is testing\01"); - CHECK_SRV("--", "CTCP reply from bob: ACTION is testing"); + CHECK_SRV("--", "CTCP reply from bob: ACTION is testing", + "irc_notice,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01VERSION\01"); - CHECK_SRV("--", "CTCP reply from bob: VERSION"); + CHECK_SRV("--", "CTCP reply from bob: VERSION", + "irc_notice,host_user@host,log1"); RECV(":bob!user@host NOTICE alice :\01DCC SEND file.txt 1 2 3\01"); - CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3"); + CHECK_SRV("--", "CTCP reply from bob: DCC SEND file.txt 1 2 3", + "irc_notice,irc_ctcp,host_user@host,log1"); } /* @@ -1884,7 +2115,8 @@ TEST(IrcProtocolWithServer, part) /* without part message */ RECV(":alice!user@host PART #test"); - CHECK_CHAN("<--", "alice (user@host) has left #test"); + CHECK_CHAN("<--", "alice (user@host) has left #test", + "irc_part,nick_alice,host_user@host,log4"); STRCMP_EQUAL("#test", ptr_server->channels->name); POINTERS_EQUAL(NULL, ptr_server->channels->nicks); LONGS_EQUAL(1, ptr_server->channels->part); @@ -1892,7 +2124,8 @@ TEST(IrcProtocolWithServer, part) /* without part message (but empty trailing parameter) */ RECV(":alice!user@host JOIN #test"); RECV(":alice!user@host PART #test :"); - CHECK_CHAN("<--", "alice (user@host) has left #test"); + CHECK_CHAN("<--", "alice (user@host) has left #test", + "irc_part,nick_alice,host_user@host,log4"); STRCMP_EQUAL("#test", ptr_server->channels->name); POINTERS_EQUAL(NULL, ptr_server->channels->nicks); LONGS_EQUAL(1, ptr_server->channels->part); @@ -1900,19 +2133,23 @@ TEST(IrcProtocolWithServer, part) /* with part message */ RECV(":alice!user@host JOIN #test"); RECV(":alice!user@host PART #test :part message "); - CHECK_CHAN("<--", "alice (user@host) has left #test (part message )"); + CHECK_CHAN("<--", "alice (user@host) has left #test (part message )", + "irc_part,nick_alice,host_user@host,log4"); STRCMP_EQUAL("#test", ptr_server->channels->name); POINTERS_EQUAL(NULL, ptr_server->channels->nicks); LONGS_EQUAL(1, ptr_server->channels->part); RECV(":alice!user@host JOIN #test"); - CHECK_CHAN("-->", "alice (user@host) has joined #test"); + CHECK_CHAN("-->", "alice (user@host) has joined #test", + "irc_join,nick_alice,host_user@host,log4"); RECV(":bob!user@host JOIN #test"); - CHECK_CHAN("-->", "bob (user@host) has joined #test"); + CHECK_CHAN("-->", "bob (user@host) has joined #test", + "irc_join,irc_smart_filter,nick_bob,host_user@host,log4"); /* part from another user */ RECV(":bob!user@host PART #test :part message "); - CHECK_CHAN("<--", "bob (user@host) has left #test (part message )"); + CHECK_CHAN("<--", "bob (user@host) has left #test (part message )", + "irc_part,irc_smart_filter,nick_bob,host_user@host,log4"); STRCMP_EQUAL("#test", ptr_server->channels->name); CHECK(ptr_server->channels->nicks == ptr_server->channels->last_nick); LONGS_EQUAL(0, ptr_server->channels->part); @@ -1947,13 +2184,13 @@ TEST(IrcProtocolWithServer, pong) SRV_INIT; RECV(":server PONG"); - CHECK_SRV("", "PONG"); + CHECK_SRV("", "PONG", "irc_pong,log3"); RECV(":server PONG server"); - CHECK_SRV("", "PONG"); + CHECK_SRV("", "PONG", "irc_pong,log3"); RECV(":server PONG server :info"); - CHECK_SRV("", "PONG: info"); + CHECK_SRV("", "PONG: info", "irc_pong,log3"); RECV(":server PONG server :extra info"); - CHECK_SRV("", "PONG: extra info"); + CHECK_SRV("", "PONG: extra info", "irc_pong,log3"); } /* @@ -1981,43 +2218,63 @@ TEST(IrcProtocolWithServer, privmsg) /* message to channel/user */ RECV(":bob!user@host PRIVMSG #test :this is the message "); - CHECK_CHAN("bob", "this is the message "); + CHECK_CHAN("bob", "this is the message ", + "irc_privmsg,notify_message,prefix_nick_248,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG alice :this is the message "); - CHECK_PV("bob", "bob", "this is the message "); + CHECK_PV("bob", "bob", "this is the message ", + "irc_privmsg,notify_private,prefix_nick_248,nick_bob," + "host_user@host,log1"); /* message with tags to channel/user */ RECV("@tag1=value1;tag2=value2 :bob!user@host PRIVMSG #test " ":this is the message "); - CHECK_CHAN("bob", "this is the message "); + CHECK_CHAN("bob", "this is the message ", + "irc_privmsg,irc_tag_tag1=value1,irc_tag_tag2=value2," + "notify_message,prefix_nick_248,nick_bob,host_user@host,log1"); RECV("@tag1=value1;tag2=value2 :bob!user@host PRIVMSG alice " ":this is the message "); - CHECK_PV("bob", "bob", "this is the message "); + CHECK_PV("bob", "bob", "this is the message ", + "irc_privmsg,irc_tag_tag1=value1,irc_tag_tag2=value2," + "notify_private,prefix_nick_248,nick_bob,host_user@host,log1"); /* message to ops of channel */ RECV(":bob!user@host PRIVMSG @#test :this is the message "); - CHECK_CHAN("--", "Msg:@(bob): this is the message "); + CHECK_CHAN("--", "Msg:@(bob): this is the message ", + "irc_privmsg,notify_message,nick_bob,host_user@host,log1"); /* message from self nick (case of bouncer) */ RECV(":alice!user@host PRIVMSG alice :this is the message "); - CHECK_PV("alice", "alice", "this is the message "); + CHECK_PV("alice", "alice", "this is the message ", + "irc_privmsg,self_msg,notify_none,no_highlight," + "prefix_nick_white,nick_alice,host_user@host,log1"); /* broken CTCP to channel */ RECV(":bob!user@host PRIVMSG #test :\01"); - CHECK_CHAN("--", "Unknown CTCP requested by bob: "); + CHECK_CHAN("--", "Unknown CTCP requested by bob: ", + "irc_privmsg,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host PRIVMSG #test :\01TEST"); - CHECK_CHAN("--", "Unknown CTCP requested by bob: TEST"); + CHECK_CHAN("--", "Unknown CTCP requested by bob: TEST", + "irc_privmsg,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host PRIVMSG #test :\01ACTION"); - CHECK_CHAN(" *", "bob"); + CHECK_CHAN(" *", "bob", + "irc_privmsg,irc_action,notify_message,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG #test :\01ACTION is testing"); - CHECK_CHAN(" *", "bob is testing"); + CHECK_CHAN(" *", "bob is testing", + "irc_privmsg,irc_action,notify_message,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG #test :\01VERSION"); - CHECK_CHAN("--", "CTCP requested by bob: VERSION"); + CHECK_CHAN("--", "CTCP requested by bob: VERSION", + "irc_privmsg,irc_ctcp,host_user@host,log1"); info = irc_ctcp_replace_variables (ptr_server, irc_ctcp_get_reply (ptr_server, "VERSION")); snprintf (message, sizeof (message), "CTCP reply to bob: VERSION %s", info); - CHECK_CHAN("--", message); + CHECK_CHAN("--", message, + "irc_privmsg,irc_ctcp,irc_ctcp_reply,self_msg,notify_none," + "no_highlight,log1"); snprintf (message, sizeof (message), "NOTICE bob :\01VERSION %s\01", info); CHECK_SENT(message); @@ -2027,7 +2284,7 @@ TEST(IrcProtocolWithServer, privmsg) RECV(":bob!user@host PRIVMSG #test :\01DCC SEND"); CHECK_NO_MSG; RECV(":bob!user@host PRIVMSG #test :\01DCC SEND file.txt"); - CHECK_SRV("=!=", "irc: cannot parse \"privmsg\" command"); + CHECK_SRV("=!=", "irc: cannot parse \"privmsg\" command", ""); RECV(":bob!user@host PRIVMSG #test :\01DCC SEND file.txt 1 2 3"); CHECK_CORE("", "xfer: incoming file from bob (0.0.0.1, irc." IRC_FAKE_SERVER @@ -2035,27 +2292,35 @@ TEST(IrcProtocolWithServer, privmsg) /* broken CTCP to user */ RECV(":bob!user@host PRIVMSG alice :\01"); - CHECK_SRV("--", "Unknown CTCP requested by bob: "); + CHECK_SRV("--", "Unknown CTCP requested by bob: ", + "irc_privmsg,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host PRIVMSG alice :\01TEST"); - CHECK_SRV("--", "Unknown CTCP requested by bob: TEST"); + CHECK_SRV("--", "Unknown CTCP requested by bob: TEST", + "irc_privmsg,irc_ctcp,host_user@host,log1"); RECV(":bob!user@host PRIVMSG alice :\01ACTION"); - CHECK_PV("bob", " *", "bob"); + CHECK_PV("bob", " *", "bob", + "irc_privmsg,irc_action,notify_private,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG alice :\01ACTION is testing"); - CHECK_PV("bob", " *", "bob is testing"); + CHECK_PV("bob", " *", "bob is testing", + "irc_privmsg,irc_action,notify_private,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG alice :\01VERSION"); info = irc_ctcp_replace_variables (ptr_server, irc_ctcp_get_reply (ptr_server, "VERSION")); snprintf (message, sizeof (message), "CTCP reply to bob: VERSION %s", info); - CHECK_SRV("--", message); + CHECK_SRV("--", message, + "irc_privmsg,irc_ctcp,irc_ctcp_reply,self_msg,notify_none," + "no_highlight,log1"); free (info); RECV(":bob!user@host PRIVMSG alice :\01DCC"); CHECK_NO_MSG; RECV(":bob!user@host PRIVMSG alice :\01DCC SEND"); CHECK_NO_MSG; RECV(":bob!user@host PRIVMSG alice :\01DCC SEND file.txt"); - CHECK_SRV("=!=", "irc: cannot parse \"privmsg\" command"); + CHECK_SRV("=!=", "irc: cannot parse \"privmsg\" command", ""); RECV(":bob!user@host PRIVMSG alice :\01DCC SEND file.txt 1 2 3"); CHECK_CORE("", "xfer: incoming file from bob (0.0.0.1, irc." IRC_FAKE_SERVER @@ -2064,9 +2329,13 @@ TEST(IrcProtocolWithServer, privmsg) /* valid CTCP to channel */ RECV(":bob!user@host PRIVMSG #test :\01TEST\01"); RECV(":bob!user@host PRIVMSG #test :\01ACTION\01"); - CHECK_CHAN(" *", "bob"); + CHECK_CHAN(" *", "bob", + "irc_privmsg,irc_action,notify_message,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG #test :\01ACTION is testing\01"); - CHECK_CHAN(" *", "bob is testing"); + CHECK_CHAN(" *", "bob is testing", + "irc_privmsg,irc_action,notify_message,nick_bob," + "host_user@host,log1"); RECV(":bob!user@host PRIVMSG #test :\01VERSION\01"); RECV(":bob!user@host PRIVMSG #test :\01DCC SEND file.txt 1 2 3\01"); @@ -2078,13 +2347,16 @@ TEST(IrcProtocolWithServer, privmsg) RECV(":bob!user@host PRIVMSG alice :\01ACTION is testing\01"); CHECK_SENT(NULL); RECV(":bob!user@host PRIVMSG alice :\01VERSION\01"); - CHECK_SRV("--", "CTCP requested by bob: VERSION"); + CHECK_SRV("--", "CTCP requested by bob: VERSION", + "irc_privmsg,irc_ctcp,host_user@host,log1"); info = irc_ctcp_replace_variables (ptr_server, irc_ctcp_get_reply (ptr_server, "VERSION")); snprintf (message, sizeof (message), "CTCP reply to bob: VERSION %s", info); - CHECK_SRV("--", message); + CHECK_SRV("--", message, + "irc_privmsg,irc_ctcp,irc_ctcp_reply,self_msg,notify_none," + "no_highlight,log1"); snprintf (message, sizeof (message), "NOTICE bob :\01VERSION %s\01", info); CHECK_SENT(message); @@ -2122,14 +2394,17 @@ TEST(IrcProtocolWithServer, quit) CHECK_ERROR_NICK("quit"); RECV(":bob!user@host PRIVMSG alice :hi Alice!"); - CHECK_PV("bob", "bob", "hi Alice!"); + CHECK_PV("bob", "bob", "hi Alice!", + "irc_privmsg,notify_private,prefix_nick_248,nick_bob," + "host_user@host,log1"); ptr_channel = ptr_server->channels; /* without quit message */ RECV(":bob!user@host JOIN #test"); RECV(":bob!user@host QUIT"); - CHECK_CHAN("<--", "bob (user@host) has quit"); + CHECK_CHAN("<--", "bob (user@host) has quit", + "irc_quit,irc_smart_filter,nick_bob,host_user@host,log4"); LONGS_EQUAL(1, ptr_channel->nicks_count); STRCMP_EQUAL("alice", ptr_channel->nicks->name); POINTERS_EQUAL(NULL, ptr_channel->nicks->next_nick); @@ -2137,7 +2412,8 @@ TEST(IrcProtocolWithServer, quit) /* without quit message (but empty trailing parameter) */ RECV(":bob!user@host JOIN #test"); RECV(":bob!user@host QUIT :"); - CHECK_CHAN("<--", "bob (user@host) has quit"); + CHECK_CHAN("<--", "bob (user@host) has quit", + "irc_quit,irc_smart_filter,nick_bob,host_user@host,log4"); LONGS_EQUAL(1, ptr_channel->nicks_count); STRCMP_EQUAL("alice", ptr_channel->nicks->name); POINTERS_EQUAL(NULL, ptr_channel->nicks->next_nick); @@ -2145,7 +2421,8 @@ TEST(IrcProtocolWithServer, quit) /* with quit message */ RECV(":bob!user@host JOIN #test"); RECV(":bob!user@host QUIT :quit message "); - CHECK_CHAN("<--", "bob (user@host) has quit (quit message )"); + CHECK_CHAN("<--", "bob (user@host) has quit (quit message )", + "irc_quit,irc_smart_filter,nick_bob,host_user@host,log4"); LONGS_EQUAL(1, ptr_channel->nicks_count); STRCMP_EQUAL("alice", ptr_channel->nicks->name); POINTERS_EQUAL(NULL, ptr_channel->nicks->next_nick); @@ -2178,12 +2455,14 @@ TEST(IrcProtocolWithServer, setname_without_setname_cap) /* real name of "bob" has changed */ RECV(":bob!user@host SETNAME :new bob realname "); - CHECK_CHAN("--", "bob has changed real name to \"new bob realname \""); + CHECK_CHAN("--", "bob has changed real name to \"new bob realname \"", + "irc_setname,irc_smart_filter,log3"); POINTERS_EQUAL(NULL, ptr_nick->realname); /* self real name has changed */ RECV(":alice!user@host SETNAME :new alice realname "); - CHECK_SRV("--", "Your real name has been set to \"new alice realname \""); + CHECK_SRV("--", "Your real name has been set to \"new alice realname \"", + "irc_setname,log3"); POINTERS_EQUAL(NULL, ptr_nick->realname); } @@ -2208,17 +2487,20 @@ TEST(IrcProtocolWithServer, setname_with_setname_cap) /* real name of "bob" has changed */ RECV(":bob!user@host SETNAME :new bob realname "); - CHECK_CHAN("--", "bob has changed real name to \"new bob realname \""); + CHECK_CHAN("--", "bob has changed real name to \"new bob realname \"", + "irc_setname,irc_smart_filter,log3"); STRCMP_EQUAL("new bob realname ", ptr_nick2->realname); /* self real name has changed */ RECV(":alice!user@host SETNAME :new realname"); - CHECK_SRV("--", "Your real name has been set to \"new realname\""); + CHECK_SRV("--", "Your real name has been set to \"new realname\"", + "irc_setname,log3"); STRCMP_EQUAL("new realname", ptr_nick->realname); /* self real name has changed */ RECV(":alice!user@host SETNAME :new realname2"); - CHECK_SRV("--", "Your real name has been set to \"new realname2\""); + CHECK_SRV("--", "Your real name has been set to \"new realname2\"", + "irc_setname,log3"); STRCMP_EQUAL("new realname2", ptr_nick->realname); } @@ -2301,33 +2583,40 @@ TEST(IrcProtocolWithServer, topic) /* not a channel */ RECV(":alice!user@host TOPIC bob"); - CHECK_SRV("=!=", "irc: \"topic\" command received without channel"); + CHECK_SRV("=!=", "irc: \"topic\" command received without channel", ""); /* empty topic */ RECV(":alice!user@host TOPIC #test"); - CHECK_CHAN("--", "alice has unset topic for #test"); + CHECK_CHAN("--", "alice has unset topic for #test", + "irc_topic,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_channel->topic); /* empty topic (with empty trailing parameter) */ RECV(":alice!user@host TOPIC #test :"); - CHECK_CHAN("--", "alice has unset topic for #test"); + CHECK_CHAN("--", "alice has unset topic for #test", + "irc_topic,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_channel->topic); /* new topic */ RECV(":alice!user@host TOPIC #test :new topic "); - CHECK_CHAN("--", "alice has changed topic for #test to \"new topic \""); + CHECK_CHAN("--", "alice has changed topic for #test to \"new topic \"", + "irc_topic,host_user@host,log3"); STRCMP_EQUAL("new topic ", ptr_channel->topic); /* another new topic */ RECV(":alice!user@host TOPIC #test :another new topic "); - CHECK_CHAN("--", "alice has changed topic for #test from \"new topic \" to " - "\"another new topic \""); + CHECK_CHAN("--", + "alice has changed topic for #test from \"new topic \" to " + "\"another new topic \"", + "irc_topic,host_user@host,log3"); STRCMP_EQUAL("another new topic ", ptr_channel->topic); /* empty topic */ RECV(":alice!user@host TOPIC #test"); - CHECK_CHAN("--", "alice has unset topic for #test (old topic: " - "\"another new topic \")"); + CHECK_CHAN("--", + "alice has unset topic for #test (old topic: " + "\"another new topic \")", + "irc_topic,host_user@host,log3"); POINTERS_EQUAL(NULL, ptr_channel->topic); } @@ -2345,10 +2634,12 @@ TEST(IrcProtocolWithServer, wallops) CHECK_ERROR_PARAMS("wallops", 0, 1); RECV(":alice!user@host WALLOPS message "); - CHECK_SRV("--", "Wallops from alice (user@host): message"); + CHECK_SRV("--", "Wallops from alice (user@host): message", + "irc_wallops,notify_private,nick_alice,host_user@host,log3"); RECV(":alice!user@host WALLOPS :message from admin "); - CHECK_SRV("--", "Wallops from alice (user@host): message from admin "); + CHECK_SRV("--", "Wallops from alice (user@host): message from admin ", + "irc_wallops,notify_private,nick_alice,host_user@host,log3"); } /* @@ -2369,22 +2660,23 @@ TEST(IrcProtocolWithServer, warn) CHECK_ERROR_PARAMS("warn", 1, 2); RECV(":server WARN * TEST"); - CHECK_SRV("=!=", "Warning: [] TEST"); + CHECK_SRV("=!=", "Warning: [] TEST", "irc_warn,log3"); RECV(":server WARN * TEST :the message"); - CHECK_SRV("=!=", "Warning: [TEST] the message"); + CHECK_SRV("=!=", "Warning: [TEST] the message", "irc_warn,log3"); RECV(":server WARN * TEST TEST2"); - CHECK_SRV("=!=", "Warning: [TEST] TEST2"); + CHECK_SRV("=!=", "Warning: [TEST] TEST2", "irc_warn,log3"); RECV(":server WARN * TEST TEST2 :the message"); - CHECK_SRV("=!=", "Warning: [TEST TEST2] the message"); + CHECK_SRV("=!=", "Warning: [TEST TEST2] the message", "irc_warn,log3"); RECV(":server WARN COMMAND TEST"); - CHECK_SRV("=!=", "Warning: COMMAND [] TEST"); + CHECK_SRV("=!=", "Warning: COMMAND [] TEST", "irc_warn,log3"); RECV(":server WARN COMMAND TEST :the message"); - CHECK_SRV("=!=", "Warning: COMMAND [TEST] the message"); + CHECK_SRV("=!=", "Warning: COMMAND [TEST] the message", "irc_warn,log3"); RECV(":server WARN COMMAND TEST TEST2"); - CHECK_SRV("=!=", "Warning: COMMAND [TEST] TEST2"); + CHECK_SRV("=!=", "Warning: COMMAND [TEST] TEST2", "irc_warn,log3"); RECV(":server WARN COMMAND TEST TEST2 :the message"); - CHECK_SRV("=!=", "Warning: COMMAND [TEST TEST2] the message"); + CHECK_SRV("=!=", "Warning: COMMAND [TEST TEST2] the message", + "irc_warn,log3"); } /* @@ -2402,7 +2694,7 @@ TEST(IrcProtocolWithServer, 001_empty) CHECK_ERROR_PARAMS("001", 0, 1); RECV(":server 001 alice"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_001,irc_numeric,log3"); LONGS_EQUAL(1, ptr_server->is_connected); STRCMP_EQUAL("alice", ptr_server->nick); } @@ -2421,7 +2713,8 @@ TEST(IrcProtocolWithServer, 001_welcome) STRCMP_EQUAL("nick1", ptr_server->nick); RECV(":server 001 alice :Welcome on this server, alice!"); - CHECK_SRV("--", "Welcome on this server, alice!"); + CHECK_SRV("--", "Welcome on this server, alice!", + "irc_001,irc_numeric,log3"); LONGS_EQUAL(1, ptr_server->is_connected); STRCMP_EQUAL("alice", ptr_server->nick); @@ -2442,7 +2735,7 @@ TEST(IrcProtocolWithServer, 005_empty) POINTERS_EQUAL(NULL, ptr_server->prefix_chars); RECV(":server 005 alice TEST=A"); - CHECK_SRV("--", "TEST=A"); + CHECK_SRV("--", "TEST=A", "irc_005,irc_numeric,log3"); POINTERS_EQUAL(NULL, ptr_server->prefix_modes); POINTERS_EQUAL(NULL, ptr_server->prefix_chars); @@ -2472,7 +2765,8 @@ TEST(IrcProtocolWithServer, 005_full) POINTERS_EQUAL(NULL, ptr_server->isupport); RECV(":server 005 alice " IRC_MSG_005 " :are supported"); - CHECK_SRV("--", IRC_MSG_005 " are supported"); + CHECK_SRV("--", IRC_MSG_005 " are supported", + "irc_005,irc_numeric,log3"); STRCMP_EQUAL("ohv", ptr_server->prefix_modes); STRCMP_EQUAL("@%+", ptr_server->prefix_chars); @@ -2490,7 +2784,8 @@ TEST(IrcProtocolWithServer, 005_full) /* check that realloc of info is OK if we receive the message again */ RECV(":server 005 alice " IRC_MSG_005 " :are supported"); - CHECK_SRV("--", IRC_MSG_005 " are supported"); + CHECK_SRV("--", IRC_MSG_005 " are supported", + "irc_005,irc_numeric,log3"); STRCMP_EQUAL("ohv", ptr_server->prefix_modes); STRCMP_EQUAL("@%+", ptr_server->prefix_chars); @@ -2522,13 +2817,15 @@ TEST(IrcProtocolWithServer, 005_multiple_messages) POINTERS_EQUAL(NULL, ptr_server->isupport); RECV(":server 005 alice PREFIX=(ohv)@%+ :are supported"); - CHECK_SRV("--", "PREFIX=(ohv)@%+ are supported"); + CHECK_SRV("--", "PREFIX=(ohv)@%+ are supported", + "irc_005,irc_numeric,log3"); STRCMP_EQUAL("ohv", ptr_server->prefix_modes); STRCMP_EQUAL("@%+", ptr_server->prefix_chars); STRCMP_EQUAL("PREFIX=(ohv)@%+", ptr_server->isupport); RECV(":server 005 alice HOSTLEN=24 :are supported"); - CHECK_SRV("--", "HOSTLEN=24 are supported"); + CHECK_SRV("--", "HOSTLEN=24 are supported", + "irc_005,irc_numeric,log3"); LONGS_EQUAL(24, ptr_server->host_max_length); STRCMP_EQUAL("PREFIX=(ohv)@%+ HOSTLEN=24", ptr_server->isupport); } @@ -2549,7 +2846,9 @@ TEST(IrcProtocolWithServer, 008) CHECK_ERROR_PARAMS("008", 1, 2); RECV(":server 008 alice +Zbfkrsuy :Server notice mask"); - CHECK_SRV("--", "Server notice mask for alice: +Zbfkrsuy Server notice mask"); + CHECK_SRV("--", + "Server notice mask for alice: +Zbfkrsuy Server notice mask", + "irc_008,irc_numeric,log3"); } /* @@ -2570,11 +2869,13 @@ TEST(IrcProtocolWithServer, 221) POINTERS_EQUAL(NULL, ptr_server->nick_modes); RECV(":server 221 alice :+abc"); - CHECK_SRV("--", "User mode for alice is [+abc]"); + CHECK_SRV("--", "User mode for alice is [+abc]", + "irc_221,irc_numeric,log3"); STRCMP_EQUAL("abc", ptr_server->nick_modes); RECV(":server 221 alice :-abc"); - CHECK_SRV("--","User mode for alice is [-abc]"); + CHECK_SRV("--","User mode for alice is [-abc]", + "irc_221,irc_numeric,log3"); POINTERS_EQUAL(NULL, ptr_server->nick_modes); } @@ -2667,69 +2968,72 @@ TEST(IrcProtocolWithServer, whois_nick_msg) CHECK_ERROR_PARAMS("671", 1, 2); RECV(":server 223 alice bob UTF-8"); - CHECK_SRV("--", "[bob] UTF-8"); + CHECK_SRV("--", "[bob] UTF-8", "irc_223,irc_numeric,log3"); RECV(":server 223 alice bob :UTF-8"); - CHECK_SRV("--", "[bob] UTF-8"); + CHECK_SRV("--", "[bob] UTF-8", "irc_223,irc_numeric,log3"); RECV(":server 223 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_223,irc_numeric,log3"); RECV(":server 264 alice bob :is using encrypted connection"); - CHECK_SRV("--", "[bob] is using encrypted connection"); + CHECK_SRV("--", "[bob] is using encrypted connection", + "irc_264,irc_numeric,log3"); RECV(":server 264 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_264,irc_numeric,log3"); RECV(":server 275 alice bob :is using secure connection"); - CHECK_SRV("--", "[bob] is using secure connection"); + CHECK_SRV("--", "[bob] is using secure connection", + "irc_275,irc_numeric,log3"); RECV(":server 275 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_275,irc_numeric,log3"); RECV(":server 276 alice bob :has client certificate fingerprint"); - CHECK_SRV("--", "[bob] has client certificate fingerprint"); + CHECK_SRV("--", "[bob] has client certificate fingerprint", + "irc_276,irc_numeric,log3"); RECV(":server 276 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_276,irc_numeric,log3"); RECV(":server 307 alice bob :registered nick"); - CHECK_SRV("--", "[bob] registered nick"); + CHECK_SRV("--", "[bob] registered nick", "irc_307,irc_numeric,log3"); RECV(":server 307 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_307,irc_numeric,log3"); RECV(":server 310 alice bob :help mode"); - CHECK_SRV("--", "[bob] help mode"); + CHECK_SRV("--", "[bob] help mode", "irc_310,irc_numeric,log3"); RECV(":server 310 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_310,irc_numeric,log3"); RECV(":server 313 alice bob :operator"); - CHECK_SRV("--", "[bob] operator"); + CHECK_SRV("--", "[bob] operator", "irc_313,irc_numeric,log3"); RECV(":server 313 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_313,irc_numeric,log3"); RECV(":server 318 alice bob :end"); - CHECK_SRV("--", "[bob] end"); + CHECK_SRV("--", "[bob] end", "irc_318,irc_numeric,log3"); RECV(":server 318 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_318,irc_numeric,log3"); RECV(":server 319 alice bob :channels"); - CHECK_SRV("--", "[bob] channels"); + CHECK_SRV("--", "[bob] channels", "irc_319,irc_numeric,log3"); RECV(":server 319 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_319,irc_numeric,log3"); RECV(":server 320 alice bob :identified user"); - CHECK_SRV("--", "[bob] identified user"); + CHECK_SRV("--", "[bob] identified user", "irc_320,irc_numeric,log3"); RECV(":server 320 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_320,irc_numeric,log3"); RECV(":server 326 alice bob :has oper privs"); - CHECK_SRV("--", "[bob] has oper privs"); + CHECK_SRV("--", "[bob] has oper privs", "irc_326,irc_numeric,log3"); RECV(":server 326 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_326,irc_numeric,log3"); RECV(":server 335 alice bob :is a bot"); - CHECK_SRV("--", "[bob] is a bot"); + CHECK_SRV("--", "[bob] is a bot", "irc_335,irc_numeric,log3"); RECV(":server 335 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_335,irc_numeric,log3"); RECV(":server 378 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_378,irc_numeric,log3"); RECV(":server 378 alice bob :connecting from"); - CHECK_SRV("--", "[bob] connecting from"); + CHECK_SRV("--", "[bob] connecting from", "irc_378,irc_numeric,log3"); RECV(":server 378 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_378,irc_numeric,log3"); RECV(":server 379 alice bob :using modes"); - CHECK_SRV("--", "[bob] using modes"); + CHECK_SRV("--", "[bob] using modes", "irc_379,irc_numeric,log3"); RECV(":server 379 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_379,irc_numeric,log3"); RECV(":server 671 alice bob :secure connection"); - CHECK_SRV("--", "[bob] secure connection"); + CHECK_SRV("--", "[bob] secure connection", "irc_671,irc_numeric,log3"); RECV(":server 671 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_671,irc_numeric,log3"); } /* @@ -2751,11 +3055,11 @@ TEST(IrcProtocolWithServer, whowas_nick_msg) CHECK_ERROR_PARAMS("369", 1, 2); RECV(":server 369 alice bob end"); - CHECK_SRV("--", "[bob] end"); + CHECK_SRV("--", "[bob] end", "irc_369,irc_numeric,log3"); RECV(":server 369 alice bob :end"); - CHECK_SRV("--", "[bob] end"); + CHECK_SRV("--", "[bob] end", "irc_369,irc_numeric,log3"); RECV(":server 369 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_369,irc_numeric,log3"); } /* @@ -2768,7 +3072,9 @@ TEST(IrcProtocolWithServer, 301) SRV_INIT; RECV(":bob!user@host PRIVMSG alice :hi Alice!"); - CHECK_PV("bob", "bob", "hi Alice!"); + CHECK_PV("bob", "bob", "hi Alice!", + "irc_privmsg,notify_private,prefix_nick_248,nick_bob," + "host_user@host,log1"); /* not enough parameters */ RECV(":server 301"); @@ -2781,7 +3087,8 @@ TEST(IrcProtocolWithServer, 301) POINTERS_EQUAL(NULL, ptr_server->channels->away_message); RECV(":server 301 alice bob :I am away "); - CHECK_PV("bob", "--", "[bob] is away: I am away "); + CHECK_PV("bob", "--", "[bob] is away: I am away ", + "irc_301,irc_numeric,log3"); STRCMP_EQUAL("I am away ", ptr_server->channels->away_message); } @@ -2801,7 +3108,8 @@ TEST(IrcProtocolWithServer, 303) CHECK_ERROR_PARAMS("303", 1, 2); RECV(":server 303 alice :nick1 nick2"); - CHECK_SRV("--", "Users online: nick1 nick2"); + CHECK_SRV("--", "Users online: nick1 nick2", + "irc_303,irc_numeric,log3"); } /* @@ -2815,7 +3123,9 @@ TEST(IrcProtocolWithServer, 305_306) SRV_INIT; RECV(":bob!user@host PRIVMSG alice :hi Alice!"); - CHECK_PV("bob", "bob", "hi Alice!"); + CHECK_PV("bob", "bob", "hi Alice!", + "irc_privmsg,notify_private,prefix_nick_248,nick_bob," + "host_user@host,log1"); /* not enough parameters */ RECV(":server 305"); @@ -2834,11 +3144,12 @@ TEST(IrcProtocolWithServer, 305_306) LONGS_EQUAL(0, ptr_server->is_away); RECV(":server 306 alice :We'll miss you"); /* now away */ - CHECK_SRV("--", "We'll miss you"); + CHECK_SRV("--", "We'll miss you", "irc_306,irc_numeric,log3"); LONGS_EQUAL(1, ptr_server->is_away); RECV(":server 305 alice :Does this mean you're really back?"); - CHECK_SRV("--", "Does this mean you're really back?"); + CHECK_SRV("--", "Does this mean you're really back?", + "irc_305,irc_numeric,log3"); LONGS_EQUAL(0, ptr_server->is_away); } @@ -2862,11 +3173,12 @@ TEST(IrcProtocolWithServer, 311) /* non-standard parameters (using default whois callback) */ RECV(":server 311 alice bob user"); - CHECK_SRV("--", "[bob] user"); + CHECK_SRV("--", "[bob] user", "irc_311,irc_numeric,log3"); /* standard parameters */ RECV(":server 311 alice bob user host * :real name"); - CHECK_SRV("--", "[bob] (user@host): real name"); + CHECK_SRV("--", "[bob] (user@host): real name", + "irc_311,irc_numeric,log3"); } /* @@ -2888,11 +3200,12 @@ TEST(IrcProtocolWithServer, 312) /* non-standard parameters (using default whois callback) */ RECV(":server 312 alice bob server"); - CHECK_SRV("--", "[bob] server"); + CHECK_SRV("--", "[bob] server", "irc_312,irc_numeric,log3"); /* standard parameters */ RECV(":server 312 alice bob server :https://example.com/"); - CHECK_SRV("--", "[bob] server (https://example.com/)"); + CHECK_SRV("--", "[bob] server (https://example.com/)", + "irc_312,irc_numeric,log3"); } /* @@ -2914,11 +3227,12 @@ TEST(IrcProtocolWithServer, 314) /* non-standard parameters (using default whowas callback) */ RECV(":server 314 alice bob user"); - CHECK_SRV("--", "[bob] user"); + CHECK_SRV("--", "[bob] user", "irc_314,irc_numeric,log3"); /* standard parameters */ RECV(":server 314 alice bob user host * :real name"); - CHECK_SRV("--", "[bob] (user@host) was real name"); + CHECK_SRV("--", "[bob] (user@host) was real name", + "irc_314,irc_numeric,log3"); } /* @@ -2939,7 +3253,8 @@ TEST(IrcProtocolWithServer, 315) CHECK_ERROR_PARAMS("315", 2, 3); RECV(":server 315 alice #test End of /WHO list."); - CHECK_SRV("--", "[#test] End of /WHO list."); + CHECK_SRV("--", "[#test] End of /WHO list.", + "irc_315,irc_numeric,log3"); } /* @@ -2966,11 +3281,15 @@ TEST(IrcProtocolWithServer, 317) /* signon at 03/12/2008 @ 1:18pm (UTC) */ RECV(":server 317 alice bob 122877 1205327880"); - CHECK_SRV("--", "[bob] idle: 1 day, 10 hours 07 minutes 57 seconds, " - "signon at: Wed, 12 Mar 2008 13:18:00"); + CHECK_SRV("--", + "[bob] idle: 1 day, 10 hours 07 minutes 57 seconds, " + "signon at: Wed, 12 Mar 2008 13:18:00", + "irc_317,irc_numeric,log3"); RECV(":server 317 alice bob 122877 1205327880 :seconds idle, signon time"); - CHECK_SRV("--", "[bob] idle: 1 day, 10 hours 07 minutes 57 seconds, " - "signon at: Wed, 12 Mar 2008 13:18:00"); + CHECK_SRV("--", + "[bob] idle: 1 day, 10 hours 07 minutes 57 seconds, " + "signon at: Wed, 12 Mar 2008 13:18:00", + "irc_317,irc_numeric,log3"); /* signon 2 minutes ago */ time = time_t (NULL); @@ -2997,11 +3316,11 @@ TEST(IrcProtocolWithServer, 321) CHECK_ERROR_PARAMS("321", 1, 2); RECV(":server 321 alice #test"); - CHECK_SRV("--", "#test"); + CHECK_SRV("--", "#test", "irc_321,irc_numeric,log3"); RECV(":server 321 alice #test Users"); - CHECK_SRV("--", "#test Users"); + CHECK_SRV("--", "#test Users", "irc_321,irc_numeric,log3"); RECV(":server 321 alice #test :Users Name"); - CHECK_SRV("--", "#test Users Name"); + CHECK_SRV("--", "#test Users Name", "irc_321,irc_numeric,log3"); } /* @@ -3022,17 +3341,21 @@ TEST(IrcProtocolWithServer, 322) CHECK_ERROR_PARAMS("322", 2, 3); RECV(":server 322 alice #test 3"); - CHECK_SRV("--", "#test(3)"); + CHECK_SRV("--", "#test(3)", "irc_322,irc_numeric,log3"); RECV(":server 322 alice #test 3 :topic of channel "); - CHECK_SRV("--", "#test(3): topic of channel "); + CHECK_SRV("--", "#test(3): topic of channel ", + "irc_322,irc_numeric,log3"); run_cmd_quiet ("/list -server " IRC_FAKE_SERVER " -re #test.*"); - CHECK_SRV("--", "#test(3): topic of channel "); + CHECK_SRV("--", "#test(3): topic of channel ", + "irc_322,irc_numeric,log3"); RECV(":server 322 alice #test 3"); - CHECK_SRV("--", "#test(3)"); + CHECK_SRV("--", "#test(3)", + "irc_322,irc_numeric,log3"); RECV(":server 322 alice #test 3 :topic of channel "); - CHECK_SRV("--", "#test(3): topic of channel "); + CHECK_SRV("--", "#test(3): topic of channel ", + "irc_322,irc_numeric,log3"); RECV(":server 322 alice #xyz 3"); CHECK_NO_MSG; @@ -3054,11 +3377,11 @@ TEST(IrcProtocolWithServer, 323) CHECK_ERROR_PARAMS("323", 0, 1); RECV(":server 323 alice"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_323,irc_numeric,log3"); RECV(":server 323 alice end"); - CHECK_SRV("--", "end"); + CHECK_SRV("--", "end", "irc_323,irc_numeric,log3"); RECV(":server 323 alice :End of /LIST"); - CHECK_SRV("--", "End of /LIST"); + CHECK_SRV("--", "End of /LIST", "irc_323,irc_numeric,log3"); } /* @@ -3083,7 +3406,7 @@ TEST(IrcProtocolWithServer, 324) STRCMP_EQUAL("+nt", ptr_server->channels->modes); RECV(":server 324 alice #test"); - CHECK_CHAN("--", "Mode #test []"); + CHECK_CHAN("--", "Mode #test []", "irc_324,irc_numeric,log3"); POINTERS_EQUAL(NULL, ptr_server->channels->modes); } @@ -3106,13 +3429,14 @@ TEST(IrcProtocolWithServer, 327) /* non-standard parameters (using default whois callback) */ RECV(":server 327 alice bob host"); - CHECK_SRV("--", "[bob] host"); + CHECK_SRV("--", "[bob] host", "irc_327,irc_numeric,log3"); /* standard parameters */ RECV(":server 327 alice bob host 1.2.3.4"); - CHECK_SRV("--", "[bob] host 1.2.3.4"); + CHECK_SRV("--", "[bob] host 1.2.3.4", "irc_327,irc_numeric,log3"); RECV(":server 327 alice bob host 1.2.3.4 :real name"); - CHECK_SRV("--", "[bob] host 1.2.3.4 (real name)"); + CHECK_SRV("--", "[bob] host 1.2.3.4 (real name)", + "irc_327,irc_numeric,log3"); } /* @@ -3133,10 +3457,11 @@ TEST(IrcProtocolWithServer, 328) CHECK_ERROR_PARAMS("328", 2, 3); RECV(":server 328 alice #test :https://example.com/"); - CHECK_CHAN("--", "URL for #test: https://example.com/"); + CHECK_CHAN("--", "URL for #test: https://example.com/", + "irc_328,irc_numeric,log3"); RECV(":server 328 alice #test :URL is https://example.com/"); - CHECK_CHAN("--", "URL for #test: URL is https://example.com/"); - + CHECK_CHAN("--", "URL for #test: URL is https://example.com/", + "irc_328,irc_numeric,log3"); } /* @@ -3157,15 +3482,19 @@ TEST(IrcProtocolWithServer, 329) CHECK_ERROR_PARAMS("329", 2, 3); RECV(":server 329 alice #test 1205327894"); - CHECK_CHAN("--", "Channel created on Wed, 12 Mar 2008 13:18:14"); + CHECK_CHAN("--", "Channel created on Wed, 12 Mar 2008 13:18:14", + "irc_329,irc_numeric,log3"); RECV(":server 329 alice #test :1205327894"); - CHECK_CHAN("--", "Channel created on Wed, 12 Mar 2008 13:18:14"); + CHECK_CHAN("--", "Channel created on Wed, 12 Mar 2008 13:18:14", + "irc_329,irc_numeric,log3"); /* channel not found */ RECV(":server 329 alice #xyz 1205327894"); - CHECK_SRV("--", "Channel #xyz created on Wed, 12 Mar 2008 13:18:14"); + CHECK_SRV("--", "Channel #xyz created on Wed, 12 Mar 2008 13:18:14", + "irc_329,irc_numeric,log3"); RECV(":server 329 alice #xyz :1205327894"); - CHECK_SRV("--", "Channel #xyz created on Wed, 12 Mar 2008 13:18:14"); + CHECK_SRV("--", "Channel #xyz created on Wed, 12 Mar 2008 13:18:14", + "irc_329,irc_numeric,log3"); } /* @@ -3195,14 +3524,15 @@ TEST(IrcProtocolWithServer, 330_343) CHECK_ERROR_PARAMS("343", 2, 3); RECV(":server 330 alice bob bob2"); - CHECK_SRV("--", "[bob] bob2"); + CHECK_SRV("--", "[bob] bob2", "irc_330,irc_numeric,log3"); RECV(":server 330 alice bob bob2 :is logged in as"); - CHECK_SRV("--", "[bob] is logged in as bob2"); + CHECK_SRV("--", "[bob] is logged in as bob2", + "irc_330,irc_numeric,log3"); RECV(":server 343 alice bob bob2"); - CHECK_SRV("--", "[bob] bob2"); + CHECK_SRV("--", "[bob] bob2", "irc_343,irc_numeric,log3"); RECV(":server 343 alice bob bob2 :is opered as"); - CHECK_SRV("--", "[bob] is opered as bob2"); + CHECK_SRV("--", "[bob] is opered as bob2", "irc_343,irc_numeric,log3"); } /* @@ -3221,11 +3551,13 @@ TEST(IrcProtocolWithServer, 331) CHECK_ERROR_PARAMS("331", 1, 2); RECV(":server 331 alice #test"); - CHECK_CHAN("--", "No topic set for channel #test"); + CHECK_CHAN("--", "No topic set for channel #test", + "irc_331,irc_numeric,log3"); /* channel not found */ RECV(":server 331 alice #xyz"); - CHECK_SRV("--", "No topic set for channel #xyz"); + CHECK_SRV("--", "No topic set for channel #xyz", + "irc_331,irc_numeric,log3"); } /* @@ -3246,10 +3578,12 @@ TEST(IrcProtocolWithServer, 332) POINTERS_EQUAL(NULL, ptr_server->channels->topic); RECV(":server 332 alice #test"); - CHECK_CHAN("--", "Topic for #test is \"\""); + CHECK_CHAN("--", "Topic for #test is \"\"", + "irc_332,irc_numeric,log3"); RECV(":server 332 alice #test :the new topic "); - CHECK_CHAN("--", "Topic for #test is \"the new topic \""); + CHECK_CHAN("--", "Topic for #test is \"the new topic \"", + "irc_332,irc_numeric,log3"); STRCMP_EQUAL("the new topic ", ptr_server->channels->topic); } @@ -3273,18 +3607,24 @@ TEST(IrcProtocolWithServer, 333) RECV(":server 333 alice #test nick!user@host"); CHECK_NO_MSG; RECV(":server 333 alice #test nick!user@host 1205428096"); - CHECK_CHAN("--", "Topic set by nick (user@host) on Thu, 13 Mar 2008 17:08:16"); + CHECK_CHAN("--", + "Topic set by nick (user@host) on Thu, 13 Mar 2008 17:08:16", + "irc_333,irc_numeric,log3"); RECV(":server 333 alice #test 1205428096"); - CHECK_CHAN("--", "Topic set on Thu, 13 Mar 2008 17:08:16"); + CHECK_CHAN("--", "Topic set on Thu, 13 Mar 2008 17:08:16", + "irc_333,irc_numeric,log3"); /* channel not found */ RECV(":server 333 alice #xyz nick!user@host"); CHECK_NO_MSG; RECV(":server 333 alice #xyz nick!user@host 1205428096"); - CHECK_SRV("--", "Topic for #xyz set by nick (user@host) on " - "Thu, 13 Mar 2008 17:08:16"); + CHECK_SRV("--", + "Topic for #xyz set by nick (user@host) on " + "Thu, 13 Mar 2008 17:08:16", + "irc_333,irc_numeric,log3"); RECV(":server 333 alice #xyz 1205428096"); - CHECK_SRV("--", "Topic for #xyz set on Thu, 13 Mar 2008 17:08:16"); + CHECK_SRV("--", "Topic for #xyz set on Thu, 13 Mar 2008 17:08:16", + "irc_333,irc_numeric,log3"); } /* @@ -3305,11 +3645,13 @@ TEST(IrcProtocolWithServer, 338) CHECK_ERROR_PARAMS("338", 2, 3); RECV(":server 338 alice bob hostname :actually using host"); - CHECK_SRV("--", "[bob] actually using host hostname"); + CHECK_SRV("--", "[bob] actually using host hostname", + "irc_338,irc_numeric,log3"); /* on Rizon server */ RECV(":server 338 alice bob :is actually bob@example.com [1.2.3.4]"); - CHECK_SRV("--", "[bob] is actually bob@example.com [1.2.3.4]"); + CHECK_SRV("--", "[bob] is actually bob@example.com [1.2.3.4]", + "irc_338,irc_numeric,log3"); } /* @@ -3330,9 +3672,11 @@ TEST(IrcProtocolWithServer, 341) CHECK_ERROR_PARAMS("341", 2, 3); RECV(":server 341 alice bob #test"); - CHECK_SRV("--", "alice has invited bob to #test"); + CHECK_SRV("--", "alice has invited bob to #test", + "irc_341,irc_numeric,nick_alice,log3"); RECV(":server 341 alice bob :#test"); - CHECK_SRV("--", "alice has invited bob to #test"); + CHECK_SRV("--", "alice has invited bob to #test", + "irc_341,irc_numeric,nick_alice,log3"); } /* @@ -3354,19 +3698,24 @@ TEST(IrcProtocolWithServer, 344) /* channel reop (IRCnet) */ RECV(":server 344 alice #test nick!user@host"); - CHECK_SRV("--", "Channel reop #test: nick!user@host"); + CHECK_SRV("--", "Channel reop #test: nick!user@host", + "irc_344,irc_numeric,log3"); RECV(":server 344 alice #test :nick!user@host"); - CHECK_SRV("--", "Channel reop #test: nick!user@host"); + CHECK_SRV("--", "Channel reop #test: nick!user@host", + "irc_344,irc_numeric,log3"); /* channel reop (IRCnet), channel not found */ RECV(":server 344 alice #xyz nick!user@host"); - CHECK_SRV("--", "Channel reop #xyz: nick!user@host"); + CHECK_SRV("--", "Channel reop #xyz: nick!user@host", + "irc_344,irc_numeric,log3"); RECV(":server 344 alice #xyz :nick!user@host"); - CHECK_SRV("--", "Channel reop #xyz: nick!user@host"); + CHECK_SRV("--", "Channel reop #xyz: nick!user@host", + "irc_344,irc_numeric,log3"); /* whois, geo info (UnrealIRCd) */ RECV(":server 344 alice bob FR :is connecting from France"); - CHECK_SRV("--", "[bob] FR is connecting from France"); + CHECK_SRV("--", "[bob] FR is connecting from France", + "irc_344,irc_numeric,log3"); } /* @@ -3387,15 +3736,17 @@ TEST(IrcProtocolWithServer, 345) CHECK_ERROR_PARAMS("345", 2, 3); RECV(":server 345 alice #test end"); - CHECK_SRV("--", "#test: end"); + CHECK_SRV("--", "#test: end", "irc_345,irc_numeric,log3"); RECV(":server 345 alice #test :End of Channel Reop List"); - CHECK_SRV("--", "#test: End of Channel Reop List"); + CHECK_SRV("--", "#test: End of Channel Reop List", + "irc_345,irc_numeric,log3"); /* channel not found */ RECV(":server 345 alice #xyz end"); - CHECK_SRV("--", "#xyz: end"); + CHECK_SRV("--", "#xyz: end", "irc_345,irc_numeric,log3"); RECV(":server 345 alice #xyz :End of Channel Reop List"); - CHECK_SRV("--", "#xyz: End of Channel Reop List"); + CHECK_SRV("--", "#xyz: End of Channel Reop List", + "irc_345,irc_numeric,log3"); } /* @@ -3416,21 +3767,29 @@ TEST(IrcProtocolWithServer, 346) CHECK_ERROR_PARAMS("346", 2, 3); RECV(":server 346 alice #test invitemask"); - CHECK_CHAN("--", "[#test] [1] invitemask invited"); + CHECK_CHAN("--", "[#test] [1] invitemask invited", + "irc_346,irc_numeric,log3"); RECV(":server 346 alice #test invitemask nick!user@host"); - CHECK_CHAN("--", "[#test] [2] invitemask invited by nick (user@host)"); + CHECK_CHAN("--", "[#test] [2] invitemask invited by nick (user@host)", + "irc_346,irc_numeric,log3"); RECV(":server 346 alice #test invitemask nick!user@host 1205590879"); - CHECK_CHAN("--", "[#test] [3] invitemask invited by nick (user@host) " - "on Sat, 15 Mar 2008 14:21:19"); + CHECK_CHAN("--", + "[#test] [3] invitemask invited by nick (user@host) " + "on Sat, 15 Mar 2008 14:21:19", + "irc_346,irc_numeric,log3"); /* channel not found */ RECV(":server 346 alice #xyz invitemask"); - CHECK_SRV("--", "[#xyz] invitemask invited"); + CHECK_SRV("--", "[#xyz] invitemask invited", + "irc_346,irc_numeric,log3"); RECV(":server 346 alice #xyz invitemask nick!user@host"); - CHECK_SRV("--", "[#xyz] invitemask invited by nick (user@host)"); + CHECK_SRV("--", "[#xyz] invitemask invited by nick (user@host)", + "irc_346,irc_numeric,log3"); RECV(":server 346 alice #xyz invitemask nick!user@host 1205590879"); - CHECK_SRV("--", "[#xyz] invitemask invited by nick (user@host) " - "on Sat, 15 Mar 2008 14:21:19"); + CHECK_SRV("--", + "[#xyz] invitemask invited by nick (user@host) " + "on Sat, 15 Mar 2008 14:21:19", + "irc_346,irc_numeric,log3"); } /* @@ -3449,19 +3808,21 @@ TEST(IrcProtocolWithServer, 347) CHECK_ERROR_PARAMS("347", 1, 2); RECV(":server 347 alice #test"); - CHECK_CHAN("--", "[#test]"); + CHECK_CHAN("--", "[#test]", "irc_347,irc_numeric,log3"); RECV(":server 347 alice #test end"); - CHECK_CHAN("--", "[#test] end"); + CHECK_CHAN("--", "[#test] end", "irc_347,irc_numeric,log3"); RECV(":server 347 alice #test :End of Channel Invite List"); - CHECK_CHAN("--", "[#test] End of Channel Invite List"); + CHECK_CHAN("--", "[#test] End of Channel Invite List", + "irc_347,irc_numeric,log3"); /* channel not found */ RECV(":server 347 alice #xyz"); - CHECK_SRV("--", "[#xyz]"); + CHECK_SRV("--", "[#xyz]", "irc_347,irc_numeric,log3"); RECV(":server 347 alice #xyz end"); - CHECK_SRV("--", "[#xyz] end"); + CHECK_SRV("--", "[#xyz] end", "irc_347,irc_numeric,log3"); RECV(":server 347 alice #xyz :End of Channel Invite List"); - CHECK_SRV("--", "[#xyz] End of Channel Invite List"); + CHECK_SRV("--", "[#xyz] End of Channel Invite List", + "irc_347,irc_numeric,log3"); } /* @@ -3482,25 +3843,35 @@ TEST(IrcProtocolWithServer, 348) CHECK_ERROR_PARAMS("348", 2, 3); RECV(":server 348 alice #test nick1!user1@host1"); - CHECK_CHAN("--", "[#test] [1] exception nick1!user1@host1"); + CHECK_CHAN("--", "[#test] [1] exception nick1!user1@host1", + "irc_348,irc_numeric,log3"); RECV(":server 348 alice #test nick1!user1@host1 nick2!user2@host2"); - CHECK_CHAN("--", "[#test] [2] exception nick1!user1@host1 " - "by nick2 (user2@host2)"); + CHECK_CHAN("--", + "[#test] [2] exception nick1!user1@host1 " + "by nick2 (user2@host2)", + "irc_348,irc_numeric,log3"); RECV(":server 348 alice #test nick1!user1@host1 nick2!user2@host2 " "1205585109"); - CHECK_CHAN("--", "[#test] [3] exception nick1!user1@host1 " - "by nick2 (user2@host2) on Sat, 15 Mar 2008 12:45:09"); + CHECK_CHAN("--", + "[#test] [3] exception nick1!user1@host1 " + "by nick2 (user2@host2) on Sat, 15 Mar 2008 12:45:09", + "irc_348,irc_numeric,log3"); /* channel not found */ RECV(":server 348 alice #xyz nick1!user1@host1"); - CHECK_SRV("--", "[#xyz] exception nick1!user1@host1"); + CHECK_SRV("--", "[#xyz] exception nick1!user1@host1", + "irc_348,irc_numeric,log3"); RECV(":server 348 alice #xyz nick1!user1@host1 nick2!user2@host2"); - CHECK_SRV("--", "[#xyz] exception nick1!user1@host1 " - "by nick2 (user2@host2)"); + CHECK_SRV("--", + "[#xyz] exception nick1!user1@host1 " + "by nick2 (user2@host2)", + "irc_348,irc_numeric,log3"); RECV(":server 348 alice #xyz nick1!user1@host1 nick2!user2@host2 " "1205585109"); - CHECK_SRV("--", "[#xyz] exception nick1!user1@host1 " - "by nick2 (user2@host2) on Sat, 15 Mar 2008 12:45:09"); + CHECK_SRV("--", + "[#xyz] exception nick1!user1@host1 " + "by nick2 (user2@host2) on Sat, 15 Mar 2008 12:45:09", + "irc_348,irc_numeric,log3"); } /* @@ -3519,19 +3890,21 @@ TEST(IrcProtocolWithServer, 349) CHECK_ERROR_PARAMS("349", 1, 2); RECV(":server 349 alice #test"); - CHECK_CHAN("--", "[#test]"); + CHECK_CHAN("--", "[#test]", "irc_349,irc_numeric,log3"); RECV(":server 349 alice #test end"); - CHECK_CHAN("--", "[#test] end"); + CHECK_CHAN("--", "[#test] end", "irc_349,irc_numeric,log3"); RECV(":server 349 alice #test :End of Channel Exception List"); - CHECK_CHAN("--", "[#test] End of Channel Exception List"); + CHECK_CHAN("--", "[#test] End of Channel Exception List", + "irc_349,irc_numeric,log3"); /* channel not found */ RECV(":server 349 alice #xyz"); - CHECK_SRV("--", "[#xyz]"); + CHECK_SRV("--", "[#xyz]", "irc_349,irc_numeric,log3"); RECV(":server 349 alice #xyz end"); - CHECK_SRV("--", "[#xyz] end"); + CHECK_SRV("--", "[#xyz] end", "irc_349,irc_numeric,log3"); RECV(":server 349 alice #xyz :End of Channel Exception List"); - CHECK_SRV("--", "[#xyz] End of Channel Exception List"); + CHECK_SRV("--", "[#xyz] End of Channel Exception List", + "irc_349,irc_numeric,log3"); } @@ -3552,23 +3925,28 @@ TEST(IrcProtocolWithServer, 350) /* non-standard parameters (using whois_nick_msg callback) */ RECV(":server 350 alice bob :something here"); - CHECK_SRV("--", "[bob] something here"); + CHECK_SRV("--", "[bob] something here", "irc_350,irc_numeric,log3"); RECV(":server 350 alice bob * :something here"); - CHECK_SRV("--", "[bob] * something here"); + CHECK_SRV("--", "[bob] * something here", "irc_350,irc_numeric,log3"); /* non-standard parameters (using default whois callback) */ RECV(":server 350 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_350,irc_numeric,log3"); /* standard parameters */ RECV(":server 350 alice bob * * :is connected via the WebIRC gateway"); - CHECK_SRV("--", "[bob] is connected via the WebIRC gateway"); + CHECK_SRV("--", "[bob] is connected via the WebIRC gateway", + "irc_350,irc_numeric,log3"); RECV(":server 350 alice bob example.com * :is connected via the WebIRC gateway"); - CHECK_SRV("--", "[bob] (example.com) is connected via the WebIRC gateway"); + CHECK_SRV("--", "[bob] (example.com) is connected via the WebIRC gateway", + "irc_350,irc_numeric,log3"); RECV(":server 350 alice bob * 1.2.3.4 :is connected via the WebIRC gateway"); - CHECK_SRV("--", "[bob] (1.2.3.4) is connected via the WebIRC gateway"); + CHECK_SRV("--", "[bob] (1.2.3.4) is connected via the WebIRC gateway", + "irc_350,irc_numeric,log3"); RECV(":server 350 alice bob example.com 1.2.3.4 :is connected via the WebIRC gateway"); - CHECK_SRV("--", "[bob] (example.com, 1.2.3.4) is connected via the WebIRC gateway"); + CHECK_SRV("--", + "[bob] (example.com, 1.2.3.4) is connected via the WebIRC gateway", + "irc_350,irc_numeric,log3"); } /* @@ -3589,9 +3967,10 @@ TEST(IrcProtocolWithServer, 351) CHECK_ERROR_PARAMS("351", 2, 3); RECV(":server 351 alice dancer-ircd-1.0 server"); - CHECK_SRV("--", "dancer-ircd-1.0 server"); + CHECK_SRV("--", "dancer-ircd-1.0 server", "irc_351,irc_numeric,log3"); RECV(":server 351 alice dancer-ircd-1.0 server :iMZ dncrTS/v4"); - CHECK_SRV("--", "dancer-ircd-1.0 server (iMZ dncrTS/v4)"); + CHECK_SRV("--", "dancer-ircd-1.0 server (iMZ dncrTS/v4)", + "irc_351,irc_numeric,log3"); } /* @@ -3632,49 +4011,57 @@ TEST(IrcProtocolWithServer, 352) POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 352 alice #test user2 host2 server bob"); - CHECK_SRV("--", "[#test] bob (user2@host2) ()"); + CHECK_SRV("--", "[#test] bob (user2@host2) ()", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user2@host2", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 352 alice #test user3 host3 server bob *"); - CHECK_SRV("--", "[#test] bob (user3@host3) * ()"); + CHECK_SRV("--", "[#test] bob (user3@host3) * ()", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user3@host3", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 352 alice #test user4 host4 server bob * :0 real name 1"); - CHECK_SRV("--", "[#test] bob (user4@host4) * 0 (real name 1)"); + CHECK_SRV("--", "[#test] bob (user4@host4) * 0 (real name 1)", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user4@host4", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("real name 1", ptr_nick2->realname); RECV(":server 352 alice #test user5 host5 server bob H@ :0 real name 2"); - CHECK_SRV("--", "[#test] bob (user5@host5) H@ 0 (real name 2)"); + CHECK_SRV("--", "[#test] bob (user5@host5) H@ 0 (real name 2)", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user5@host5", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("real name 2", ptr_nick2->realname); RECV(":server 352 alice #test user6 host6 server bob G@ :0 real name 3"); - CHECK_SRV("--", "[#test] bob (user6@host6) G@ 0 (real name 3)"); + CHECK_SRV("--", "[#test] bob (user6@host6) G@ 0 (real name 3)", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user6@host6", ptr_nick2->host); LONGS_EQUAL(1, ptr_nick2->away); STRCMP_EQUAL("real name 3", ptr_nick2->realname); RECV(":server 352 alice #test user7 host7 server bob * :0 real name 4"); - CHECK_SRV("--", "[#test] bob (user7@host7) * 0 (real name 4)"); + CHECK_SRV("--", "[#test] bob (user7@host7) * 0 (real name 4)", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user7@host7", ptr_nick2->host); LONGS_EQUAL(1, ptr_nick2->away); STRCMP_EQUAL("real name 4", ptr_nick2->realname); RECV(":server 352 alice #test user8 host8 server bob H@ :0 real name 5"); - CHECK_SRV("--", "[#test] bob (user8@host8) H@ 0 (real name 5)"); + CHECK_SRV("--", "[#test] bob (user8@host8) H@ 0 (real name 5)", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user8@host8", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("real name 5", ptr_nick2->realname); RECV(":server 352 alice #test user8 host8 server bob H@ :0"); - CHECK_SRV("--", "[#test] bob (user8@host8) H@ 0 ()"); + CHECK_SRV("--", "[#test] bob (user8@host8) H@ 0 ()", + "irc_352,irc_numeric,log3"); STRCMP_EQUAL("user8@host8", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("real name 5", ptr_nick2->realname); @@ -3692,15 +4079,20 @@ TEST(IrcProtocolWithServer, 352) RECV(":server 352 alice #xyz user host server"); CHECK_NO_MSG; RECV(":server 352 alice #xyz user host server bob"); - CHECK_SRV("--", "[#xyz] bob (user@host) ()"); + CHECK_SRV("--", "[#xyz] bob (user@host) ()", + "irc_352,irc_numeric,log3"); RECV(":server 352 alice #xyz user host server bob *"); - CHECK_SRV("--", "[#xyz] bob (user@host) * ()"); + CHECK_SRV("--", "[#xyz] bob (user@host) * ()", + "irc_352,irc_numeric,log3"); RECV(":server 352 alice #xyz user host server bob * :0 nick"); - CHECK_SRV("--", "[#xyz] bob (user@host) * 0 (nick)"); + CHECK_SRV("--", "[#xyz] bob (user@host) * 0 (nick)", + "irc_352,irc_numeric,log3"); RECV(":server 352 alice #xyz user host server bob H@ :0 nick"); - CHECK_SRV("--", "[#xyz] bob (user@host) H@ 0 (nick)"); + CHECK_SRV("--", "[#xyz] bob (user@host) H@ 0 (nick)", + "irc_352,irc_numeric,log3"); RECV(":server 352 alice #xyz user host server bob G@ :0 nick"); - CHECK_SRV("--", "[#xyz] bob (user@host) G@ 0 (nick)"); + CHECK_SRV("--", "[#xyz] bob (user@host) G@ 0 (nick)", + "irc_352,irc_numeric,log3"); } /* @@ -3790,15 +4182,17 @@ TEST(IrcProtocolWithServer, 353) /* channel not found */ RECV(":server 353 alice #xyz :alice"); - CHECK_SRV("--", "Nicks #xyz: [alice]"); + CHECK_SRV("--", "Nicks #xyz: [alice]", "irc_353,irc_numeric,log3"); RECV(":server 353 alice #xyz :alice bob @carol +dan!user@host"); - CHECK_SRV("--", "Nicks #xyz: [alice bob @carol +dan]"); + CHECK_SRV("--", "Nicks #xyz: [alice bob @carol +dan]", + "irc_353,irc_numeric,log3"); /* channel not found */ RECV(":server 353 alice = #xyz :alice"); - CHECK_SRV("--", "Nicks #xyz: [alice]"); + CHECK_SRV("--", "Nicks #xyz: [alice]", "irc_353,irc_numeric,log3"); RECV(":server 353 alice = #xyz :alice bob @carol +dan!user@host"); - CHECK_SRV("--", "Nicks #xyz: [alice bob @carol +dan]"); + CHECK_SRV("--", "Nicks #xyz: [alice bob @carol +dan]", + "irc_353,irc_numeric,log3"); } /* @@ -3834,63 +4228,69 @@ TEST(IrcProtocolWithServer, 354) POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test"); - CHECK_SRV("--", "[#test]"); + CHECK_SRV("--", "[#test]", "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2"); - CHECK_SRV("--", "[#test] user2"); + CHECK_SRV("--", "[#test] user2", "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 :trailing parameter"); - CHECK_SRV("--", "[#test] user2 trailing parameter"); + CHECK_SRV("--", "[#test] user2 trailing parameter", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 host2"); - CHECK_SRV("--", "[#test] user2 host2"); + CHECK_SRV("--", "[#test] user2 host2", "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 host2 server"); - CHECK_SRV("--", "[#test] user2 host2 server"); + CHECK_SRV("--", "[#test] user2 host2 server", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 host2 server bob"); - CHECK_SRV("--", "[#test] user2 host2 server bob"); + CHECK_SRV("--", "[#test] user2 host2 server bob", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 host2 server bob *"); - CHECK_SRV("--", "[#test] user2 host2 server bob *"); + CHECK_SRV("--", "[#test] user2 host2 server bob *", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 host2 server bob H@ 0"); - CHECK_SRV("--", "[#test] user2 host2 server bob H@ 0"); + CHECK_SRV("--", "[#test] user2 host2 server bob H@ 0", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user_b@host_b", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); POINTERS_EQUAL(NULL, ptr_nick2->account); POINTERS_EQUAL(NULL, ptr_nick2->realname); RECV(":server 354 alice #test user2 host2 server bob * 0 account2"); - CHECK_SRV("--", "[#test] bob [account2] (user2@host2) * 0 ()"); + CHECK_SRV("--", "[#test] bob [account2] (user2@host2) * 0 ()", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user2@host2", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("account2", ptr_nick2->account); @@ -3898,7 +4298,8 @@ TEST(IrcProtocolWithServer, 354) RECV(":server 354 alice #test user3 host3 server bob * 0 account3 " ":real name 2"); - CHECK_SRV("--", "[#test] bob [account3] (user3@host3) * 0 (real name 2)"); + CHECK_SRV("--", "[#test] bob [account3] (user3@host3) * 0 (real name 2)", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user3@host3", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("account3", ptr_nick2->account); @@ -3906,7 +4307,9 @@ TEST(IrcProtocolWithServer, 354) RECV(":server 354 alice #test user4 host4 server bob H@ 0 account4 " ":real name 3"); - CHECK_SRV("--", "[#test] bob [account4] (user4@host4) H@ 0 (real name 3)"); + CHECK_SRV("--", + "[#test] bob [account4] (user4@host4) H@ 0 (real name 3)", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user4@host4", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("account4", ptr_nick2->account); @@ -3914,7 +4317,9 @@ TEST(IrcProtocolWithServer, 354) RECV(":server 354 alice #test user5 host5 server bob G@ 0 account5 " ":real name 4"); - CHECK_SRV("--", "[#test] bob [account5] (user5@host5) G@ 0 (real name 4)"); + CHECK_SRV("--", + "[#test] bob [account5] (user5@host5) G@ 0 (real name 4)", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user5@host5", ptr_nick2->host); LONGS_EQUAL(1, ptr_nick2->away); STRCMP_EQUAL("account5", ptr_nick2->account); @@ -3922,7 +4327,9 @@ TEST(IrcProtocolWithServer, 354) RECV(":server 354 alice #test user6 host6 server bob * 0 account6 " ":real name 5"); - CHECK_SRV("--", "[#test] bob [account6] (user6@host6) * 0 (real name 5)"); + CHECK_SRV("--", + "[#test] bob [account6] (user6@host6) * 0 (real name 5)", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user6@host6", ptr_nick2->host); LONGS_EQUAL(1, ptr_nick2->away); STRCMP_EQUAL("account6", ptr_nick2->account); @@ -3930,7 +4337,9 @@ TEST(IrcProtocolWithServer, 354) RECV(":server 354 alice #test user7 host7 server bob H@ 0 account7 " ":real name 6"); - CHECK_SRV("--", "[#test] bob [account7] (user7@host7) H@ 0 (real name 6)"); + CHECK_SRV("--", + "[#test] bob [account7] (user7@host7) H@ 0 (real name 6)", + "irc_354,irc_numeric,log3"); STRCMP_EQUAL("user7@host7", ptr_nick2->host); LONGS_EQUAL(0, ptr_nick2->away); STRCMP_EQUAL("account7", ptr_nick2->account); @@ -3944,24 +4353,30 @@ TEST(IrcProtocolWithServer, 354) /* channel not found */ RECV(":server 354 alice #xyz"); - CHECK_SRV("--", "[#xyz]"); + CHECK_SRV("--", "[#xyz]", "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2"); - CHECK_SRV("--", "[#xyz] user2"); + CHECK_SRV("--", "[#xyz] user2", "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2"); - CHECK_SRV("--", "[#xyz] user2 host2"); + CHECK_SRV("--", "[#xyz] user2 host2", "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2 server"); - CHECK_SRV("--", "[#xyz] user2 host2 server"); + CHECK_SRV("--", "[#xyz] user2 host2 server", + "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2 server bob"); - CHECK_SRV("--", "[#xyz] user2 host2 server bob"); + CHECK_SRV("--", "[#xyz] user2 host2 server bob", + "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2 server bob *"); - CHECK_SRV("--", "[#xyz] user2 host2 server bob *"); + CHECK_SRV("--", "[#xyz] user2 host2 server bob *", + "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2 server bob G@ 0"); - CHECK_SRV("--", "[#xyz] user2 host2 server bob G@ 0"); + CHECK_SRV("--", "[#xyz] user2 host2 server bob G@ 0", + "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2 server bob H@ 0 account"); - CHECK_SRV("--", "[#xyz] bob [account] (user2@host2) H@ 0 ()"); + CHECK_SRV("--", "[#xyz] bob [account] (user2@host2) H@ 0 ()", + "irc_354,irc_numeric,log3"); RECV(":server 354 alice #xyz user2 host2 server bob G@ 0 account " ":real name"); - CHECK_SRV("--", "[#xyz] bob [account] (user2@host2) G@ 0 (real name)"); + CHECK_SRV("--", "[#xyz] bob [account] (user2@host2) G@ 0 (real name)", + "irc_354,irc_numeric,log3"); } /* @@ -3982,49 +4397,61 @@ TEST(IrcProtocolWithServer, 366) CHECK_ERROR_PARAMS("366", 2, 3); RECV(":server 366 alice #test end"); - CHECK_CHAN("--", "Channel #test: 1 nick (0 ops, 0 voiced, 1 regular)"); + CHECK_CHAN("--", "Channel #test: 1 nick (0 ops, 0 voiced, 1 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 1 nick (0 ops, 0 voiced, 1 regular)"); + CHECK_CHAN("--", "Channel #test: 1 nick (0 ops, 0 voiced, 1 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :bob"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 2 nicks (0 ops, 0 voiced, 2 regular)"); + CHECK_CHAN("--", "Channel #test: 2 nicks (0 ops, 0 voiced, 2 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :@carol"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 3 nicks (1 op, 0 voiced, 2 regular)"); + CHECK_CHAN("--", "Channel #test: 3 nicks (1 op, 0 voiced, 2 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :+dan!user@host"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 4 nicks (1 op, 1 voiced, 2 regular)"); + CHECK_CHAN("--", "Channel #test: 4 nicks (1 op, 1 voiced, 2 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :@evans"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 5 nicks (2 ops, 1 voiced, 2 regular)"); + CHECK_CHAN("--", "Channel #test: 5 nicks (2 ops, 1 voiced, 2 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :+fred"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 6 nicks (2 ops, 2 voiced, 2 regular)"); + CHECK_CHAN("--", "Channel #test: 6 nicks (2 ops, 2 voiced, 2 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :greg"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 7 nicks (2 ops, 2 voiced, 3 regular)"); + CHECK_CHAN("--", "Channel #test: 7 nicks (2 ops, 2 voiced, 3 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 005 alice " IRC_MSG_005 " :are supported"); RECV(":server 353 alice = #test :%harry"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 8 nicks (2 ops, 1 halfop, 2 voiced, 3 regular)"); + CHECK_CHAN("--", + "Channel #test: 8 nicks (2 ops, 1 halfop, 2 voiced, 3 regular)", + "irc_366,irc_numeric,log3"); RECV(":server 353 alice = #test :%ian"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("--", "Channel #test: 9 nicks (2 ops, 2 halfops, 2 voiced, 3 regular)"); + CHECK_CHAN("--", + "Channel #test: 9 nicks (2 ops, 2 halfops, 2 voiced, 3 regular)", + "irc_366,irc_numeric,log3"); /* channel not found */ RECV(":server 366 alice #xyz end"); - CHECK_SRV("--", "#xyz: end"); + CHECK_SRV("--", "#xyz: end", "irc_366,irc_numeric,log3"); RECV(":server 366 alice #xyz :End of /NAMES list"); - CHECK_SRV("--", "#xyz: End of /NAMES list"); + CHECK_SRV("--", "#xyz: End of /NAMES list", "irc_366,irc_numeric,log3"); } /* @@ -4045,24 +4472,31 @@ TEST(IrcProtocolWithServer, 367) CHECK_ERROR_PARAMS("367", 2, 3); RECV(":server 367 alice #test nick1!user1@host1"); - CHECK_CHAN("--", "[#test] [1] nick1!user1@host1 banned"); + CHECK_CHAN("--", "[#test] [1] nick1!user1@host1 banned", + "irc_367,irc_numeric,log3"); RECV(":server 367 alice #test nick1!user1@host1 nick2!user2@host2"); - CHECK_CHAN("--", "[#test] [2] nick1!user1@host1 banned " - "by nick2 (user2@host2)"); + CHECK_CHAN("--", + "[#test] [2] nick1!user1@host1 banned by nick2 (user2@host2)", + "irc_367,irc_numeric,log3"); RECV(":server 367 alice #test nick1!user1@host1 nick2!user2@host2 " "1205585109"); - CHECK_CHAN("--", "[#test] [3] nick1!user1@host1 banned " - "by nick2 (user2@host2) on Sat, 15 Mar 2008 12:45:09"); + CHECK_CHAN("--", + "[#test] [3] nick1!user1@host1 banned " + "by nick2 (user2@host2) on Sat, 15 Mar 2008 12:45:09", + "irc_367,irc_numeric,log3"); /* channel not found */ RECV(":server 367 alice #xyz nick1!user1@host1"); - CHECK_SRV("--", "[#xyz] nick1!user1@host1 banned"); + CHECK_SRV("--", "[#xyz] nick1!user1@host1 banned", + "irc_367,irc_numeric,log3"); RECV(":server 367 alice #xyz nick1!user1@host1 nick2!user2@host2"); - CHECK_SRV("--", "[#xyz] nick1!user1@host1 banned by nick2 (user2@host2)"); + CHECK_SRV("--", "[#xyz] nick1!user1@host1 banned by nick2 (user2@host2)", + "irc_367,irc_numeric,log3"); RECV(":server 367 alice #xyz nick1!user1@host1 nick2!user2@host2 " "1205585109"); CHECK_SRV("--", "[#xyz] nick1!user1@host1 banned by nick2 (user2@host2) " - "on Sat, 15 Mar 2008 12:45:09"); + "on Sat, 15 Mar 2008 12:45:09", + "irc_367,irc_numeric,log3"); } /* @@ -4081,19 +4515,21 @@ TEST(IrcProtocolWithServer, 368) CHECK_ERROR_PARAMS("368", 1, 2); RECV(":server 368 alice #test"); - CHECK_CHAN("--", "[#test]"); + CHECK_CHAN("--", "[#test]", "irc_368,irc_numeric,log3"); RECV(":server 368 alice #test end"); - CHECK_CHAN("--", "[#test] end"); + CHECK_CHAN("--", "[#test] end", "irc_368,irc_numeric,log3"); RECV(":server 368 alice #test :End of Channel Ban List"); - CHECK_CHAN("--", "[#test] End of Channel Ban List"); + CHECK_CHAN("--", "[#test] End of Channel Ban List", + "irc_368,irc_numeric,log3"); /* channel not found */ RECV(":server 368 alice #xyz"); - CHECK_SRV("--", "[#xyz]"); + CHECK_SRV("--", "[#xyz]", "irc_368,irc_numeric,log3"); RECV(":server 368 alice #xyz end"); - CHECK_SRV("--", "[#xyz] end"); + CHECK_SRV("--", "[#xyz] end", "irc_368,irc_numeric,log3"); RECV(":server 368 alice #xyz :End of Channel Ban List"); - CHECK_SRV("--", "[#xyz] End of Channel Ban List"); + CHECK_SRV("--", "[#xyz] End of Channel Ban List", + "irc_368,irc_numeric,log3"); } /* @@ -4112,9 +4548,9 @@ TEST(IrcProtocolWithServer, 401) CHECK_ERROR_PARAMS("401", 1, 2); RECV(":server 401 alice bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_401,irc_numeric,log3"); RECV(":server 401 alice bob :No such nick/channel"); - CHECK_SRV("--", "bob: No such nick/channel"); + CHECK_SRV("--", "bob: No such nick/channel", "irc_401,irc_numeric,log3"); } /* @@ -4133,9 +4569,9 @@ TEST(IrcProtocolWithServer, 402) CHECK_ERROR_PARAMS("402", 1, 2); RECV(":server 402 alice server"); - CHECK_SRV("--", "server"); + CHECK_SRV("--", "server", "irc_402,irc_numeric,log3"); RECV(":server 402 alice server :No such server"); - CHECK_SRV("--", "server: No such server"); + CHECK_SRV("--", "server: No such server", "irc_402,irc_numeric,log3"); } /* @@ -4154,11 +4590,13 @@ TEST(IrcProtocolWithServer, 404) CHECK_ERROR_PARAMS("404", 1, 2); RECV(":server 404 alice #test"); - CHECK_SRV("--", "#test"); + CHECK_SRV("--", "#test", "irc_404,irc_numeric,log3"); RECV(":server 404 alice #test :Cannot send to channel"); - CHECK_CHAN("--", "#test: Cannot send to channel"); + CHECK_CHAN("--", "#test: Cannot send to channel", + "irc_404,irc_numeric,log3"); RECV(":server 404 alice #test2 :Cannot send to channel"); - CHECK_SRV("--", "#test2: Cannot send to channel"); + CHECK_SRV("--", "#test2: Cannot send to channel", + "irc_404,irc_numeric,log3"); } /* @@ -4177,11 +4615,13 @@ TEST(IrcProtocolWithServer, 415) CHECK_ERROR_PARAMS("415", 1, 2); RECV(":server 415 alice #test"); - CHECK_SRV("--", "#test"); + CHECK_SRV("--", "#test", "irc_415,irc_numeric,log3"); RECV(":server 415 alice #test :Cannot send message to channel (+R)"); - CHECK_CHAN("--", "#test: Cannot send message to channel (+R)"); + CHECK_CHAN("--", "#test: Cannot send message to channel (+R)", + "irc_415,irc_numeric,log3"); RECV(":server 415 alice #test2 :Cannot send message to channel (+R)"); - CHECK_SRV("--", "#test2: Cannot send message to channel (+R)"); + CHECK_SRV("--", "#test2: Cannot send message to channel (+R)", + "irc_415,irc_numeric,log3"); } /* @@ -4192,24 +4632,29 @@ TEST(IrcProtocolWithServer, 415) TEST(IrcProtocolWithServer, 432_not_connected) { RECV(":server 432 * alice error"); - CHECK_SRV("--", "* alice error"); - CHECK_SRV("=!=", "irc: nickname \"nick1\" is invalid, " - "trying nickname \"nick2\""); + CHECK_SRV("--", "* alice error", ""); + CHECK_SRV("=!=", + "irc: nickname \"nick1\" is invalid, trying nickname \"nick2\"", + ""); RECV(":server 432 * :alice error"); - CHECK_SRV("--", "* alice error"); - CHECK_SRV("=!=", "irc: nickname \"nick2\" is invalid, " - "trying nickname \"nick3\""); + CHECK_SRV("--", "* alice error", ""); + CHECK_SRV("=!=", + "irc: nickname \"nick2\" is invalid, trying nickname \"nick3\"", + ""); RECV(":server 432 * alice :Erroneous Nickname"); - CHECK_SRV("--", "* alice Erroneous Nickname"); - CHECK_SRV("=!=", "irc: nickname \"nick3\" is invalid, " - "trying nickname \"nick1_\""); + CHECK_SRV("--", "* alice Erroneous Nickname", ""); + CHECK_SRV("=!=", + "irc: nickname \"nick3\" is invalid, trying nickname \"nick1_\"", + ""); RECV(":server 432 * alice1 :Erroneous Nickname"); - CHECK_SRV("--", "* alice1 Erroneous Nickname"); - CHECK_SRV("=!=", "irc: nickname \"nick1_\" is invalid, " - "trying nickname \"nick1__\""); + CHECK_SRV("--", "* alice1 Erroneous Nickname", ""); + CHECK_SRV("=!=", + "irc: nickname \"nick1_\" is invalid, " + "trying nickname \"nick1__\"", + ""); } /* @@ -4228,18 +4673,18 @@ TEST(IrcProtocolWithServer, 432_connected) CHECK_ERROR_PARAMS("432", 1, 2); RECV(":server 432 alice test%+"); - CHECK_SRV("--", "test%+"); + CHECK_SRV("--", "test%+", "irc_432,irc_numeric,log3"); RECV(":server 432 alice test%+ error"); - CHECK_SRV("--", "test%+: error"); + CHECK_SRV("--", "test%+: error", "irc_432,irc_numeric,log3"); RECV(":server 432 alice test%+ :Erroneous Nickname"); - CHECK_SRV("--", "test%+: Erroneous Nickname"); + CHECK_SRV("--", "test%+: Erroneous Nickname", "irc_432,irc_numeric,log3"); /* * special case: erroneous nick is a channel: check that the message is * still displayed on the server buffer */ RECV(":server 432 alice #test :Erroneous Nickname"); - CHECK_SRV("--", "#test: Erroneous Nickname"); + CHECK_SRV("--", "#test: Erroneous Nickname", "irc_432,irc_numeric,log3"); } /* @@ -4250,16 +4695,22 @@ TEST(IrcProtocolWithServer, 432_connected) TEST(IrcProtocolWithServer, 433_not_connected) { RECV(":server 433 * alice error"); - CHECK_SRV("--", "irc: nickname \"nick1\" is already in use, " - "trying nickname \"nick2\""); + CHECK_SRV("--", + "irc: nickname \"nick1\" is already in use, " + "trying nickname \"nick2\"", + ""); RECV(":server 433 * alice :Nickname is already in use."); - CHECK_SRV("--", "irc: nickname \"nick2\" is already in use, " - "trying nickname \"nick3\""); + CHECK_SRV("--", + "irc: nickname \"nick2\" is already in use, " + "trying nickname \"nick3\"", + ""); RECV(":server 433 * alice1 :Nickname is already in use."); - CHECK_SRV("--", "irc: nickname \"nick3\" is already in use, " - "trying nickname \"nick1_\""); + CHECK_SRV("--", + "irc: nickname \"nick3\" is already in use, " + "trying nickname \"nick1_\"", + ""); } /* @@ -4278,11 +4729,12 @@ TEST(IrcProtocolWithServer, 433_connected) CHECK_ERROR_PARAMS("433", 1, 2); RECV(":server 433 alice test"); - CHECK_SRV("--", "test"); + CHECK_SRV("--", "test", "irc_433,irc_numeric,log3"); RECV(":server 433 alice test error"); - CHECK_SRV("--", "test: error"); + CHECK_SRV("--", "test: error", "irc_433,irc_numeric,log3"); RECV(":server 433 alice test :Nickname is already in use."); - CHECK_SRV("--", "test: Nickname is already in use."); + CHECK_SRV("--", "test: Nickname is already in use.", + "irc_433,irc_numeric,log3"); /* * special case: nickname already used looks like a channel (it should @@ -4290,7 +4742,8 @@ TEST(IrcProtocolWithServer, 433_connected) * on the server buffer */ RECV(":server 433 alice #test :Nickname is already in use."); - CHECK_SRV("--", "#test: Nickname is already in use."); + CHECK_SRV("--", "#test: Nickname is already in use.", + "irc_433,irc_numeric,log3"); } /* @@ -4301,11 +4754,13 @@ TEST(IrcProtocolWithServer, 433_connected) TEST(IrcProtocolWithServer, 437_not_connected) { RECV(":server 437 * alice error"); - CHECK_SRV("--", "* alice error"); + CHECK_SRV("--", "* alice error", "irc_437,irc_numeric,log3"); RECV(":server 437 * alice :Nick/channel is temporarily unavailable"); - CHECK_SRV("--", "* alice Nick/channel is temporarily unavailable"); + CHECK_SRV("--", "* alice Nick/channel is temporarily unavailable", + "irc_437,irc_numeric,log3"); RECV(":server 437 * alice1 :Nick/channel is temporarily unavailable"); - CHECK_SRV("--", "* alice1 Nick/channel is temporarily unavailable"); + CHECK_SRV("--", "* alice1 Nick/channel is temporarily unavailable", + "irc_437,irc_numeric,log3"); } /* @@ -4324,13 +4779,15 @@ TEST(IrcProtocolWithServer, 437_connected) CHECK_ERROR_PARAMS("437", 1, 2); RECV(":server 437 * alice"); - CHECK_SRV("--", "* alice"); + CHECK_SRV("--", "* alice", "irc_437,irc_numeric,log3"); RECV(":server 437 * alice error"); - CHECK_SRV("--", "* alice error"); + CHECK_SRV("--", "* alice error", "irc_437,irc_numeric,log3"); RECV(":server 437 * alice :Nick/channel is temporarily unavailable"); - CHECK_SRV("--", "* alice Nick/channel is temporarily unavailable"); + CHECK_SRV("--", "* alice Nick/channel is temporarily unavailable", + "irc_437,irc_numeric,log3"); RECV(":server 437 alice #test :Cannot change nickname while banned on channel"); - CHECK_SRV("--", "#test: Cannot change nickname while banned on channel"); + CHECK_SRV("--", "#test: Cannot change nickname while banned on channel", + "irc_437,irc_numeric,log3"); } /* @@ -4349,13 +4806,14 @@ TEST(IrcProtocolWithServer, 438) CHECK_ERROR_PARAMS("438", 1, 2); RECV(":server 438 alice alice2"); - CHECK_SRV("--", "alice alice2"); + CHECK_SRV("--", "alice alice2", "irc_438,irc_numeric,log3"); RECV(":server 438 alice alice2 error"); - CHECK_SRV("--", "error (alice => alice2)"); + CHECK_SRV("--", "error (alice => alice2)", "irc_438,irc_numeric,log3"); RECV(":server 438 alice alice2 :Nick change too fast. " "Please wait 30 seconds."); - CHECK_SRV("--", "Nick change too fast. Please wait 30 seconds. " - "(alice => alice2)"); + CHECK_SRV("--", + "Nick change too fast. Please wait 30 seconds. (alice => alice2)", + "irc_438,irc_numeric,log3"); } /* @@ -4374,13 +4832,14 @@ TEST(IrcProtocolWithServer, 470) CHECK_ERROR_PARAMS("470", 1, 2); RECV(":server 470 alice #test"); - CHECK_SRV("--", "#test"); + CHECK_SRV("--", "#test", "irc_470,irc_numeric,log3"); RECV(":server 470 alice #test #test2"); - CHECK_SRV("--", "#test: #test2"); + CHECK_SRV("--", "#test: #test2", "irc_470,irc_numeric,log3"); RECV(":server 470 alice #test #test2 forwarding"); - CHECK_SRV("--", "#test: #test2 forwarding"); + CHECK_SRV("--", "#test: #test2 forwarding", "irc_470,irc_numeric,log3"); RECV(":server 470 alice #test #test2 :Forwarding to another channel"); - CHECK_SRV("--", "#test: #test2 Forwarding to another channel"); + CHECK_SRV("--", "#test: #test2 Forwarding to another channel", + "irc_470,irc_numeric,log3"); } /* @@ -4399,9 +4858,10 @@ TEST(IrcProtocolWithServer, 524) CHECK_ERROR_PARAMS("524", 1, 2); RECV(":server 524 alice UNKNOWN"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_524,irc_numeric,notify_private,nick_server,log3"); RECV(":server 524 alice UNKNOWN :Help not found"); - CHECK_SRV("--", "Help not found"); + CHECK_SRV("--", "Help not found", + "irc_524,irc_numeric,notify_private,nick_server,log3"); } /* @@ -4420,10 +4880,11 @@ TEST(IrcProtocolWithServer, 704) CHECK_ERROR_PARAMS("704", 1, 2); RECV(":server 704 alice MODE"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_704,irc_numeric,notify_private,nick_server,log3"); RECV(":server 704 alice MODE " ":MODE <target> [<modestring> [<mode arguments>...]]"); - CHECK_SRV("--", "MODE <target> [<modestring> [<mode arguments>...]]"); + CHECK_SRV("--", "MODE <target> [<modestring> [<mode arguments>...]]", + "irc_704,irc_numeric,notify_private,nick_server,log3"); } /* @@ -4442,9 +4903,10 @@ TEST(IrcProtocolWithServer, 705) CHECK_ERROR_PARAMS("705", 1, 2); RECV(":server 705 alice MODE"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_705,irc_numeric,notify_private,nick_server,log3"); RECV(":server 705 alice MODE :Sets and removes modes from the given target."); - CHECK_SRV("--", "Sets and removes modes from the given target."); + CHECK_SRV("--", "Sets and removes modes from the given target.", + "irc_705,irc_numeric,notify_private,nick_server,log3"); } /* @@ -4463,9 +4925,11 @@ TEST(IrcProtocolWithServer, 706) CHECK_ERROR_PARAMS("706", 1, 2); RECV(":server 706 alice MODE"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", + "irc_706,irc_numeric,notify_private,nick_server,log3"); RECV(":server 706 alice MODE :End of /HELPOP"); - CHECK_SRV("--", "End of /HELPOP"); + CHECK_SRV("--", "End of /HELPOP", + "irc_706,irc_numeric,notify_private,nick_server,log3"); } /* @@ -4486,9 +4950,11 @@ TEST(IrcProtocolWithServer, 710) CHECK_ERROR_PARAMS("710", 2, 3); RECV(":server 710 #test #test nick1!user1@host1"); - CHECK_CHAN("--", "nick1 (user1@host1) has asked for an invite"); + CHECK_CHAN("--", "nick1 (user1@host1) has asked for an invite", + "irc_710,irc_numeric,notify_message,log3"); RECV(":server 710 #test #test nick1!user1@host1 :has asked for an invite."); - CHECK_CHAN("--", "nick1 (user1@host1) has asked for an invite."); + CHECK_CHAN("--", "nick1 (user1@host1) has asked for an invite.", + "irc_710,irc_numeric,notify_message,log3"); /* channel not found */ RECV(":server 710 #xyz #xyz nick1!user1@host1"); @@ -4515,7 +4981,8 @@ TEST(IrcProtocolWithServer, 711) CHECK_ERROR_PARAMS("711", 2, 3); RECV(":server 711 alice #test :Your KNOCK has been delivered."); - CHECK_SRV("--", "#test: Your KNOCK has been delivered."); + CHECK_SRV("--", "#test: Your KNOCK has been delivered.", + "irc_711,irc_numeric,log3"); } /* @@ -4536,7 +5003,8 @@ TEST(IrcProtocolWithServer, 712) CHECK_ERROR_PARAMS("712", 2, 3); RECV(":server 712 alice #test :Too many KNOCKs (channel)."); - CHECK_SRV("--", "#test: Too many KNOCKs (channel)."); + CHECK_SRV("--", "#test: Too many KNOCKs (channel).", + "irc_712,irc_numeric,log3"); } /* @@ -4557,7 +5025,7 @@ TEST(IrcProtocolWithServer, 713) CHECK_ERROR_PARAMS("713", 2, 3); RECV(":server 713 alice #test :Channel is open."); - CHECK_SRV("--", "#test: Channel is open."); + CHECK_SRV("--", "#test: Channel is open.", "irc_713,irc_numeric,log3"); } /* @@ -4578,7 +5046,8 @@ TEST(IrcProtocolWithServer, 714) CHECK_ERROR_PARAMS("714", 2, 3); RECV(":server 714 alice #test :You are already on that channel."); - CHECK_SRV("--", "#test: You are already on that channel."); + CHECK_SRV("--", "#test: You are already on that channel.", + "irc_714,irc_numeric,log3"); } /* @@ -4601,23 +5070,30 @@ TEST(IrcProtocolWithServer, 728) CHECK_ERROR_PARAMS("728", 3, 4); RECV(":server 728 alice #test q nick1!user1@host1"); - CHECK_CHAN("--", "[#test] nick1!user1@host1 quieted"); + CHECK_CHAN("--", "[#test] nick1!user1@host1 quieted", + "irc_728,irc_numeric,log3"); RECV(":server 728 alice #test q nick1!user1@host1 alice!user@host"); - CHECK_CHAN("--", "[#test] nick1!user1@host1 quieted by alice (user@host)"); + CHECK_CHAN("--", "[#test] nick1!user1@host1 quieted by alice (user@host)", + "irc_728,irc_numeric,log3"); RECV(":server 728 alice #test q nick1!user1@host1 alice!user@host " "1351350090"); - CHECK_CHAN("--", "[#test] nick1!user1@host1 quieted by alice (user@host) " - "on Sat, 27 Oct 2012 15:01:30"); + CHECK_CHAN("--", + "[#test] nick1!user1@host1 quieted by alice (user@host) " + "on Sat, 27 Oct 2012 15:01:30", + "irc_728,irc_numeric,log3"); /* channel not found */ RECV(":server 728 alice #xyz q nick1!user1@host1"); - CHECK_SRV("--", "[#xyz] nick1!user1@host1 quieted"); + CHECK_SRV("--", "[#xyz] nick1!user1@host1 quieted", + "irc_728,irc_numeric,log3"); RECV(":server 728 alice #xyz q nick1!user1@host1 alice!user@host"); - CHECK_SRV("--", "[#xyz] nick1!user1@host1 quieted by alice (user@host)"); + CHECK_SRV("--", "[#xyz] nick1!user1@host1 quieted by alice (user@host)", + "irc_728,irc_numeric,log3"); RECV(":server 728 alice #xyz q nick1!user1@host1 alice!user@host " "1351350090"); CHECK_SRV("--", "[#xyz] nick1!user1@host1 quieted by alice (user@host) " - "on Sat, 27 Oct 2012 15:01:30"); + "on Sat, 27 Oct 2012 15:01:30", + "irc_728,irc_numeric,log3"); } /* @@ -4638,19 +5114,21 @@ TEST(IrcProtocolWithServer, 729) CHECK_ERROR_PARAMS("729", 2, 3); RECV(":server 729 alice #test q"); - CHECK_CHAN("--", "[#test]"); + CHECK_CHAN("--", "[#test]", "irc_729,irc_numeric,log3"); RECV(":server 729 alice #test q end"); - CHECK_CHAN("--", "[#test] end"); + CHECK_CHAN("--", "[#test] end", "irc_729,irc_numeric,log3"); RECV(":server 729 alice #test q :End of Channel Quiet List"); - CHECK_CHAN("--", "[#test] End of Channel Quiet List"); + CHECK_CHAN("--", "[#test] End of Channel Quiet List", + "irc_729,irc_numeric,log3"); /* channel not found */ RECV(":server 729 alice #xyz q"); - CHECK_SRV("--", "[#xyz]"); + CHECK_SRV("--", "[#xyz]", "irc_729,irc_numeric,log3"); RECV(":server 729 alice #xyz q end"); - CHECK_SRV("--", "[#xyz] end"); + CHECK_SRV("--", "[#xyz] end", "irc_729,irc_numeric,log3"); RECV(":server 729 alice #xyz q :End of Channel Quiet List"); - CHECK_SRV("--", "[#xyz] End of Channel Quiet List"); + CHECK_SRV("--", "[#xyz] End of Channel Quiet List", + "irc_729,irc_numeric,log3"); } /* @@ -4682,15 +5160,19 @@ TEST(IrcProtocolWithServer, 730) /* with notify on nick1 */ run_cmd_quiet ("/notify add nick1 " IRC_FAKE_SERVER); RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_SRV("--", "notify: nick1 (user1@host1) is connected"); + CHECK_SRV("--", "notify: nick1 (user1@host1) is connected", + "irc_notify,irc_notify_join,nick_nick1,notify_message"); RECV(":server 731 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_SRV("--", "notify: nick1 (user1@host1) has quit"); + CHECK_SRV("--", "notify: nick1 (user1@host1) has quit", + "irc_notify,irc_notify_quit,nick_nick1,notify_message"); /* with notify on nick1 and nick2 */ run_cmd_quiet ("/notify add nick2 " IRC_FAKE_SERVER); RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_SRV("--", "notify: nick1 (user1@host1) has connected"); - CHECK_SRV("--", "notify: nick2 (user2@host2) is connected"); + CHECK_SRV("--", "notify: nick1 (user1@host1) has connected", + "irc_notify,irc_notify_join,nick_nick1,notify_message"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message"); run_cmd_quiet ("/mute /notify del nick1 " IRC_FAKE_SERVER); run_cmd_quiet ("/mute /notify del nick2 " IRC_FAKE_SERVER); @@ -4710,9 +5192,10 @@ TEST(IrcProtocolWithServer, 732) CHECK_ERROR_PARAMS("732", 0, 1); RECV(":server 732 alice"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_732,irc_numeric,log3"); RECV(":server 732 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_SRV("--", "nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "nick1!user1@host1,nick2!user2@host2", + "irc_732,irc_numeric,log3"); } /* @@ -4729,11 +5212,11 @@ TEST(IrcProtocolWithServer, 733) CHECK_ERROR_PARAMS("733", 0, 1); RECV(":server 733 alice"); - CHECK_SRV("--", ""); + CHECK_SRV("--", "", "irc_733,irc_numeric,log3"); RECV(":server 733 alice end"); - CHECK_SRV("--", "end"); + CHECK_SRV("--", "end", "irc_733,irc_numeric,log3"); RECV(":server 733 alice :End of MONITOR list"); - CHECK_SRV("--", "End of MONITOR list"); + CHECK_SRV("--", "End of MONITOR list", "irc_733,irc_numeric,log3"); } /* @@ -4754,11 +5237,11 @@ TEST(IrcProtocolWithServer, 734) CHECK_ERROR_PARAMS("734", 2, 3); RECV(":server 734 alice 10 nick1,nick2"); - CHECK_SRV("=!=", " (10)"); + CHECK_SRV("=!=", " (10)", "irc_734,irc_numeric,log3"); RECV(":server 734 alice 10 nick1,nick2 full"); - CHECK_SRV("=!=", "full (10)"); + CHECK_SRV("=!=", "full (10)", "irc_734,irc_numeric,log3"); RECV(":server 734 alice 10 nick1,nick2 :Monitor list is full"); - CHECK_SRV("=!=", "Monitor list is full (10)"); + CHECK_SRV("=!=", "Monitor list is full (10)", "irc_734,irc_numeric,log3"); } /* @@ -4777,15 +5260,19 @@ TEST(IrcProtocolWithServer, 742) CHECK_ERROR_PARAMS("742", 1, 2); RECV(":server 742 alice #test"); - CHECK_SRV("--", "#test"); + CHECK_SRV("--", "#test", "irc_742,irc_numeric,log3"); RECV(":server 742 alice #test n nstlk :MODE cannot be set due to channel " "having an active MLOCK restriction policy"); - CHECK_CHAN("--", "#test: n nstlk MODE cannot be set due to channel having " - "an active MLOCK restriction policy"); + CHECK_CHAN("--", + "#test: n nstlk MODE cannot be set due to channel having " + "an active MLOCK restriction policy", + "irc_742,irc_numeric,log3"); RECV(":server 742 alice #test2 n nstlk :MODE cannot be set due to channel " "having an active MLOCK restriction policy"); - CHECK_SRV("--", "#test2: n nstlk MODE cannot be set due to channel having " - "an active MLOCK restriction policy"); + CHECK_SRV("--", + "#test2: n nstlk MODE cannot be set due to channel having " + "an active MLOCK restriction policy", + "irc_742,irc_numeric,log3"); } /* @@ -4808,12 +5295,14 @@ TEST(IrcProtocolWithServer, 900) CHECK_ERROR_PARAMS("900", 3, 4); RECV(":server 900 alice alice!user@host alice logged"); - CHECK_SRV("--", "logged (alice!user@host)"); + CHECK_SRV("--", "logged (alice!user@host)", "irc_900,irc_numeric,log3"); RECV(":server 900 alice alice!user@host alice " ":You are now logged in as mynick"); - CHECK_SRV("--", "You are now logged in as mynick (alice!user@host)"); + CHECK_SRV("--", "You are now logged in as mynick (alice!user@host)", + "irc_900,irc_numeric,log3"); RECV(":server 900 * * alice :You are now logged in as mynick"); - CHECK_SRV("--", "You are now logged in as mynick"); + CHECK_SRV("--", "You are now logged in as mynick", + "irc_900,irc_numeric,log3"); } /* @@ -4834,9 +5323,9 @@ TEST(IrcProtocolWithServer, 901) CHECK_ERROR_PARAMS("901", 2, 3); RECV(":server 901 alice nick!user@host logged"); - CHECK_SRV("--", "logged"); + CHECK_SRV("--", "logged", "irc_901,irc_numeric,log3"); RECV(":server 901 alice nick!user@host :You are now logged out"); - CHECK_SRV("--", "You are now logged out"); + CHECK_SRV("--", "You are now logged out", "irc_901,irc_numeric,log3"); } /* @@ -4858,17 +5347,20 @@ TEST(IrcProtocolWithServer, 903_907) CHECK_ERROR_PARAMS("907", 0, 1); RECV(":server 903 alice ok"); - CHECK_SRV("--", "ok"); + CHECK_SRV("--", "ok", "irc_903,irc_numeric,log3"); RECV(":server 903 alice :SASL authentication successful"); - CHECK_SRV("--", "SASL authentication successful"); + CHECK_SRV("--", "SASL authentication successful", + "irc_903,irc_numeric,log3"); RECV(":server 903 * :SASL authentication successful"); - CHECK_SRV("--", "SASL authentication successful"); + CHECK_SRV("--", "SASL authentication successful", + "irc_903,irc_numeric,log3"); RECV(":server 907 alice ok"); - CHECK_SRV("--", "ok"); + CHECK_SRV("--", "ok", "irc_907,irc_numeric,log3"); RECV(":server 907 alice :SASL authentication successful"); - CHECK_SRV("--", "SASL authentication successful"); + CHECK_SRV("--", "SASL authentication successful", + "irc_907,irc_numeric,log3"); } /* @@ -4900,24 +5392,24 @@ TEST(IrcProtocolWithServer, 902_904_905_906) CHECK_ERROR_PARAMS("906", 0, 1); RECV(":server 902 alice error"); - CHECK_SRV("--", "error"); + CHECK_SRV("--", "error", "irc_902,irc_numeric,log3"); RECV(":server 902 alice :SASL authentication failed"); - CHECK_SRV("--", "SASL authentication failed"); + CHECK_SRV("--", "SASL authentication failed", "irc_902,irc_numeric,log3"); RECV(":server 904 alice error"); - CHECK_SRV("--", "error"); + CHECK_SRV("--", "error", "irc_904,irc_numeric,log3"); RECV(":server 904 alice :SASL authentication failed"); - CHECK_SRV("--", "SASL authentication failed"); + CHECK_SRV("--", "SASL authentication failed", "irc_904,irc_numeric,log3"); RECV(":server 905 alice error"); - CHECK_SRV("--", "error"); + CHECK_SRV("--", "error", "irc_905,irc_numeric,log3"); RECV(":server 905 alice :SASL authentication failed"); - CHECK_SRV("--", "SASL authentication failed"); + CHECK_SRV("--", "SASL authentication failed", "irc_905,irc_numeric,log3"); RECV(":server 906 alice error"); - CHECK_SRV("--", "error"); + CHECK_SRV("--", "error", "irc_906,irc_numeric,log3"); RECV(":server 906 alice :SASL authentication failed"); - CHECK_SRV("--", "SASL authentication failed"); + CHECK_SRV("--", "SASL authentication failed", "irc_906,irc_numeric,log3"); } /* @@ -4941,54 +5433,54 @@ TEST(IrcProtocolWithServer, server_mode_reason) RECV(":server 973 alice"); CHECK_NO_MSG; RECV(":server 973 alice mode"); - CHECK_SRV("--", "mode"); + CHECK_SRV("--", "mode", "irc_973,irc_numeric,log3"); RECV(":server 973 alice mode test"); - CHECK_SRV("--", "mode: test"); + CHECK_SRV("--", "mode: test", "irc_973,irc_numeric,log3"); RECV(":server 973 alice mode :test"); - CHECK_SRV("--", "mode: test"); + CHECK_SRV("--", "mode: test", "irc_973,irc_numeric,log3"); RECV(":server 974 alice"); CHECK_NO_MSG; RECV(":server 974 alice mode"); - CHECK_SRV("--", "mode"); + CHECK_SRV("--", "mode", "irc_974,irc_numeric,log3"); RECV(":server 974 alice mode test"); - CHECK_SRV("--", "mode: test"); + CHECK_SRV("--", "mode: test", "irc_974,irc_numeric,log3"); RECV(":server 974 alice mode :test"); - CHECK_SRV("--", "mode: test"); + CHECK_SRV("--", "mode: test", "irc_974,irc_numeric,log3"); RECV(":server 975 alice"); CHECK_NO_MSG; RECV(":server 975 alice mode"); - CHECK_SRV("--", "mode"); + CHECK_SRV("--", "mode", "irc_975,irc_numeric,log3"); RECV(":server 975 alice mode test"); - CHECK_SRV("--", "mode: test"); + CHECK_SRV("--", "mode: test", "irc_975,irc_numeric,log3"); RECV(":server 975 alice mode :test"); - CHECK_SRV("--", "mode: test"); + CHECK_SRV("--", "mode: test", "irc_975,irc_numeric,log3"); RECV(":server 973 bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_973,irc_numeric,log3"); RECV(":server 973 bob mode"); - CHECK_SRV("--", "bob: mode"); + CHECK_SRV("--", "bob: mode", "irc_973,irc_numeric,log3"); RECV(":server 973 bob mode test"); - CHECK_SRV("--", "bob: mode test"); + CHECK_SRV("--", "bob: mode test", "irc_973,irc_numeric,log3"); RECV(":server 973 bob mode :test"); - CHECK_SRV("--", "bob: mode test"); + CHECK_SRV("--", "bob: mode test", "irc_973,irc_numeric,log3"); RECV(":server 974 bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_974,irc_numeric,log3"); RECV(":server 974 bob mode"); - CHECK_SRV("--", "bob: mode"); + CHECK_SRV("--", "bob: mode", "irc_974,irc_numeric,log3"); RECV(":server 974 bob mode test"); - CHECK_SRV("--", "bob: mode test"); + CHECK_SRV("--", "bob: mode test", "irc_974,irc_numeric,log3"); RECV(":server 974 bob mode :test"); - CHECK_SRV("--", "bob: mode test"); + CHECK_SRV("--", "bob: mode test", "irc_974,irc_numeric,log3"); RECV(":server 975 bob"); - CHECK_SRV("--", "bob"); + CHECK_SRV("--", "bob", "irc_975,irc_numeric,log3"); RECV(":server 975 bob mode"); - CHECK_SRV("--", "bob: mode"); + CHECK_SRV("--", "bob: mode", "irc_975,irc_numeric,log3"); RECV(":server 975 bob mode test"); - CHECK_SRV("--", "bob: mode test"); + CHECK_SRV("--", "bob: mode test", "irc_975,irc_numeric,log3"); RECV(":server 975 bob mode :test"); - CHECK_SRV("--", "bob: mode test"); + CHECK_SRV("--", "bob: mode test", "irc_975,irc_numeric,log3"); } |