# HG changeset patch # User David Demelier # Date 1477214429 -7200 # Node ID 249ccc1e484097e9a18bf5960f80485aadd61aeb # Parent ee2593e7e6702020ca1d4a99f6a2758ceae9c62c Tests: add test for plugin-list, #559 diff -r ee2593e7e670 -r 249ccc1e4840 libirccd/irccd/cmd-plugin-list.cpp --- a/libirccd/irccd/cmd-plugin-list.cpp Sun Oct 23 11:12:17 2016 +0200 +++ b/libirccd/irccd/cmd-plugin-list.cpp Sun Oct 23 11:20:29 2016 +0200 @@ -22,6 +22,7 @@ #include "irccd.hpp" #include "plugin.hpp" #include "service-plugin.hpp" +#include "transport.hpp" #include "util.hpp" namespace irccd { @@ -33,19 +34,16 @@ { } -void PluginListCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &args) +void PluginListCommand::exec(Irccd &irccd, TransportClient &client, const nlohmann::json &) { -#if 0 - auto response = Command::exec(irccd, request); auto list = nlohmann::json::array(); for (const auto &plugin : irccd.plugins().list()) list += plugin->name(); - response.push_back({"list", std::move(list)}); - - return response; -#endif + client.success("plugin-list", { + { "list", list } + }); } } // !command diff -r ee2593e7e670 -r 249ccc1e4840 tests/CMakeLists.txt --- a/tests/CMakeLists.txt Sun Oct 23 11:12:17 2016 +0200 +++ b/tests/CMakeLists.txt Sun Oct 23 11:20:29 2016 +0200 @@ -22,6 +22,7 @@ if (WITH_TESTS) add_subdirectory(cmd-plugin-config) add_subdirectory(cmd-plugin-info) + add_subdirectory(cmd-plugin-list) add_subdirectory(cmd-plugin-load) add_subdirectory(cmd-plugin-reload) add_subdirectory(cmd-plugin-unload) diff -r ee2593e7e670 -r 249ccc1e4840 tests/cmd-plugin-list/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-plugin-list/CMakeLists.txt Sun Oct 23 11:20:29 2016 +0200 @@ -0,0 +1,23 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 David Demelier +# +# 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-plugin-list + SOURCES main.cpp + LIBRARIES libirccd libirccdctl +) diff -r ee2593e7e670 -r 249ccc1e4840 tests/cmd-plugin-list/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cmd-plugin-list/main.cpp Sun Oct 23 11:20:29 2016 +0200 @@ -0,0 +1,69 @@ +/* + * main.cpp -- test plugin-list remote command + * + * Copyright (c) 2013-2016 David Demelier + * + * 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 +#include +#include +#include +#include + +using namespace irccd; +using namespace irccd::command; + +namespace { + +class PluginListCommandTest : public CommandTester { +public: + PluginListCommandTest() + : CommandTester(std::make_unique()) + { + m_irccd.plugins().add(std::make_unique("t1", "")); + m_irccd.plugins().add(std::make_unique("t2", "")); + } +}; + +TEST_F(PluginListCommandTest, basic) +{ + try { + auto response = nlohmann::json(); + + m_irccdctl.client().onMessage.connect([&] (auto message) { + response = message; + }); + m_irccdctl.client().request({{ "command", "plugin-list" }}); + + poll([&] () { + return response.is_object(); + }); + + ASSERT_TRUE(response.is_object()); + ASSERT_EQ("t1", response["list"][0]); + ASSERT_EQ("t2", response["list"][1]); + } catch (const std::exception &ex) { + FAIL() << ex.what(); + } +} + +} // !namespace + +int main(int argc, char **argv) +{ + testing::InitGoogleTest(&argc, argv); + + return RUN_ALL_TESTS(); +}