libtransport.git Changeset - c80c02ccb158

Changeset - c80c02ccb158

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 9 years ago 2016-02-10 17:02:06
jkaluza@redhat.com

Libtransport: Rename user when he tries to connect to room from second client with different nickname than he used with first client

4 files changed with 79 insertions and 33 deletions:

include/transport/Conversation.h

libtransport/Conversation.cpp

libtransport/User.cpp

tests/libtransport/conversationmanager.cpp

0 comments (0 inline, 0 general)

include/transport/Conversation.h

➞

Show inline comments

@@ @@ -118,62 +118,63 @@ class Conversation { @@
 		/// Returns True if this conversation is MUC room.
 		/// \return  True if this conversation is MUC room.
 		bool isMUC() {
 			return m_muc;
+		}
 		/// Sets room name associated with this Conversation.
 		/// This is used to detect Private messages associated with particular room.
 		/// \param room room name associated with this Conversation.
 		void setRoom(const std::string &room);
 		/// Returns room name associated with this Conversation.
 		/// \return room name associated with this Conversation.
 		const std::string &getRoom() {
 			return m_room;
+		}
 		void destroyRoom();
 		std::string getParticipants();
 		void sendParticipants(const Swift::JID &to);
+		void sendParticipants(const Swift::JID &to, const std::string &nickname);
 		void sendCachedMessages(const Swift::JID &to = Swift::JID());
 		void setMUCEscaping(bool mucEscaping);
 	private:
 		Swift::Presence::ref generatePresence(const std::string &nick, int flag, int status, const std::string &statusMessage, const std::string &newname = "", const std::string &iconhash = "");
 		void cacheMessage(boost::shared_ptr<Swift::Message> &message);
 	private:
 		ConversationManager *m_conversationManager;
 		std::string m_legacyName;
 		std::string m_nickname;
 		std::string m_room;
 		bool m_muc;
 		Swift::JID m_jid;
 		std::list<Swift::JID> m_jids;
 		bool m_sentInitialPresence;
 		bool m_nicknameChanged;
 		bool m_mucEscaping;
 		bool m_sentInitialSubject;
 		// TODO: Move this to some extra class to cache the most used
 		// rooms across different accounts. Just now if we have 10 users
 		// connected to single room, we store all those things 10 times.
 		// It would be also great to store last 100 messages per room
 		// every time, so we can get history messages for IRC for example.
 		boost::shared_ptr<Swift::Message> m_subject;
 		std::list<boost::shared_ptr<Swift::Message> > m_cachedMessages;
 		typedef struct {
 			Swift::Presence::ref presence;
 			std::string alias;
 		} Participant;
 		std::map<std::string, Participant> m_participants;
 };
+}

libtransport/Conversation.cpp

➞

Show inline comments

@@ @@ -26,48 +26,49 @@ @@
 #include "transport/Buddy.h"
 #include "transport/RosterManager.h"
 #include "transport/Frontend.h"
 #include "transport/Config.h"
 #include "transport/Logging.h"
 #include "Swiften/Elements/MUCItem.h"
 #include "Swiften/Elements/MUCOccupant.h"
 #include "Swiften/Elements/MUCUserPayload.h"
 #include "Swiften/Elements/Delay.h"
 #include "Swiften/Elements/MUCPayload.h"
 #include "Swiften/Elements/VCardUpdate.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "Conversation");
 Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) {
 	m_legacyName = legacyName;
 	m_muc = isMUC;
 	m_jid = m_conversationManager->getUser()->getJID().toBare();
 	m_sentInitialPresence = false;
 	m_nicknameChanged = false;
 	m_mucEscaping = false;
 	m_sentInitialSubject = false;
 	if (CONFIG_BOOL_DEFAULTED(conversationManager->getComponent()->getConfig(), "features.rawxml", false)) {
 		m_sentInitialPresence = true;
+	}
+}
 Conversation::~Conversation() {
+}
 void Conversation::setMUCEscaping(bool mucEscaping) {
 	LOG4CXX_INFO(logger, m_jid.toString() << ": Setting MUC escaping to " << mucEscaping);
 	m_mucEscaping = mucEscaping;
+}
 void Conversation::destroyRoom() {
 	if (m_muc) {
 		Swift::Presence::ref presence = Swift::Presence::create();
 		std::string legacyName = m_legacyName;
 		if (!m_mucEscaping && legacyName.find_last_of("@") != std::string::npos) {
 			legacyName.replace(legacyName.find_last_of("@"), 1, "%"); // OK
+		}
 		legacyName = Swift::JID::getEscapedNode(legacyName);
 		presence->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), m_nickname));
 		presence->setType(Swift::Presence::Unavailable);
 	message->addPayload(delay);
 	m_cachedMessages.push_back(message);
 	if (m_cachedMessages.size() > 100) {
 		m_cachedMessages.pop_front();
+	}
+}
 void Conversation::handleRawMessage(boost::shared_ptr<Swift::Message> &message) {
 	if (message->getType() != Swift::Message::Groupchat) {
 		if (m_conversationManager->getComponent()->inServerMode() && m_conversationManager->getUser()->shouldCacheMessages()) {
 			cacheMessage(message);
+		}
 		else {
 			m_conversationManager->getComponent()->getFrontend()->sendMessage(message);
+		}
+	}
 	else {
 		if (m_jids.empty()) {
 			cacheMessage(message);
+		}
 		else {
 			BOOST_FOREACH(const Swift::JID &jid, m_jids) {
 				message->setTo(jid);
 				// Subject has to be sent after our own presence (the one with code 110)
-				if (!message->getSubject().empty() && m_sentInitialPresence == false) {
 				if (!message->getSubject().empty()) {
 					m_subject = message;
 					return;
 					if (m_sentInitialPresence == false) {
 						return;
+					}
+				}
 				m_conversationManager->getComponent()->getFrontend()->sendMessage(message);
+			}
+		}
+	}
+}
 void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, const std::string &nickname) {
 	if (m_muc) {
 		message->setType(Swift::Message::Groupchat);
+	}
 	else {
 		if (message->getType() == Swift::Message::Headline) {
 			if (m_conversationManager->getUser()->getUserSetting("send_headlines") != "1") {
 				message->setType(Swift::Message::Chat);
+			}
+		}
 		else {
 			message->setType(Swift::Message::Chat);
+		}
+	}
 	std::string n = nickname;
 	if (n.empty() && !m_room.empty() && !m_muc) {
 		if (n.empty()) {
 			n = " ";
+		}
 		std::map<std::string, Participant>::iterator it = m_participants.find(n);
 		if (it != m_participants.end() && !it->second.alias.empty()) {
 			n = it->second.alias;
+		}
 		message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), n));
 		LOG4CXX_INFO(logger, "MSG FROM " << message->getFrom().toString());
+	}
 	handleRawMessage(message);
+}
 std::string Conversation::getParticipants() {
 	std::string ret;
 	for (std::map<std::string, Participant>::iterator it = m_participants.begin(); it != m_participants.end(); it++) {
 		ret += (*it).second.presence->getFrom().getResource() + ", ";
+	}
 	return ret;
+}
 void Conversation::sendParticipants(const Swift::JID &to) {
 void Conversation::sendParticipants(const Swift::JID &to, const std::string &nickname) {
 	// When user tries to join this room from another resource using
 	// different nickname than the original one has, we have to rename
 	// him.
 	if (m_nickname != nickname && !nickname.empty()) {
 		Swift::Presence::ref presence;
 		std::string tmp = m_nickname;
 		// At first connect the user.
 		m_nickname = nickname;
 		presence = generatePresence(nickname, 0, (int) Swift::StatusShow::Online, "", "", "");
 		presence->setTo(to);
 		m_conversationManager->getComponent()->getFrontend()->sendPresence(presence);
 		// Now change his nickname to the right one.
 		m_nicknameChanged = true;
 		presence = generatePresence(nickname, 0, (int) Swift::StatusShow::Online, "", tmp, "");
 		presence->setTo(to);
 		m_conversationManager->getComponent()->getFrontend()->sendPresence(presence);
 		// And send the presence from as new user
 		m_nickname = tmp;
 		presence = generatePresence(m_nickname, 0, (int) Swift::StatusShow::Online, "", "", "");
 		presence->setTo(to);
 		m_conversationManager->getComponent()->getFrontend()->sendPresence(presence);
+	}
 	for (std::map<std::string, Participant>::iterator it = m_participants.begin(); it != m_participants.end(); it++) {
 		(*it).second.presence->setTo(to);
 		m_conversationManager->getComponent()->getFrontend()->sendPresence((*it).second.presence);
+	}
+}
 void Conversation::sendCachedMessages(const Swift::JID &to) {
 	for (std::list<boost::shared_ptr<Swift::Message> >::const_iterator it = m_cachedMessages.begin(); it != m_cachedMessages.end(); it++) {
 		if (to.isValid()) {
 			(*it)->setTo(to);
+		}
 		else {
 			(*it)->setTo(m_jid.toBare());
+		}
 		m_conversationManager->getComponent()->getFrontend()->sendMessage(*it);
+	}
 	if (m_subject) {
 		if (to.isValid()) {
 			m_subject->setTo(to);
+		}
 		else {
 			m_subject->setTo(m_jid.toBare());
+		}
 void Conversation::removeJID(const Swift::JID &jid) {
 	m_jids.remove(jid);
+}
 void Conversation::handleParticipantChanged(const std::string &nick, Conversation::ParticipantFlag flag, int status, const std::string &statusMessage, const std::string &newname, const std::string &iconhash, const std::string &alias) {
 	Swift::Presence::ref presence = generatePresence(alias.empty() ? nick : alias, flag, status, statusMessage, newname, iconhash);
 	if (presence->getType() == Swift::Presence::Unavailable) {
 		m_participants.erase(nick);
+	}
 	else {
 		m_participants[nick].presence = presence;
 		m_participants[nick].alias = alias;
+	}
 	BOOST_FOREACH(const Swift::JID &jid, m_jids) {
 		presence->setTo(jid);
 		m_conversationManager->getComponent()->getFrontend()->sendPresence(presence);
+	}
 	if (!newname.empty()) {
 		handleParticipantChanged(newname, flag, status, statusMessage, "", iconhash);
+	}
 	if (m_sentInitialPresence && m_subject) {
 	if (m_sentInitialPresence && !m_sentInitialSubject && m_subject) {
 		m_sentInitialSubject = true;
 		m_conversationManager->getComponent()->getFrontend()->sendMessage(m_subject);
 		m_subject.reset();
+	}
 	// We send error presences only to inform user that he is disconnected
 	// from the room. This code must be extended in case we start sending error
 	// presences in other situations.
 	if (presence->getType() == Swift::Presence::Error) {
 		m_conversationManager->getUser()->leaveRoom(m_legacyName);
+	}
+}
+}

libtransport/User.cpp

➞

Show inline comments

 			return;
+		}
 		else if (isMUC) {
 			// force connection to legacy network to let backend to handle auto-join on connect.
 			if (!m_readyForConnect) {
 				LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network");
 				m_readyForConnect = true;
 				onReadyToConnect();
+			}
 			std::string room = Buddy::JIDToLegacyName(presence->getTo());
 			std::string password = "";
 			if (presence->getPayload<Swift::MUCPayload>() != NULL) {
 				password = presence->getPayload<Swift::MUCPayload>()->getPassword() ? *presence->getPayload<Swift::MUCPayload>()->getPassword() : "";
+			}
 			Conversation *conv = m_conversationManager->getConversation(room);
 			if (conv != NULL) {
 				if (std::find(conv->getJIDs().begin(), conv->getJIDs().end(), presence->getFrom()) != conv->getJIDs().end()) {
 					LOG4CXX_INFO(logger, m_jid.toString() << ": User has already tried to join room " << room << " as " << presence->getTo().getResource());
+				}
 				else {
 					conv->addJID(presence->getFrom());
 					conv->sendParticipants(presence->getFrom());
+					conv->sendParticipants(presence->getFrom(), presence->getTo().getResource());
 					conv->sendCachedMessages(presence->getFrom());
+				}
 				if (forceJoin) {
 					onRawPresenceReceived(presence);
 					onRoomJoined(presence->getFrom(), room, presence->getTo().getResource(), password);
+				}
 				return;
+			}
 			bool isInJoined = false;
 			BOOST_FOREACH(Swift::Presence::ref &p, m_joinedRooms) {
 				if (p->getTo() == presence->getTo()) {
 					isInJoined = true;
+				}
+			}
 			if (!isInJoined) {
 				m_joinedRooms.push_back(presence);
+			}
 			if (!m_connected) {
 				LOG4CXX_INFO(logger, m_jid.toString() << ": Joining room " << room << " postponed, because use is not connected to legacy network yet.");
 				return;
+			}

tests/libtransport/conversationmanager.cpp

➞

Show inline comments

+	}
 	void handleSubjectMessages() {
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
 		conv->setNickname("nickname");
 		conv->addJID("user@localhost/resource");
 		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 		msg->setSubject("subject");
 		msg->setType(Swift::Message::Groupchat);
 		conv->handleMessage(msg);
 		loop->processEvents();
 		// No response, because presence with code 110 has not been sent yet and we must not send
 		// subject before this one.
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		// this user presence - status code 110
 		conv->handleParticipantChanged("nickname", Conversation::PARTICIPANT_FLAG_MODERATOR, Swift::StatusShow::Away, "my status message");
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getSubject());
 		received.clear();
 		// send response
 		msg->setFrom("user@localhost/resource");
 		msg->setTo("#room@localhost");
 		injectMessage(msg);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), m_msg->getSubject());
 		received.clear();
+	}
 	void handleNormalMessages() {
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "buddy1@test");
 		user->getConversationManager()->addConversation(conv);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
 		msg->setBody("hi there!");
 		conv->handleMessage(msg, "anotheruser");
 		boost::shared_ptr<Swift::Message> msg2(new Swift::Message());
 		msg2->setBody("hi there2!");
 		conv->handleMessage(msg2, "anotheruser");
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		userRegistry->isValidUserPassword(Swift::JID("user@localhost/resource"), serverFromClientSession.get(), Swift::createSafeByteArray("password"));
 		userRegistry->onPasswordValid(Swift::JID("user@localhost/resource"));
 		loop->processEvents();
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("#room@localhost/hanzz");
 		response->setFrom("user@localhost/resource");
 		Swift::MUCPayload *payload = new Swift::MUCPayload();
 		payload->setPassword("password");
 		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));
 		injectPresence(response);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(4, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getFrom().toString());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[2])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there2!"), dynamic_cast<Swift::Message *>(getStanza(received[2]))->getBody());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[2]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[2]))->getFrom().toString());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[3])));
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[3]))->getSubject());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[3]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[3]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(7, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[2])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, dynamic_cast<Swift::Presence *>(getStanza(received[2]))->getType());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Presence *>(getStanza(received[2]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/hanzz"), dynamic_cast<Swift::Presence *>(getStanza(received[2]))->getFrom().toString());
 		CPPUNIT_ASSERT(getStanza(received[2])->getPayload<Swift::MUCUserPayload>());
 		CPPUNIT_ASSERT_EQUAL(std::string("nickname"), *getStanza(received[2])->getPayload<Swift::MUCUserPayload>()->getItems()[0].nick);
 		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("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("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(dynamic_cast<Swift::Message *>(getStanza(received[6])));
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[6]))->getSubject());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[6]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[6]))->getFrom().toString());
+	}
 	void handleGroupchatMessagesBouncerLeave() {
 		User *user = userManager->getUser("user@localhost");
 		user->addUserSetting("stay_connected", "1");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);
 		user->getConversationManager()->addConversation(conv);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
 		conv->setNickname("nickname");
 		conv->addJID("user@localhost/resource");
 		CPPUNIT_ASSERT(!user->shouldCacheMessages());
 		Swift::Presence::ref response3 = Swift::Presence::create();
 		response3->setType(Swift::Presence::Unavailable);
 		response3->setTo("#room@localhost/hanzz");
 		response3->setFrom("user@localhost/resource");
 		Swift::MUCPayload *payload3 = new Swift::MUCPayload();
 		payload3->setPassword("password");
 		response3->addPayload(boost::shared_ptr<Swift::Payload>(payload3));
 		injectPresence(response3);
 		loop->processEvents();
 		msg->setBody("hi there!");
 		conv->handleMessage(msg, "anotheruser");
 		boost::shared_ptr<Swift::Message> msg2(new Swift::Message());
 		msg2->setBody("hi there2!");
 		conv->handleMessage(msg2, "anotheruser");
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		userRegistry->isValidUserPassword(Swift::JID("user@localhost/resource"), serverFromClientSession.get(), Swift::createSafeByteArray("password"));
 		userRegistry->onPasswordValid(Swift::JID("user@localhost/resource"));
 		loop->processEvents();
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("#room@localhost/hanzz");
 		response->setFrom("user@localhost/resource");
 		Swift::MUCPayload *payload = new Swift::MUCPayload();
 		payload->setPassword("password");
 		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));
 		injectPresence(response);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(3, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getFrom().toString());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[2])));
 		CPPUNIT_ASSERT_EQUAL(std::string("hi there2!"), dynamic_cast<Swift::Message *>(getStanza(received[2]))->getBody());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[2]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/anotheruser"), dynamic_cast<Swift::Message *>(getStanza(received[2]))->getFrom().toString());
 		CPPUNIT_ASSERT_EQUAL(6, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[2])));
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, dynamic_cast<Swift::Presence *>(getStanza(received[2]))->getType());
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Presence *>(getStanza(received[2]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost/hanzz"), dynamic_cast<Swift::Presence *>(getStanza(received[2]))->getFrom().toString());
 		CPPUNIT_ASSERT(getStanza(received[2])->getPayload<Swift::MUCUserPayload>());
 		CPPUNIT_ASSERT_EQUAL(std::string("nickname"), *getStanza(received[2])->getPayload<Swift::MUCUserPayload>()->getItems()[0].nick);
 		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("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("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());
+	}
 	void handleGroupchatMessagesTwoResources() {
 		connectSecondResource();
 		received2.clear();
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);
 		user->getConversationManager()->addConversation(conv);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
 		conv->setNickname("nickname");
 		conv->addJID("user@localhost/resource");
 		conv->addJID("user@localhost/resource2");
 		// reset resources should not touch this resource
 		user->getConversationManager()->resetResources();
 		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 		msg->setBody("hi there!");
 		// Forward it
 		conv->handleMessage(msg, "anotheruser");
 		loop->processEvents();

0 comments (0 inline, 0 general)