From 18c82fc5c7b78bde86f40319ece2a4e7d97aae77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Tue, 25 May 2021 13:38:12 +0200 Subject: tests: replace freenode by libera in tests --- tests/unit/plugins/irc/test-irc-ignore.cpp | 18 +++--- tests/unit/plugins/irc/test-irc-message.cpp | 98 +++++++++++++++-------------- 2 files changed, 61 insertions(+), 55 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/plugins/irc/test-irc-ignore.cpp b/tests/unit/plugins/irc/test-irc-ignore.cpp index 59ae06498..7b0652ae8 100644 --- a/tests/unit/plugins/irc/test-irc-ignore.cpp +++ b/tests/unit/plugins/irc/test-irc-ignore.cpp @@ -51,12 +51,12 @@ TEST(IrcIgnore, New) STRCMP_EQUAL("*", ignore->channel); irc_ignore_free (ignore); - ignore = irc_ignore_new ("^user@host$", "freenode", "#weechat"); + ignore = irc_ignore_new ("^user@host$", "libera", "#weechat"); CHECK(ignore); LONGS_EQUAL(1, ignore->number); STRCMP_EQUAL("^user@host$", ignore->mask); CHECK(ignore->regex_mask); - STRCMP_EQUAL("freenode", ignore->server); + STRCMP_EQUAL("libera", ignore->server); STRCMP_EQUAL("#weechat", ignore->channel); irc_ignore_free (ignore); } @@ -135,7 +135,7 @@ TEST(IrcIgnore, Search) { struct t_irc_ignore *ignore1, *ignore2; - ignore1 = irc_ignore_new ("^user1@host$", "freenode", "#weechat"); + ignore1 = irc_ignore_new ("^user1@host$", "libera", "#weechat"); CHECK(ignore1); LONGS_EQUAL(1, ignore1->number); @@ -145,16 +145,16 @@ TEST(IrcIgnore, Search) POINTERS_EQUAL(NULL, irc_ignore_search ("not_found", NULL, NULL)); POINTERS_EQUAL(NULL, irc_ignore_search ("not_found", - "freenode", "#weechat")); + "libera", "#weechat")); POINTERS_EQUAL(NULL, irc_ignore_search ("^user1@host$", "server1", "#weechat")); POINTERS_EQUAL(NULL, irc_ignore_search ("^user1@host$", - "freenode", "#channel1")); + "libera", "#channel1")); POINTERS_EQUAL(NULL, irc_ignore_search ("^user1@host$", NULL, NULL)); POINTERS_EQUAL(NULL, irc_ignore_search ("^user2@host$", NULL, NULL)); POINTERS_EQUAL(ignore1, irc_ignore_search ("^user1@host$", - "freenode", "#weechat")); + "libera", "#weechat")); POINTERS_EQUAL(ignore2, irc_ignore_search ("^user2@host$", "server2", "#channel2")); @@ -181,7 +181,7 @@ TEST(IrcIgnore, CheckHost) server = irc_server_alloc ("test_ignore"); CHECK(server); - ignore1 = irc_ignore_new ("^user1@host$", "freenode", "#weechat"); + ignore1 = irc_ignore_new ("^user1@host$", "libera", "#weechat"); CHECK(ignore1); LONGS_EQUAL(1, ignore1->number); @@ -191,9 +191,9 @@ TEST(IrcIgnore, CheckHost) /* check server */ LONGS_EQUAL(0, irc_ignore_check_server (ignore1, "test")); - LONGS_EQUAL(1, irc_ignore_check_server (ignore1, "freenode")); + LONGS_EQUAL(1, irc_ignore_check_server (ignore1, "libera")); LONGS_EQUAL(1, irc_ignore_check_server (ignore2, "test")); - LONGS_EQUAL(1, irc_ignore_check_server (ignore2, "freenode")); + LONGS_EQUAL(1, irc_ignore_check_server (ignore2, "libera")); /* check channel */ LONGS_EQUAL(0, irc_ignore_check_channel (ignore1, server, "#test", "nick")); diff --git a/tests/unit/plugins/irc/test-irc-message.cpp b/tests/unit/plugins/irc/test-irc-message.cpp index c23c65b39..d94d440c5 100644 --- a/tests/unit/plugins/irc/test-irc-message.cpp +++ b/tests/unit/plugins/irc/test-irc-message.cpp @@ -91,21 +91,23 @@ extern "C" "nick59,nick60,nick61,nick62,nick63,nick64,nick65,nick66,nick67,nick68,n" \ "ick69,nick70,nick71,nick72,nick__73" -#define MSG_005 "CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimn" \ - "prstz CHANLIMIT=#:120 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=fr" \ - "eenode STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1459 CHARSET=ascii NICKLE" \ - "N=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D FNC TARGMAX=NAMES:1,LIST:1,KICK:" \ - "1,WHOIS:1,PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=" \ - "3.0 SAFELIST ELIST=CTU CPRIVMSG :are supported by this server" - -#define MSG_LONG_005 "CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQS" \ - "cgimnprstz CHANLIMIT=#:120 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWO" \ - "RK=freenode STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1459 CHARSET=ascii N" \ - "ICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D FNC TARGMAX=NAMES:1,LIST:1," \ - "KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIEN" \ - "TVER=3.0 SAFELIST ELIST=CTU CPRIVMSG TEST1:abc TEST2:dev TEST3:ghi TEST" \ - "4:jkl TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz ABC:1 DEF:2 GHI:" \ - "3 JKL:4 MNO:5 PQR:6 STU:7 VWX:8 YT:9 :are supported by this server" +#define MSG_005 "CHANTYPES=# EXCEPTS INVEX " \ + "CHANMODES=eIbq,k,flj,CFLMPQScgimnprstz CHANLIMIT=#:120 PREFIX=(ov)@+ " \ + "MAXLIST=bqeI:100 MODES=4 NETWORK=libera STATUSMSG=@+ CALLERID=g " \ + "CASEMAPPING=rfc1459 CHARSET=ascii NICKLEN=16 CHANNELLEN=50 " \ + "TOPICLEN=390 DEAF=D FNC TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1," \ + "PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 " \ + "SAFELIST ELIST=CTU CPRIVMSG :are supported by this server" + +#define MSG_LONG_005 "CHANTYPES=# EXCEPTS INVEX " \ + "CHANMODES=eIbq,k,flj,CFLMPQScgimnprstz CHANLIMIT=#:120 PREFIX=(ov)@+ " \ + "MAXLIST=bqeI:100 MODES=4 NETWORK=libera STATUSMSG=@+ CALLERID=g " \ + "CASEMAPPING=rfc1459 CHARSET=ascii NICKLEN=16 CHANNELLEN=50 " \ + "TOPICLEN=390 DEAF=D FNC TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1," \ + "PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 " \ + "SAFELIST ELIST=CTU CPRIVMSG TEST1:abc TEST2:dev TEST3:ghi TEST4:jkl " \ + "TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz ABC:1 DEF:2 GHI:3 " \ + "JKL:4 MNO:5 PQR:6 STU:7 VWX:8 YT:9 :are supported by this server" #define STRING_200 "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCD" \ "EFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVW" \ @@ -1329,21 +1331,23 @@ TEST(IrcMessage, Split) LONGS_EQUAL(3, hashtable->items_count); STRCMP_EQUAL("1", (const char *)hashtable_get (hashtable, "count")); - STRCMP_EQUAL("005 nick CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFL" - "MPQScgimnprstz CHANLIMIT=#:120 PREFIX=(ov)@+ MAXLIST=bqeI:1" - "00 MODES=4 NETWORK=freenode STATUSMSG=@+ CALLERID=g CASEMAP" - "PING=rfc1459 CHARSET=ascii NICKLEN=16 CHANNELLEN=50 TOPICLE" - "N=390 DEAF=D FNC TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIV" - "MSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3." - "0 SAFELIST ELIST=CTU CPRIVMSG :are supported by this server", + STRCMP_EQUAL("005 nick CHANTYPES=# EXCEPTS INVEX " + "CHANMODES=eIbq,k,flj,CFLMPQScgimnprstz CHANLIMIT=#:120 " + "PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=libera " + "STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1459 CHARSET=ascii " + "NICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D FNC " + "TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4," + "ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 SAFELIST " + "ELIST=CTU CPRIVMSG :are supported by this server", (const char *)hashtable_get (hashtable, "msg1")); - STRCMP_EQUAL("CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimn" - "prstz CHANLIMIT=#:120 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=" - "4 NETWORK=freenode STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1" - "459 CHARSET=ascii NICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEA" - "F=D FNC TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOT" - "ICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 SAFELIS" - "T ELIST=CTU CPRIVMSG", + STRCMP_EQUAL("CHANTYPES=# EXCEPTS INVEX " + "CHANMODES=eIbq,k,flj,CFLMPQScgimnprstz CHANLIMIT=#:120 " + "PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=libera " + "STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1459 CHARSET=ascii " + "NICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D FNC " + "TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4," + "ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 SAFELIST " + "ELIST=CTU CPRIVMSG", (const char *)hashtable_get (hashtable, "args1")); hashtable_free (hashtable); @@ -1353,24 +1357,26 @@ TEST(IrcMessage, Split) LONGS_EQUAL(5, hashtable->items_count); STRCMP_EQUAL("2", (const char *)hashtable_get (hashtable, "count")); - STRCMP_EQUAL("005 nick CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFL" - "MPQScgimnprstz CHANLIMIT=#:120 PREFIX=(ov)@+ MAXLIST=bqeI:1" - "00 MODES=4 NETWORK=freenode STATUSMSG=@+ CALLERID=g CASEMAP" - "PING=rfc1459 CHARSET=ascii NICKLEN=16 CHANNELLEN=50 TOPICLE" - "N=390 DEAF=D FNC TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIV" - "MSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3." - "0 SAFELIST ELIST=CTU CPRIVMSG TEST1:abc TEST2:dev TEST3:ghi" - " TEST4:jkl TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz" - " ABC:1 :are supported by this server", + STRCMP_EQUAL("005 nick CHANTYPES=# EXCEPTS INVEX " + "CHANMODES=eIbq,k,flj,CFLMPQScgimnprstz CHANLIMIT=#:120 " + "PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=libera " + "STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1459 CHARSET=ascii " + "NICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D FNC " + "TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4," + "ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 SAFELIST " + "ELIST=CTU CPRIVMSG TEST1:abc TEST2:dev TEST3:ghi TEST4:jkl " + "TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz ABC:1 " + ":are supported by this server", (const char *)hashtable_get (hashtable, "msg1")); - STRCMP_EQUAL("CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimn" - "prstz CHANLIMIT=#:120 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=" - "4 NETWORK=freenode STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1" - "459 CHARSET=ascii NICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEA" - "F=D FNC TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOT" - "ICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 SAFELIS" - "T ELIST=CTU CPRIVMSG TEST1:abc TEST2:dev TEST3:ghi TEST4:jk" - "l TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz ABC:1", + STRCMP_EQUAL("CHANTYPES=# EXCEPTS INVEX " + "CHANMODES=eIbq,k,flj,CFLMPQScgimnprstz CHANLIMIT=#:120 " + "PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=libera " + "STATUSMSG=@+ CALLERID=g CASEMAPPING=rfc1459 CHARSET=ascii " + "NICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D FNC " + "TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4," + "ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 SAFELIST " + "ELIST=CTU CPRIVMSG TEST1:abc TEST2:dev TEST3:ghi TEST4:jkl " + "TEST5:mno TEST6:pqr TEST7:stu TEST8:vwx TEST9:yz ABC:1", (const char *)hashtable_get (hashtable, "args1")); STRCMP_EQUAL("005 nick DEF:2 GHI:3 JKL:4 MNO:5 PQR:6 STU:7 VWX:8 YT:9 :ar" "e supported by this server", -- cgit v1.2.3