--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cmd-server-join/main.cpp	Wed Oct 19 18:04:57 2016 +0200
@@ -0,0 +1,101 @@
+/*
+ * main.cpp -- test server-join 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-join.hpp>
+#include <command-tester.hpp>
+#include <server-tester.hpp>
+
+using namespace irccd;
+using namespace irccd::command;
+
+namespace {
+
+std::string channel;
+std::string password;
+
+} // !namespace
+
+class ServerJoinTest : public ServerTester {
+public:
+    void join(std::string channel, std::string password) override
+    {
+        ::channel = channel;
+        ::password = password;
+    }
+};
+
+class ServerJoinCommandTest : public CommandTester {
+public:
+    ServerJoinCommandTest()
+        : CommandTester(std::make_unique<ServerJoinCommand>(),
+                        std::make_unique<ServerJoinTest>())
+    {
+        channel.clear();
+        password.clear();
+
+
+    }
+};
+
+TEST_F(ServerJoinCommandTest, basic)
+{
+    try {
+        m_irccdctl.client().request({
+            { "command",    "server-join"       },
+            { "server",     "test"              },
+            { "channel",    "#music"            },
+            { "password",   "plop"              }
+        });
+
+        poll([&] () {
+            return !channel.empty();
+        });
+
+        ASSERT_EQ("#music", channel);
+        ASSERT_EQ("plop", password);
+    } catch (const std::exception &ex) {
+        FAIL() << ex.what();
+    }
+}
+
+TEST_F(ServerJoinCommandTest, nopassword)
+{
+    try {
+        m_irccdctl.client().request({
+            { "command",    "server-join"       },
+            { "server",     "test"              },
+            { "channel",    "#music"            }
+        });
+
+        poll([&] () {
+            return !channel.empty();
+        });
+
+        ASSERT_EQ("#music", channel);
+        ASSERT_EQ("", password);
+    } catch (const std::exception &ex) {
+        FAIL() << ex.what();
+    }
+}
+
+int main(int argc, char **argv)
+{
+    testing::InitGoogleTest(&argc, argv);
+
+    return RUN_ALL_TESTS();
+}