Mercurial > irccd

diff tests/src/libirccd-daemon/command-server-kick/main.cpp @ 830:4f7e46e593fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use command directly, closes #991 @4h
author David Demelier <markand@malikania.fr>
date Mon, 11 Feb 2019 20:30:00 +0100
parents 06cc2f95f479
children 5e25439fe98d
line wrap: on
line diff
--- a/tests/src/libirccd-daemon/command-server-kick/main.cpp	Thu Feb 07 11:42:49 2019 +0100
+++ b/tests/src/libirccd-daemon/command-server-kick/main.cpp	Mon Feb 11 20:30:00 2019 +0100
@@ -21,20 +21,15 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-using irccd::test::command_fixture;
-
-using irccd::daemon::server;
-using irccd::daemon::server_error;
-
 namespace irccd {
 
 namespace {
 
-BOOST_FIXTURE_TEST_SUITE(server_kick_fixture_suite, command_fixture)
+BOOST_FIXTURE_TEST_SUITE(server_kick_fixture_suite, test::command_fixture)
 
 BOOST_AUTO_TEST_CASE(basic)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     "francis"       },
@@ -44,7 +39,8 @@
 
 	const auto cmd = server_->find("kick").back();
 
-	BOOST_TEST(!code);
+	BOOST_TEST(json.size() == 1U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
 	BOOST_TEST(std::any_cast<std::string>(cmd[1]) == "#staff");
 	BOOST_TEST(std::any_cast<std::string>(cmd[0]) == "francis");
 	BOOST_TEST(std::any_cast<std::string>(cmd[2]) == "too noisy");
@@ -52,7 +48,7 @@
 
 BOOST_AUTO_TEST_CASE(noreason)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     "francis"       },
@@ -61,7 +57,8 @@
 
 	const auto cmd = server_->find("kick").back();
 
-	BOOST_TEST(!code);
+	BOOST_TEST(json.size() == 1U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
 	BOOST_TEST(std::any_cast<std::string>(cmd[1]) == "#staff");
 	BOOST_TEST(std::any_cast<std::string>(cmd[0]) == "francis");
 	BOOST_TEST(std::any_cast<std::string>(cmd[2]) == "");
@@ -71,91 +68,97 @@
 
 BOOST_AUTO_TEST_CASE(invalid_identifier_1)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     123456          },
 		{ "target",     "francis"       },
 		{ "channel",    "#music"        }
 	});
 
-	BOOST_TEST(code == server_error::invalid_identifier);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_identifier);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_identifier);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_identifier_2)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     ""              },
 		{ "target",     "francis"       },
 		{ "channel",    "#music"        }
 	});
 
-	BOOST_TEST(code == server_error::invalid_identifier);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_identifier);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_identifier);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_nickname_1)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     ""              },
 		{ "channel",    "#music"        }
 	});
 
-	BOOST_TEST(code == server_error::invalid_nickname);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_nickname);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_nickname);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_nickname_2)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     123456          },
 		{ "channel",    "#music"        }
 	});
 
-	BOOST_TEST(code == server_error::invalid_nickname);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_nickname);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_nickname);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_channel_1)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     "jean"          },
 		{ "channel",    ""              }
 	});
 
-	BOOST_TEST(code == server_error::invalid_channel);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_channel);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_channel);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_channel_2)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     "jean"          },
 		{ "channel",    123456          }
 	});
 
-	BOOST_TEST(code == server_error::invalid_channel);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_channel);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_channel);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_message)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "test"          },
 		{ "target",     "jean"          },
@@ -163,22 +166,24 @@
 		{ "reason",     123456          }
 	});
 
-	BOOST_TEST(code == server_error::invalid_message);
-	BOOST_TEST(json["error"].get<int>() == server_error::invalid_message);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::invalid_message);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(not_found)
 {
-	const auto [json, code] = request({
+	const auto json = request({
 		{ "command",    "server-kick"   },
 		{ "server",     "unknown"       },
 		{ "target",     "francis"       },
 		{ "channel",    "#music"        }
 	});
 
-	BOOST_TEST(code == server_error::not_found);
-	BOOST_TEST(json["error"].get<int>() == server_error::not_found);
+	BOOST_TEST(json.size() == 4U);
+	BOOST_TEST(json["command"].get<std::string>() == "server-kick");
+	BOOST_TEST(json["error"].get<int>() == daemon::server_error::not_found);
 	BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }