libtransport.git Changeset - dc1cc4170e4a

Changeset - dc1cc4170e4a

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 13 years ago 2012-10-31 09:39:03
hanzz.k@gmail.com

Do not forward user's contact (representing himself) from legacy network (situation when user A has himself in his XMPP roster)

3 files changed with 20 insertions and 4 deletions:

src/networkpluginserver.cpp

src/tests/networkpluginserver.cpp

src/tests/usermanager.cpp

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

+	}
 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;
 	LocalBuddy *buddy = (LocalBuddy *) user->getRosterManager()->getBuddy(payload.buddyname());
 	if (buddy) {
 		handleBuddyPayload(buddy, payload);
 		buddy->handleBuddyChanged();
+	}
 	else {
 		if (payload.buddyname() == user->getUserInfo().uin) {
 			return;
+		}
 		std::vector<std::string> groups;
 		for (int i = 0; i < payload.group_size(); i++) {
 			groups.push_back(payload.group(i));
+		}
 		if (CONFIG_BOOL_DEFAULTED(m_config, "service.jid_escaping", true)) {
 			buddy = new LocalBuddy(user->getRosterManager(), -1, payload.buddyname(), payload.alias(), groups, BUDDY_JID_ESCAPING);
+		}
 		else {
 			buddy = new LocalBuddy(user->getRosterManager(), -1, payload.buddyname(), payload.alias(), groups, BUDDY_NO_FLAG);
+		}
 		if (!buddy->isValid()) {
 			delete buddy;
 			return;
+		}
 		buddy->setStatus(Swift::StatusShow((Swift::StatusShow::Type) payload.status()), payload.statusmessage());
 		buddy->setIconHash(payload.iconhash());
 		buddy->setBlocked(payload.blocked());
 		user->getRosterManager()->setBuddy(buddy);
+	}
+}
 void NetworkPluginServer::handleBuddyRemovedPayload(const std::string &data) {
 	pbnetwork::Buddy payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;

src/tests/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -20,24 +20,25 @@ @@
 #include <Swiften/Network/DummyConnectionServer.h>
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "basictest.h"
 using namespace Transport;
 class NetworkPluginServerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(NetworkPluginServerTest);
 	CPPUNIT_TEST(handleBuddyChangedPayload);
 	CPPUNIT_TEST(handleBuddyChangedPayloadNoEscaping);
 	CPPUNIT_TEST(handleBuddyChangedPayloadUserContactInRoster);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		NetworkPluginServer *serv;
 		void setUp (void) {
 			setMeUp();
 			serv = new NetworkPluginServer(component, cfg, userManager, NULL, NULL);
 			connectUser();
 			received.clear();
+		}
 			serv->handleBuddyChangedPayload(message);
 			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 			Swift::RosterPayload::ref payload1 = getStanza(received[0])->getPayload<Swift::RosterPayload>();
 			CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
 			Swift::RosterItemPayload item = payload1->getItems()[0];
 			CPPUNIT_ASSERT_EQUAL(std::string("buddy1%test@localhost"), item.getJID().toString());
 			std::istringstream ifs2("service.server_mode = 1\nservice.jid_escaping=1\nservice.jid=localhost\nservice.more_resources=1\n");
 			cfg->load(ifs2);
+		}
 		void handleBuddyChangedPayloadUserContactInRoster() {
 			User *user = userManager->getUser("user@localhost");
 			pbnetwork::Buddy buddy;
 			buddy.set_username("user@localhost");
 			buddy.set_buddyname("user");
 			std::string message;
 			buddy.SerializeToString(&message);
 			serv->handleBuddyChangedPayload(message);
 			CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
+		}
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (NetworkPluginServerTest);

src/tests/usermanager.cpp

➞

Show inline comments

 		CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount());
 		CPPUNIT_ASSERT(!streamEnded);
+	}
 	void handleProbePresence() {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("localhost");
 		response->setFrom("user@localhost/resource");
 		response->setType(Swift::Presence::Probe);
 		dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->onPresenceReceived(response);
 		loop->processEvents();
-		CPPUNIT_ASSERT_EQUAL(4, (int) received.size());
+		CPPUNIT_ASSERT_EQUAL(3, (int) received.size());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());
 		Swift::Presence *presence = dynamic_cast<Swift::Presence *>(getStanza(received[1]));
 		CPPUNIT_ASSERT(presence);
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, presence->getType());
 		presence = dynamic_cast<Swift::Presence *>(getStanza(received[2]));
 		CPPUNIT_ASSERT(presence);
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribe, presence->getType());
 		presence = dynamic_cast<Swift::Presence *>(getStanza(received[3]));
 		CPPUNIT_ASSERT(presence);
 		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribed, presence->getType());
+	}
 	void connectTwoResources() {
 		connectUser();
 		add2Buddies();
 		connectSecondResource();
 		// we should get presences
 		CPPUNIT_ASSERT_EQUAL(4, (int) received2.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received2[2])));
 		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received2[2]))->getShow());
 		CPPUNIT_ASSERT_EQUAL(std::string("status1"), dynamic_cast<Swift::Presence *>(getStanza(received2[2]))->getStatus());

0 comments (0 inline, 0 general)