Mercurial > irccd
changeset 296:c970b293d8cf
Tests: add test for server-message, #559
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 09 Oct 2016 12:09:17 +0200 |
parents | 6bf457b71e0c |
children | a76ccf092570 |
files | libirccd/irccd/cmd-server-message.cpp libirccd/irccd/cmd-server-message.hpp tests/CMakeLists.txt tests/cmd-server-message/CMakeLists.txt tests/cmd-server-message/main.cpp |
diffstat | 5 files changed, 140 insertions(+), 77 deletions(-) [+] |
line wrap: on
line diff
--- a/libirccd/irccd/cmd-server-message.cpp Sun Oct 09 12:05:11 2016 +0200 +++ b/libirccd/irccd/cmd-server-message.cpp Sun Oct 09 12:09:17 2016 +0200 @@ -18,52 +18,27 @@ #include "cmd-server-message.hpp" #include "irccd.hpp" +#include "transport.hpp" #include "server.hpp" #include "service-server.hpp" +#include "util.hpp" namespace irccd { namespace command { ServerMessageCommand::ServerMessageCommand() - : Command("server-message", "Server", "Send a message") + : Command("server-message") { } -std::vector<Command::Arg> ServerMessageCommand::args() const -{ - return { - { "server", true }, - { "target", true }, - { "message", true } - }; -} - -std::vector<Command::Property> ServerMessageCommand::properties() const +void ServerMessageCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) { - return { - { "server", { nlohmann::json::value_t::string }}, - { "target", { nlohmann::json::value_t::string }}, - { "message", { nlohmann::json::value_t::string }} - }; -} - -nlohmann::json ServerMessageCommand::request(Irccdctl &, const CommandRequest &args) const -{ - return nlohmann::json::object({ - { "server", args.arg(0) }, - { "target", args.arg(1) }, - { "message", args.arg(2) } - }); -} - -nlohmann::json ServerMessageCommand::exec(Irccd &irccd, const nlohmann::json &request) const -{ - Command::exec(irccd, request); - - irccd.servers().require(request["server"])->me(request["target"], request["message"]); - - return nlohmann::json::object(); + irccd.servers().require(util::json::requireIdentifier(args, "server"))->message( + util::json::requireString(args, "target"), + util::json::requireString(args, "message") + ); + client.success("server-message"); } } // !command
--- a/libirccd/irccd/cmd-server-message.hpp Sun Oct 09 12:05:11 2016 +0200 +++ b/libirccd/irccd/cmd-server-message.hpp Sun Oct 09 12:09:17 2016 +0200 @@ -25,6 +25,7 @@ */ #include "command.hpp" +#include "sysconfig.hpp" namespace irccd { @@ -33,32 +34,17 @@ /** * \brief Implementation of server-message transport command. */ -class ServerMessageCommand : public Command { +class IRCCD_EXPORT ServerMessageCommand : public Command { public: /** * Constructor. */ - IRCCD_EXPORT ServerMessageCommand(); - - /** - * \copydoc Command::args - */ - IRCCD_EXPORT std::vector<Arg> args() const override; - - /** - * \copydoc Command::properties - */ - IRCCD_EXPORT std::vector<Property> properties() const override; - - /** - * \copydoc Command::request - */ - IRCCD_EXPORT nlohmann::json request(Irccdctl &irccdctl, const CommandRequest &args) const override; + ServerMessageCommand(); /** * \copydoc Command::exec */ - IRCCD_EXPORT nlohmann::json exec(Irccd &irccd, const nlohmann::json &request) const override; + void exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) override; }; } // !command
--- a/tests/CMakeLists.txt Sun Oct 09 12:05:11 2016 +0200 +++ b/tests/CMakeLists.txt Sun Oct 09 12:09:17 2016 +0200 @@ -20,30 +20,32 @@ project(tests) if (WITH_TESTS) - # Misc - add_subdirectory(command) - add_subdirectory(elapsedtimer) - add_subdirectory(logger) - add_subdirectory(path) - add_subdirectory(rules) - add_subdirectory(timer) - add_subdirectory(util) + add_subdirectory(cmd-server-message) - # JS API - if (WITH_JS) - add_subdirectory(js-elapsedtimer) - add_subdirectory(js-file) - add_subdirectory(js-irccd) - add_subdirectory(js-logger) - add_subdirectory(js-system) - add_subdirectory(js-timer) - add_subdirectory(js-unicode) - add_subdirectory(js-util) - add_subdirectory(plugin-ask) - add_subdirectory(plugin-auth) - add_subdirectory(plugin-hangman) - add_subdirectory(plugin-history) - add_subdirectory(plugin-logger) - add_subdirectory(plugin-plugin) - endif () +# # Misc +# add_subdirectory(command) +# add_subdirectory(elapsedtimer) +# add_subdirectory(logger) +# add_subdirectory(path) +# add_subdirectory(rules) +# add_subdirectory(timer) +# add_subdirectory(util) +# +# # JS API +# if (WITH_JS) +# add_subdirectory(js-elapsedtimer) +# add_subdirectory(js-file) +# add_subdirectory(js-irccd) +# add_subdirectory(js-logger) +# add_subdirectory(js-system) +# add_subdirectory(js-timer) +# add_subdirectory(js-unicode) +# add_subdirectory(js-util) +# add_subdirectory(plugin-ask) +# add_subdirectory(plugin-auth) +# add_subdirectory(plugin-hangman) +# add_subdirectory(plugin-history) +# add_subdirectory(plugin-logger) +# add_subdirectory(plugin-plugin) +# endif () endif ()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-server-message/CMakeLists.txt Sun Oct 09 12:09:17 2016 +0200 @@ -0,0 +1,24 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +irccd_define_test( + NAME cmd-server-message + SOURCES main.cpp + LIBRARIES libirccd libirccdctl +) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-server-message/main.cpp Sun Oct 09 12:09:17 2016 +0200 @@ -0,0 +1,76 @@ +/* + * main.cpp -- test server-message remote command + * + * Copyright (c) 2013-2016 David Demelier <markand@malikania.fr> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <cmd-server-message.hpp> +#include <command-tester.hpp> +#include <server-tester.hpp> + +using namespace irccd; +using namespace irccd::command; + +namespace { + +std::string target; +std::string message; + +} // !namespace + +class ServerMessageTest : public ServerTester { +public: + void message(std::string target, std::string message) override + { + ::target = target; + ::message = message; + } +}; + +class ServerMessageCommandTest : public CommandTester { +public: + ServerMessageCommandTest() + : CommandTester(std::make_unique<ServerMessageCommand>(), + std::make_unique<ServerMessageTest>()) + { + m_irccdctl.client().request({ + { "command", "server-message" }, + { "server", "test" }, + { "target", "jean" }, + { "message", "hello!" } + }); + } +}; + +TEST_F(ServerMessageCommandTest, basic) +{ + try { + poll([&] () { + return !target.empty() && !message.empty(); + }); + + ASSERT_EQ("jean", target); + ASSERT_EQ("hello!", message); + } catch (const std::exception &ex) { + FAIL() << ex.what(); + } +} + +int main(int argc, char **argv) +{ + testing::InitGoogleTest(&argc, argv); + + return RUN_ALL_TESTS(); +}