libtransport.git Changeset - 26fc8a0323bb

Changeset - 26fc8a0323bb

Parent rev.

Child rev.

[Not reviewed]

0 9 0

Jan Kaluza - 9 years ago 2016-02-15 09:57:25
jkaluza@redhat.com

Fix compilation with Swiften 3.0-rc2. This is now the minimal Swiften 3 version to compile with. Compilation with Swiften 2 is still supported.

9 files changed with 129 insertions and 68 deletions:

libtransport/AdminInterface.cpp

libtransport/NetworkPluginServer.cpp

libtransport/UserManager.cpp

spectrum/src/frontends/slack/SlackSession.cpp

spectrum/src/frontends/slack/SlackUserManager.cpp

tests/libtransport/conversationmanager.cpp

tests/libtransport/user.cpp

tests/libtransport/usermanager.cpp

tests/libtransport/userregistration.cpp

0 comments (0 inline, 0 general)

libtransport/AdminInterface.cpp

➞

Show inline comments

@@ @@ -33,6 +33,9 @@ @@
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 DEFINE_LOGGER(logger, "AdminInterface");
@@ @@ -60,19 +63,24 @@ AdminInterface::~AdminInterface() { @@
+}
 void AdminInterface::handleQuery(Swift::Message::ref message) {
 	LOG4CXX_INFO(logger, "Message from admin received: '" << message->getBody() << "'");
 #if HAVE_SWIFTEN_3
 	std::string msg = message->getBody().value_or("");
 #else
 	std::string msg = message->getBody();
 #endif
 	LOG4CXX_INFO(logger, "Message from admin received: '" << msg << "'");
 	message->setTo(message->getFrom());
 	message->setFrom(m_component->getJID());
-	if (message->getBody() == "status") {
+	if (msg == "status") {
 		int users = m_userManager->getUserCount();
 		int backends = m_server->getBackendCount();
 		message->setBody("Running (" + boost::lexical_cast<std::string>(users) + " users connected using " + boost::lexical_cast<std::string>(backends) + " backends)");
+	}
-	else if (message->getBody() == "uptime") {
+	else if (msg == "uptime") {
 		message->setBody(boost::lexical_cast<std::string>(time(0) - m_start));
+	}
-	else if (message->getBody() == "online_users") {
+	else if (msg == "online_users") {
 		std::string lst;
 		const std::map<std::string, User *> &users = m_userManager->getUsers();
 		if (users.size() == 0)
 		message->setBody(lst);
+	}
-	else if (message->getBody() == "online_users_count") {
+	else if (msg == "online_users_count") {
 		int users = m_userManager->getUserCount();
 		message->setBody(boost::lexical_cast<std::string>(users));
+	}
-	else if (message->getBody() == "reload") {
+	else if (msg == "reload") {
 		bool done = m_component->getConfig()->reload();
 		if (done) {
 			message->setBody("Config reloaded");
 			message->setBody("Error during config reload");
+		}
+	}
-	else if (message->getBody() == "online_users_per_backend") {
+	else if (msg == "online_users_per_backend") {
 		std::string lst;
 		int id = 1;
 		message->setBody(lst);
+	}
 	else if (message->getBody().find("has_online_user") == 0) {
 		User *user = m_userManager->getUser(getArg(message->getBody()));
 		std::cout << getArg(message->getBody()) << "\n";
 	else if (msg.find("has_online_user") == 0) {
 		User *user = m_userManager->getUser(getArg(msg));
 		std::cout << getArg(msg) << "\n";
 		message->setBody(boost::lexical_cast<std::string>(user != NULL));
+	}
-	else if (message->getBody() == "backends_count") {
+	else if (msg == "backends_count") {
 		int backends = m_server->getBackendCount();
 		message->setBody(boost::lexical_cast<std::string>(backends));
+	}
-	else if (message->getBody() == "res_memory") {
+	else if (msg == "res_memory") {
 		double shared = 0;
 		double rss = 0;
 		process_mem_usage(shared, rss);
 		message->setBody(boost::lexical_cast<std::string>(rss));
+	}
-	else if (message->getBody() == "shr_memory") {
+	else if (msg == "shr_memory") {
 		double shared = 0;
 		double rss = 0;
 		process_mem_usage(shared, rss);
 		message->setBody(boost::lexical_cast<std::string>(shared));
+	}
-	else if (message->getBody() == "used_memory") {
+	else if (msg == "used_memory") {
 		double shared = 0;
 		double rss = 0;
 		process_mem_usage(shared, rss);
 		message->setBody(boost::lexical_cast<std::string>(rss));
+	}
-	else if (message->getBody() == "average_memory_per_user") {
+	else if (msg == "average_memory_per_user") {
 		if (m_userManager->getUserCount() == 0) {
 			message->setBody(boost::lexical_cast<std::string>(0));
+		}
 			message->setBody(boost::lexical_cast<std::string>(per_user / m_userManager->getUserCount()));
+		}
+	}
-	else if (message->getBody() == "res_memory_per_backend") {
+	else if (msg == "res_memory_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		message->setBody(lst);
+	}
-	else if (message->getBody() == "shr_memory_per_backend") {
+	else if (msg == "shr_memory_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		message->setBody(lst);
+	}
-	else if (message->getBody() == "used_memory_per_backend") {
+	else if (msg == "used_memory_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		message->setBody(lst);
+	}
-	else if (message->getBody() == "average_memory_per_user_per_backend") {
+	else if (msg == "average_memory_per_user_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		message->setBody(lst);
+	}
-	else if (message->getBody() == "collect_backend") {
+	else if (msg == "collect_backend") {
 		m_server->collectBackend();
+	}
-	else if (message->getBody() == "crashed_backends") {
+	else if (msg == "crashed_backends") {
 		std::string lst;
 		const std::vector<std::string> &backends = m_server->getCrashedBackends();
 		BOOST_FOREACH(const std::string &backend, backends) {
+		}
 		message->setBody(lst);
+	}
-	else if (message->getBody() == "crashed_backends_count") {
+	else if (msg == "crashed_backends_count") {
 		message->setBody(boost::lexical_cast<std::string>(m_server->getCrashedBackends().size()));
+	}
-	else if (message->getBody() == "messages_from_xmpp") {
+	else if (msg == "messages_from_xmpp") {
 		int msgCount = m_userManager->getMessagesToBackend();
 		message->setBody(boost::lexical_cast<std::string>(msgCount));
+	}
-	else if (message->getBody() == "messages_to_xmpp") {
+	else if (msg == "messages_to_xmpp") {
 		int msgCount = m_userManager->getMessagesToXMPP();
 		message->setBody(boost::lexical_cast<std::string>(msgCount));
+	}
 	else if (message->getBody().find("register ") == 0 && m_userRegistration) {
 		std::string body = message->getBody();
 	else if (msg.find("register ") == 0 && m_userRegistration) {
 		std::string body = msg;
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 4) {
 			message->setBody("Bad argument count. See 'help'.");
+		}
+	}
 	else if (message->getBody().find("unregister ") == 0 && m_userRegistration) {
 		std::string body = message->getBody();
 	else if (msg.find("unregister ") == 0 && m_userRegistration) {
 		std::string body = msg;
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 2) {
 			message->setBody("Bad argument count. See 'help'.");
+		}
+	}
 	else if (message->getBody().find("set_oauth2_code ") == 0) {
 		std::string body = message->getBody();
 	else if (msg.find("set_oauth2_code ") == 0) {
 		std::string body = msg;
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 3) {
 			message->setBody("Bad argument count. See 'help'.");
+		}
+	}
 	else if (message->getBody().find("get_oauth2_url") == 0) {
 		std::string body = message->getBody();
 	else if (msg.find("get_oauth2_url") == 0) {
 		std::string body = msg;
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		std::string url = m_component->getFrontend()->getOAuth2URL(args);
 		message->setBody(url);
+	}
-	else if (message->getBody() == "registration_fields") {
+	else if (msg == "registration_fields") {
 		std::string fields = m_component->getFrontend()->getRegistrationFields();
 		message->setBody(fields);
+	}
 	else if (m_component->getFrontend()->handleAdminMessage(message)) {
 		LOG4CXX_INFO(logger, "Message handled by frontend");
+	}
-	else if (message->getBody().find("help") == 0) {
+	else if (msg.find("help") == 0) {
 		std::string help;
 		help += "General:\n";
 		help += "    status - shows instance status\n";
 		message->setBody(help);
+	}
 	else {
-		message->setBody("Unknown command \"" + message->getBody() + "\". Try \"help\"");
+		message->setBody("Unknown command \"" + msg + "\". Try \"help\"");
+	}
+}
+	}
 	// Ignore empty messages
 #if HAVE_SWIFTEN_3
 	if (message->getBody().value_or("").empty()) {
 		return;
+	}
 #else
 	if (message->getBody().empty()) {
 		return;
+	}
 #endif
 	handleQuery(message);

libtransport/NetworkPluginServer.cpp

➞

Show inline comments

 	m_adminInterface->handleQuery(msg);
 	pbnetwork::BackendConfig response;
 #if HAVE_SWIFTEN_3
 	response.set_config(msg->getBody().value_or(""));
 #else
 	response.set_config(msg->getBody());
 #endif
 	std::string message;
 	response.SerializeToString(&message);
 		pbnetwork::ConversationMessage m;
 		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());
 		m.set_buddyname(conv->getLegacyName());
 #if HAVE_SWIFTEN_3
 		m.set_message(msg->getBody().value_or(""));
 #else
 		m.set_message(msg->getBody());
 #endif
 		std::string message;
 		m.SerializeToString(&message);
+	}
 	// Send normal message
 	if (!msg->getBody().empty() || !xhtml.empty()) {
 #if HAVE_SWIFTEN_3
 	std::string body = msg->getBody().value_or("");
 #else
 	std::string body = msg->getBody();
 #endif
 	if (!body.empty() || !xhtml.empty()) {
 		pbnetwork::ConversationMessage m;
 		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());
 		m.set_buddyname(conv->getLegacyName());
-		m.set_message(msg->getBody());
+		m.set_message(body);
 		m.set_xhtml(xhtml);
 		boost::shared_ptr<Swift::DeliveryReceiptRequest> receiptPayload = msg->getPayload<Swift::DeliveryReceiptRequest>();
 		if (receiptPayload && !msg->getID().empty()) {

libtransport/UserManager.cpp

➞

Show inline comments

 		messageToBackendSent();
+	}
 	if (message->getBody().empty() && !statePayload && message->getSubject().empty()) {
 #if HAVE_SWIFTEN_3
 	std::string body = message->getBody().value_or("");
 #else
 	std::string body = message->getBody();
 #endif
 	if (body.empty() && !statePayload && message->getSubject().empty()) {
 		return;
+	}

spectrum/src/frontends/slack/SlackSession.cpp

➞

Show inline comments

@@ @@ -39,6 +39,8 @@ @@
 #include <boost/algorithm/string.hpp>
 #include "Swiften/Elements/MUCPayload.h"
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 #include <map>
 #include <iterator>
+	}
 	LOG4CXX_INFO(logger, m_uinfo.jid << "Sending message to Slack channel " << channel << " from " << from);
 	m_rtm->getAPI()->sendMessage(from, channel, message->getBody());
 #if HAVE_SWIFTEN_3
 	std::string body = message->getBody().value_or("");
 #else
 	std::string body = message->getBody();
 #endif
 	m_rtm->getAPI()->sendMessage(from, channel, body);
+}
 void SlackSession::setPurpose(const std::string &purpose, const std::string &channel) {

spectrum/src/frontends/slack/SlackUserManager.cpp

➞

Show inline comments

@@ @@ -32,6 +32,9 @@ @@
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 DEFINE_LOGGER(logger, "SlackUserManager");
@@ @@ -106,8 +109,13 @@ void SlackUserManager::handleUserCreated(User *user) { @@
+}
 bool SlackUserManager::handleAdminMessage(Swift::Message::ref message) {
 	if (message->getBody().find("list_rooms") == 0) {
 		std::string body = message->getBody();
 #if HAVE_SWIFTEN_3
 	std::string body = message->getBody().value_or("");
 #else
 	std::string body = message->getBody();
 #endif
 	if (body.find("list_rooms") == 0) {
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 2) {
 			return true;
+		}
+	}
 	else if (message->getBody().find("join_room ") == 0) {
 		std::string body = message->getBody();
 	else if (body.find("join_room ") == 0) {
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 6) {
 			std::string rooms = "";
 			int type = (int) TYPE_STRING;
 			m_storageBackend->getUserSetting(uinfo.id, "rooms", type, rooms);
-			rooms += message->getBody() + "\n";
+			rooms += body + "\n";
 			m_storageBackend->updateUserSetting(uinfo.id, "rooms", rooms);
 			SlackUser *user = static_cast<SlackUser *>(getUser(args[1]));
 			return true;
+		}
+	}
 	else if (message->getBody().find("leave_room ") == 0) {
 		std::string body = message->getBody();
 	else if (body.find("leave_room ") == 0) {
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 3) {

tests/libtransport/conversationmanager.cpp

➞

Show inline comments

@@ @@ -13,6 +13,10 @@ @@
 using namespace Transport;
 #if !HAVE_SWIFTEN_3
 #define value_or(X) substr()
 #endif
 class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(ConversationManagerTest);
 	CPPUNIT_TEST(conversationSize);
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40test@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("response<>!"), m_msg->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("response<>!"), m_msg->getBody().value_or(""));
 		// send another message from legacy network, should be sent to user@localhost/resource now
 		boost::shared_ptr<Swift::Message> msg2(new Swift::Message());
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40test@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1%test@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), m_msg->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), m_msg->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("BuddY1"), m_conv->getLegacyName());
 		TestingConversation *conv = (TestingConversation *) user->getConversationManager()->getConversation("BuddY1");
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Message::Headline, dynamic_cast<Swift::Message *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40test@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Message::Chat, dynamic_cast<Swift::Message *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40test@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Message::Chat, dynamic_cast<Swift::Message *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there<>!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40test@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
+	}
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("response!"), m_msg->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("response!"), m_msg->getBody().value_or(""));
+	}
 	void handleGroupchatMessagesAlias() {
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/alias"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());
+	}
 		CPPUNIT_ASSERT_EQUAL(303, getStanza(received[2])->getPayload<Swift::MUCUserPayload>()->getStatusCodes()[2].code);
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[4])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getFrom().toString());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[5])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there2!"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there2!"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(303, getStanza(received[2])->getPayload<Swift::MUCUserPayload>()->getStatusCodes()[2].code);
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[4])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[4]))->getFrom().toString());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[5])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there2!"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there2!"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[5]))->getFrom().toString());
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received2.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received2[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received2[0]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received2[0]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource2"), dynamic_cast<Swift::Message *>(getStanza(received2[0]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received2[0]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("response!"), m_msg->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("response!"), m_msg->getBody().value_or(""));
+	}
 	void handleParticipantChanged() {
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), m_msg->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), m_msg->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("#room/anotheruser"), m_conv->getLegacyName());
 		Conversation *pmconv = user->getConversationManager()->getConversation("#room/anotheruser");

tests/libtransport/user.cpp

➞

Show inline comments

@@ @@ -12,6 +12,10 @@ @@
 using namespace Transport;
 #if !HAVE_SWIFTEN_3
 #define value_or(X) substr()
 #endif
 class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(UserTest);
 	CPPUNIT_TEST(sendCurrentPresence);
 		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
 		Swift::Message *m = dynamic_cast<Swift::Message *>(getStanza(received[0]));
 		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody().value_or(""));
 		CPPUNIT_ASSERT(dynamic_cast<Swift::StreamError *>(received[1].get()));
 		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), dynamic_cast<Swift::StreamError *>(received[1].get())->getText());

tests/libtransport/usermanager.cpp

➞

Show inline comments

@@ @@ -12,6 +12,10 @@ @@
 using namespace Transport;
 #if !HAVE_SWIFTEN_3
 #define value_or(X) substr()
 #endif
 class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(UserManagerTest);
 	CPPUNIT_TEST(connectUser);
 		CPPUNIT_ASSERT_EQUAL(3, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(std::string("Ahoj"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("Ahoj"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getFrom().toString());

tests/libtransport/userregistration.cpp

➞

Show inline comments

@@ @@ -12,6 +12,10 @@ @@
 using namespace Transport;
 #if !HAVE_SWIFTEN_3
 #define value_or(X) substr()
 #endif
 class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(UserRegistrationTest);
 	CPPUNIT_TEST(getForm);
 			CPPUNIT_ASSERT_EQUAL(std::string("localhost"), getStanza(received[0])->getPayload<Swift::RosterPayload>()->getItems()[0].getJID().toString());
 			CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 			CPPUNIT_ASSERT_EQUAL(std::string("registered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody());
+			CPPUNIT_ASSERT_EQUAL(std::string("registered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));
 			UserInfo user;
 			CPPUNIT_ASSERT_EQUAL(true, storage->getUser("user@localhost", user));
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::RosterPayload>());
 			CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 			CPPUNIT_ASSERT_EQUAL(std::string("unregistered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody());
+			CPPUNIT_ASSERT_EQUAL(std::string("unregistered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));
 			UserInfo user;

0 comments (0 inline, 0 general)