Mercurial > irccd
changeset 301:b7ad1b65104c
Tests: add test for server-nick, #559
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 14 Oct 2016 23:53:48 +0200 |
parents | d9f6eeacd806 |
children | 47d40e343ffe |
files | libirccd/irccd/cmd-server-nick.cpp libirccd/irccd/cmd-server-nick.hpp tests/CMakeLists.txt tests/cmd-server-nick/CMakeLists.txt tests/cmd-server-nick/main.cpp |
diffstat | 5 files changed, 109 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/libirccd/irccd/cmd-server-nick.cpp Fri Oct 14 22:01:15 2016 +0200 +++ b/libirccd/irccd/cmd-server-nick.cpp Fri Oct 14 23:53:48 2016 +0200 @@ -18,49 +18,26 @@ #include "cmd-server-nick.hpp" #include "irccd.hpp" +#include "transport.hpp" #include "server.hpp" #include "service-server.hpp" +#include "util.hpp" namespace irccd { namespace command { ServerNickCommand::ServerNickCommand() - : Command("server-nick", "Server", "Change your nickname") + : Command("server-nick") { } -std::vector<Command::Arg> ServerNickCommand::args() const -{ - return { - { "server", true }, - { "nickname", true } - }; -} - -std::vector<Command::Property> ServerNickCommand::properties() const +void ServerNickCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) { - return { - { "server", { nlohmann::json::value_t::string }}, - { "nickname", { nlohmann::json::value_t::string }} - }; -} - -nlohmann::json ServerNickCommand::request(Irccdctl &, const CommandRequest &args) const -{ - return nlohmann::json::object({ - { "server", args.arg(0) }, - { "nickname", args.arg(1) } - }); -} - -nlohmann::json ServerNickCommand::exec(Irccd &irccd, const nlohmann::json &object) const -{ - Command::exec(irccd, object); - - irccd.servers().require(object["server"])->setNickname(object["nickname"]); - - return nlohmann::json::object(); + irccd.servers().require(util::json::requireIdentifier(args, "server"))->setNickname( + util::json::requireString(args, "nickname") + ); + client.success("server-nick"); } } // !command
--- a/libirccd/irccd/cmd-server-nick.hpp Fri Oct 14 22:01:15 2016 +0200 +++ b/libirccd/irccd/cmd-server-nick.hpp Fri Oct 14 23:53:48 2016 +0200 @@ -25,6 +25,7 @@ */ #include "command.hpp" +#include "sysconfig.hpp" namespace irccd { @@ -33,32 +34,17 @@ /** * \brief Implementation of server-nick transport command. */ -class ServerNickCommand : public Command { +class IRCCD_EXPORT ServerNickCommand : public Command { public: /** * Constructor. */ - IRCCD_EXPORT ServerNickCommand(); - - /** - * \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; + ServerNickCommand(); /** * \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 Fri Oct 14 22:01:15 2016 +0200 +++ b/tests/CMakeLists.txt Fri Oct 14 23:53:48 2016 +0200 @@ -26,6 +26,7 @@ add_subdirectory(cmd-server-me) add_subdirectory(cmd-server-message) add_subdirectory(cmd-server-mode) + add_subdirectory(cmd-server-nick) # # Misc # add_subdirectory(command)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-server-nick/CMakeLists.txt Fri Oct 14 23:53:48 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-nick + SOURCES main.cpp + LIBRARIES libirccd libirccdctl +) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-server-nick/main.cpp Fri Oct 14 23:53:48 2016 +0200 @@ -0,0 +1,72 @@ +/* + * main.cpp -- test server-nick 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-nick.hpp> +#include <command-tester.hpp> +#include <server-tester.hpp> + +using namespace irccd; +using namespace irccd::command; + +namespace { + +std::string nick; + +} // !namespace + +class ServerNickTest : public ServerTester { +public: + void setNickname(std::string nick) override + { + ::nick = nick; + } +}; + +class ServerNickCommandTest : public CommandTester { +public: + ServerNickCommandTest() + : CommandTester(std::make_unique<ServerNickCommand>(), + std::make_unique<ServerNickTest>()) + { + m_irccdctl.client().request({ + { "command", "server-nick" }, + { "server", "test" }, + { "nickname", "chris" } + }); + } +}; + +TEST_F(ServerNickCommandTest, basic) +{ + try { + poll([&] () { + return !nick.empty(); + }); + + ASSERT_EQ("chris", nick); + } catch (const std::exception &ex) { + FAIL() << ex.what(); + } +} + +int main(int argc, char **argv) +{ + testing::InitGoogleTest(&argc, argv); + + return RUN_ALL_TESTS(); +}