Mercurial > irccd
changeset 309:2f72a42ba595
Tests: add test for server-list, #559
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 19 Oct 2016 17:46:38 +0200 |
parents | 02b86903157f |
children | 7e5001552326 |
files | libirccd/irccd/cmd-plugin-list.cpp libirccd/irccd/cmd-plugin-list.hpp libirccd/irccd/cmd-server-list.cpp libirccd/irccd/cmd-server-list.hpp tests/cmd-server-list/CMakeLists.txt tests/cmd-server-list/main.cpp |
diffstat | 6 files changed, 103 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/libirccd/irccd/cmd-plugin-list.cpp Wed Oct 19 18:17:44 2016 +0200 +++ b/libirccd/irccd/cmd-plugin-list.cpp Wed Oct 19 17:46:38 2016 +0200 @@ -29,12 +29,13 @@ namespace command { PluginListCommand::PluginListCommand() - : Command("plugin-list", "Plugins", "Get the list of loaded plugins") + : Command("plugin-list") { } -nlohmann::json PluginListCommand::exec(Irccd &irccd, const nlohmann::json &request) const +void PluginListCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) { +#if 0 auto response = Command::exec(irccd, request); auto list = nlohmann::json::array(); @@ -44,17 +45,7 @@ response.push_back({"list", std::move(list)}); return response; -} - -void PluginListCommand::result(Irccdctl &irccdctl, const nlohmann::json &object) const -{ - Command::result(irccdctl, object); - - auto it = object.find("list"); - - if (it != object.end() && it->is_array()) - for (const auto &n : *it) - std::cout << n.dump() << std::endl; +#endif } } // !command
--- a/libirccd/irccd/cmd-plugin-list.hpp Wed Oct 19 18:17:44 2016 +0200 +++ b/libirccd/irccd/cmd-plugin-list.hpp Wed Oct 19 17:46:38 2016 +0200 @@ -43,12 +43,7 @@ /** * \copydoc Command::exec */ - IRCCD_EXPORT nlohmann::json exec(Irccd &irccd, const nlohmann::json &request) const override; - - /** - * \copydoc Command::result - */ - IRCCD_EXPORT void result(Irccdctl &irccdctl, const nlohmann::json &response) const override; + IRCCD_EXPORT void exec(Irccd &irccd, TransportClient &client, const nlohmann::json &request) override; }; } // !command
--- a/libirccd/irccd/cmd-server-list.cpp Wed Oct 19 18:17:44 2016 +0200 +++ b/libirccd/irccd/cmd-server-list.cpp Wed Oct 19 17:46:38 2016 +0200 @@ -22,17 +22,18 @@ #include "irccd.hpp" #include "server.hpp" #include "service-server.hpp" +#include "transport.hpp" namespace irccd { namespace command { ServerListCommand::ServerListCommand() - : Command("server-list", "Server", "Get the list of servers") + : Command("server-list") { } -nlohmann::json ServerListCommand::exec(Irccd &irccd, const nlohmann::json &) const +void ServerListCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &) { auto json = nlohmann::json::object(); auto list = nlohmann::json::array(); @@ -41,20 +42,7 @@ list.push_back(server->name()); json.push_back({"list", std::move(list)}); - - return json; -} - -void ServerListCommand::result(Irccdctl &, const nlohmann::json &response) const -{ - auto list = response.find("list"); - - if (list == response.end()) - return; - - for (auto v : *list) - if (v.is_string()) - std::cout << v.get<std::string>() << std::endl; + client.success("server-list", json); } } // !command
--- a/libirccd/irccd/cmd-server-list.hpp Wed Oct 19 18:17:44 2016 +0200 +++ b/libirccd/irccd/cmd-server-list.hpp Wed Oct 19 17:46:38 2016 +0200 @@ -43,12 +43,7 @@ /** * \copydoc Command::exec */ - IRCCD_EXPORT nlohmann::json exec(Irccd &irccd, const nlohmann::json &request) const override; - - /** - * \copydoc Command::result - */ - IRCCD_EXPORT void result(Irccdctl &irccdctl, const nlohmann::json &response) const override; + IRCCD_EXPORT void exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) override; }; } // !command
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-server-list/CMakeLists.txt Wed Oct 19 17:46:38 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-list + SOURCES main.cpp + LIBRARIES libirccd libirccdctl +) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-server-list/main.cpp Wed Oct 19 17:46:38 2016 +0200 @@ -0,0 +1,69 @@ +/* + * main.cpp -- test server-list 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-list.hpp> +#include <command-tester.hpp> +#include <server-tester.hpp> +#include <service-server.hpp> + +using namespace irccd; +using namespace irccd::command; + +namespace { + +nlohmann::json result; + +} // !namespace + +class ServerListCommandTest : public CommandTester { +public: + ServerListCommandTest() + : CommandTester(std::make_unique<ServerListCommand>()) + { + m_irccd.servers().add(std::make_unique<ServerTester>("s1")); + m_irccd.servers().add(std::make_unique<ServerTester>("s2")); + m_irccdctl.client().request({{ "command", "server-list" }}); + m_irccdctl.client().onMessage.connect([&] (auto result) { + ::result = result; + }); + } +}; + +TEST_F(ServerListCommandTest, basic) +{ + try { + poll([&] () { + return result.is_object(); + }); + + ASSERT_TRUE(result.is_object()); + ASSERT_TRUE(result["list"].is_array()); + ASSERT_EQ(2U, result["list"].size()); + ASSERT_EQ("s1", result["list"][0]); + ASSERT_EQ("s2", result["list"][1]); + } catch (const std::exception &ex) { + FAIL() << ex.what(); + } +} + +int main(int argc, char **argv) +{ + testing::InitGoogleTest(&argc, argv); + + return RUN_ALL_TESTS(); +}