Mercurial > irccd

diff tests/test-plugin-hangman.c @ 1011:a35537c50f09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
irccd: hide conn implementation
author David Demelier <markand@malikania.fr>
date Wed, 17 Feb 2021 20:05:00 +0100
parents 0d71bfa6c97a
children 8f8ce47aba8a
line wrap: on
line diff
--- a/tests/test-plugin-hangman.c	Wed Feb 17 20:01:00 2021 +0100
+++ b/tests/test-plugin-hangman.c	Wed Feb 17 20:05:00 2021 +0100
@@ -22,35 +22,36 @@
 #include <greatest.h>
 
 #include <irccd/compat.h>
+#include <irccd/conn.h>
 #include <irccd/js-plugin.h>
 #include <irccd/log.h>
 #include <irccd/plugin.h>
 #include <irccd/server.h>
 
 #define CALL(t, m) do {                                                 \
-	memset(server->conn.out, 0, sizeof (server->conn.out));         \
-	irc_plugin_handle(plugin, &(const struct irc_event) {           \
-		.type = t,                                              \
-		.server = server,                                       \
-			.message = {                                    \
-			.origin = "jean!jean@localhost",                \
-			.channel = "#hangman",                          \
-			.message = m                                    \
-		}                                                       \
-	});                                                             \
+        memset(server->conn->out, 0, sizeof (server->conn->out));       \
+        irc_plugin_handle(plugin, &(const struct irc_event) {           \
+                .type = t,                                              \
+                .server = server,                                       \
+                        .message = {                                    \
+                        .origin = "jean!jean@localhost",                \
+                        .channel = "#hangman",                          \
+                        .message = m                                    \
+                }                                                       \
+        });                                                             \
 } while (0)
 
 #define CALL_EX(t, o, c, m) do {                                        \
-	memset(server->conn.out, 0, sizeof (server->conn.out));         \
-	irc_plugin_handle(plugin, &(const struct irc_event) {           \
-		.type = t,                                              \
-		.server = server,                                       \
-			.message = {                                    \
-			.origin = o,                                    \
-			.channel = c,                                   \
-			.message = m                                    \
-		}                                                       \
-	});                                                             \
+        memset(server->conn->out, 0, sizeof (server->conn->out));       \
+        irc_plugin_handle(plugin, &(const struct irc_event) {           \
+                .type = t,                                              \
+                .server = server,                                       \
+                        .message = {                                    \
+                        .origin = o,                                    \
+                        .channel = c,                                   \
+                        .message = m                                    \
+                }                                                       \
+        });                                                             \
 } while (0)
 
 static struct irc_server *server;
@@ -99,13 +100,13 @@
 basics_asked(void)
 {
 	CALL(IRC_EVENT_COMMAND, "");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :start=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:_ _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :start=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:_ _ _\r\n", server->conn->out);
 
 	CALL(IRC_EVENT_MESSAGE, "s");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s _ _\r\n", server->conn->out);
 
 	CALL(IRC_EVENT_MESSAGE, "s");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :asked=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :asked=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -123,7 +124,7 @@
 	CALL(IRC_EVENT_MESSAGE, "h");
 	CALL(IRC_EVENT_MESSAGE, "i");
 	CALL(IRC_EVENT_MESSAGE, "j");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :dead=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:sky\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :dead=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:sky\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -132,7 +133,7 @@
 {
 	CALL(IRC_EVENT_COMMAND, "");
 	CALL(IRC_EVENT_MESSAGE, "s");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s _ _\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -140,7 +141,7 @@
 basics_start(void)
 {
 	CALL(IRC_EVENT_COMMAND, "");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :start=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:_ _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :start=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:_ _ _\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -151,7 +152,7 @@
 	CALL(IRC_EVENT_MESSAGE, "s");
 	CALL(IRC_EVENT_MESSAGE, "k");
 	CALL(IRC_EVENT_MESSAGE, "y");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :win=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:sky\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :win=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:sky\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -160,7 +161,7 @@
 {
 	CALL(IRC_EVENT_COMMAND, "");
 	CALL(IRC_EVENT_COMMAND, "sky");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :win=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:sky\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :win=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:sky\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -169,7 +170,7 @@
 {
 	CALL(IRC_EVENT_COMMAND, "");
 	CALL(IRC_EVENT_MESSAGE, "x");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :wrong-letter=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:x\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :wrong-letter=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:x\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -178,7 +179,7 @@
 {
 	CALL(IRC_EVENT_COMMAND, "");
 	CALL(IRC_EVENT_COMMAND, "cheese");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :wrong-word=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:cheese\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :wrong-word=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:cheese\r\n", server->conn->out);
 	GREATEST_PASS();
 }
 
@@ -192,11 +193,11 @@
 
 	/* Forbidden to play twice. */
 	CALL(IRC_EVENT_MESSAGE, "k");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :wrong-player=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:k\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :wrong-player=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:k\r\n", server->conn->out);
 
 	/* Use a different nickname now. */
 	CALL_EX(IRC_EVENT_MESSAGE, "francis!francis@localhost", "#hangman", "k");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:francis!francis@localhost:francis:s k _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:francis!francis@localhost:francis:s k _\r\n", server->conn->out);
 
 	GREATEST_PASS();
 }
@@ -207,10 +208,10 @@
 	CALL_EX(IRC_EVENT_COMMAND, "jean!jean@localhost", "#hangman", "");
 
 	CALL_EX(IRC_EVENT_MESSAGE, "jean!jean@localhost", "#HANGMAN", "s");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s _ _\r\n", server->conn->out);
 
 	CALL_EX(IRC_EVENT_MESSAGE, "jean!jean@localhost", "#HaNGMaN", "k");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s k _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :found=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:s k _\r\n", server->conn->out);
 
 	GREATEST_PASS();
 }
@@ -225,16 +226,16 @@
 	irc_plugin_set_option(plugin, "collaborative", "true");
 
 	CALL_EX(IRC_EVENT_COMMAND, "jean!jean@localhost", "t", "");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :start=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:_ _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :start=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:_ _ _\r\n", server->conn->out);
 
 	CALL_EX(IRC_EVENT_MESSAGE, "jean!jean@localhost", "t", "s");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :found=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:s _ _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :found=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:s _ _\r\n", server->conn->out);
 
 	CALL_EX(IRC_EVENT_MESSAGE, "jean!jean@localhost", "t", "k");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :found=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:s k _\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :found=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:s k _\r\n", server->conn->out);
 
 	CALL_EX(IRC_EVENT_COMMAND, "jean!jean@localhost", "t", "sky");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :win=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:sky\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG jean!jean@localhost :win=hangman:!hangman:test:jean!jean@localhost:jean!jean@localhost:jean:sky\r\n", server->conn->out);
 
 	GREATEST_PASS();
 }
@@ -245,7 +246,7 @@
 	CALL(IRC_EVENT_COMMAND, "");
 	CALL(IRC_EVENT_MESSAGE, "y");
 	CALL(IRC_EVENT_COMMAND, "");
-	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :running=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:_ _ y\r\n", server->conn.out);
+	GREATEST_ASSERT_STR_EQ("PRIVMSG #hangman :running=hangman:!hangman:test:#hangman:jean!jean@localhost:jean:_ _ y\r\n", server->conn->out);
 	GREATEST_PASS();
 }