Mercurial > irccd

changeset 583:55cc4ba15026

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: bring dynlib_plugin back to life
author David Demelier <markand@malikania.fr>
date Mon, 04 Dec 2017 14:30:31 +0100
parents c389a7e7bf50
children 2c3122f23a04
files tests/CMakeLists.txt tests/src/dynlib-plugin/main.cpp tests/src/dynlib-plugin/test_plugin.cpp
diffstat 3 files changed, 7 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/tests/CMakeLists.txt	Mon Dec 04 14:20:40 2017 +0100
+++ b/tests/CMakeLists.txt	Mon Dec 04 14:30:31 2017 +0100
@@ -49,6 +49,7 @@
 add_subdirectory(src/server-topic-command)
 
 # Miscellaneous functions.
+add_subdirectory(src/dynlib-plugin)
 add_subdirectory(src/irc)
 add_subdirectory(src/logger)
 add_subdirectory(src/rules)
--- a/tests/src/dynlib-plugin/main.cpp	Mon Dec 04 14:20:40 2017 +0100
+++ b/tests/src/dynlib-plugin/main.cpp	Mon Dec 04 14:30:31 2017 +0100
@@ -36,12 +36,14 @@
 
 class fixture {
 protected:
+    boost::asio::io_service service_;
     std::shared_ptr<journal_server> server_;
     std::shared_ptr<plugin> plugin_;
     irccd irccd_;
 
     inline fixture()
-        : server_(std::make_shared<journal_server>("test"))
+        : server_(std::make_shared<journal_server>(service_, "test"))
+        , irccd_(service_)
     {
         plugin_ = dynlib_plugin_loader({CMAKE_CURRENT_BINARY_DIR}).find("test-plugin");
 
@@ -72,26 +74,6 @@
     BOOST_TEST(server_->cqueue()[0]["target"].get<std::string>() == "test");
 }
 
-BOOST_AUTO_TEST_CASE(on_channel_mode)
-{
-    plugin_->on_channel_mode(irccd_, {server_, "", "", "", ""});
-
-    BOOST_TEST(server_->cqueue().size() == 1U);
-    BOOST_TEST(server_->cqueue()[0]["command"].get<std::string>() == "message");
-    BOOST_TEST(server_->cqueue()[0]["message"].get<std::string>() == "on_channel_mode");
-    BOOST_TEST(server_->cqueue()[0]["target"].get<std::string>() == "test");
-}
-
-BOOST_AUTO_TEST_CASE(on_channel_notice)
-{
-    plugin_->on_channel_notice(irccd_, {server_, "", "", ""});
-
-    BOOST_TEST(server_->cqueue().size() == 1U);
-    BOOST_TEST(server_->cqueue()[0]["command"].get<std::string>() == "message");
-    BOOST_TEST(server_->cqueue()[0]["message"].get<std::string>() == "on_channel_notice");
-    BOOST_TEST(server_->cqueue()[0]["target"].get<std::string>() == "test");
-}
-
 BOOST_AUTO_TEST_CASE(on_invite)
 {
     plugin_->on_invite(irccd_, {server_, "", "", ""});
@@ -144,7 +126,7 @@
 
 BOOST_AUTO_TEST_CASE(on_mode)
 {
-    plugin_->on_mode(irccd_, {server_, "", ""});
+    plugin_->on_mode(irccd_, {server_, "", "", "", "", "", ""});
 
     BOOST_TEST(server_->cqueue().size() == 1U);
     BOOST_TEST(server_->cqueue()[0]["command"].get<std::string>() == "message");
@@ -174,7 +156,7 @@
 
 BOOST_AUTO_TEST_CASE(on_notice)
 {
-    plugin_->on_notice(irccd_, {server_, "", ""});
+    plugin_->on_notice(irccd_, {server_, "", "", ""});
 
     BOOST_TEST(server_->cqueue().size() == 1U);
     BOOST_TEST(server_->cqueue()[0]["command"].get<std::string>() == "message");
@@ -192,27 +174,7 @@
     BOOST_TEST(server_->cqueue()[0]["target"].get<std::string>() == "test");
 }
 
-BOOST_AUTO_TEST_CASE(on_query)
-{
-    plugin_->on_query(irccd_, {server_, "", ""});
-
-    BOOST_TEST(server_->cqueue().size() == 1U);
-    BOOST_TEST(server_->cqueue()[0]["command"].get<std::string>() == "message");
-    BOOST_TEST(server_->cqueue()[0]["message"].get<std::string>() == "on_query");
-    BOOST_TEST(server_->cqueue()[0]["target"].get<std::string>() == "test");
-}
-
-BOOST_AUTO_TEST_CASE(on_query_command)
-{
-    plugin_->on_query_command(irccd_, {server_, "", ""});
-
-    BOOST_TEST(server_->cqueue().size() == 1U);
-    BOOST_TEST(server_->cqueue()[0]["command"].get<std::string>() == "message");
-    BOOST_TEST(server_->cqueue()[0]["message"].get<std::string>() == "on_query_command");
-    BOOST_TEST(server_->cqueue()[0]["target"].get<std::string>() == "test");
-}
-
-BOOST_AUTO_TEST_CASE(on_query_topic)
+BOOST_AUTO_TEST_CASE(on_topic)
 {
     plugin_->on_topic(irccd_, {server_, "", "", ""});
 
--- a/tests/src/dynlib-plugin/test_plugin.cpp	Mon Dec 04 14:20:40 2017 +0100
+++ b/tests/src/dynlib-plugin/test_plugin.cpp	Mon Dec 04 14:30:31 2017 +0100
@@ -36,16 +36,6 @@
         event.server->message("test", "on_connect");
     }
 
-    void on_channel_mode(irccd&, const channel_mode_event& event) override
-    {
-        event.server->message("test", "on_channel_mode");
-    }
-
-    void on_channel_notice(irccd&, const channel_notice_event& event) override
-    {
-        event.server->message("test", "on_channel_notice");
-    }
-
     void on_invite(irccd&, const invite_event& event) override
     {
         event.server->message("test", "on_invite");
@@ -96,16 +86,6 @@
         event.server->message("test", "on_part");
     }
 
-    void on_query(irccd&, const query_event& event) override
-    {
-        event.server->message("test", "on_query");
-    }
-
-    void on_query_command(irccd&, const query_event& event) override
-    {
-        event.server->message("test", "on_query_command");
-    }
-
     void on_topic(irccd&, const topic_event& event) override
     {
         event.server->message("test", "on_topic");