libtransport.git Changeset - bb4ac38e5089

Changeset - bb4ac38e5089

Parent rev.

Child rev.

[Not reviewed]

0 11 0

Jan Kaluza - 13 years ago 2012-08-09 11:21:01
hanzz.k@gmail.com

Fixed tests

11 files changed with 87 insertions and 38 deletions:

include/transport/buddy.h

include/transport/localbuddy.h

src/buddy.cpp

src/localbuddy.cpp

src/networkpluginserver.cpp

src/tests/basictest.cpp

src/tests/basictest.h

src/tests/rostermanager.cpp

src/tests/user.cpp

src/transport.cpp

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/buddy.h

➞

Show inline comments

@@ @@ -44,13 +44,13 @@ class Buddy { @@
 					} Subscription;
 		/// Constructor.
 		/// \param rosterManager RosterManager associated with this buddy.
 		/// \param id ID which identifies the buddy in database or -1 if it's new buddy which is
 		/// not in database yet.
 		Buddy(RosterManager *rosterManager, long id = -1);
+		Buddy(RosterManager *rosterManager, long id = -1, BuddyFlag flags = BUDDY_NO_FLAG);
 		/// Destructor
 		virtual ~Buddy();
 		/// Sets unique ID used to identify this buddy by StorageBackend.

include/transport/localbuddy.h

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ @@
 #include "transport/rostermanager.h"
 namespace Transport {
 class LocalBuddy : public Buddy {
 	public:
 		LocalBuddy(RosterManager *rosterManager, long id);
+		LocalBuddy(RosterManager *rosterManager, long id, const std::string &name, const std::string &alias = "", const std::vector<std::string> &groups = std::vector<std::string>(), BuddyFlag flags = BUDDY_NO_FLAG);
 		virtual ~LocalBuddy();
 		std::string getAlias() { return m_alias; }
 		void setAlias(const std::string &alias);
 		std::string getName() { return m_name; }
@@ @@ -58,19 +58,22 @@ class LocalBuddy : public Buddy { @@
 				getRosterManager()->storeBuddy(this);
+		}
 		std::vector<std::string> getGroups() { return m_groups; }
 		void setGroups(const std::vector<std::string> &groups);
 		bool isValid() {
 			return m_jid.isValid();
+		}
 	private:
 		std::string m_name;
 		std::string m_alias;
 		std::vector<std::string> m_groups;
 		std::string m_statusMessage;
 		std::string m_iconHash;
 		Swift::StatusShow m_status;
 		bool m_firstSet;
 };
+}
 #endif

src/buddy.cpp

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ @@
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/BlockPayload.h"
 namespace Transport {
-Buddy::Buddy(RosterManager *rosterManager, long id) : m_id(id), m_flags(BUDDY_NO_FLAG), m_rosterManager(rosterManager),
+Buddy::Buddy(RosterManager *rosterManager, long id, BuddyFlag flags) : m_id(id), m_flags(flags), m_rosterManager(rosterManager),
 	m_subscription(Ask) {
 // 	m_rosterManager->setBuddy(this);
+}
 Buddy::~Buddy() {
 // 	m_rosterManager->unsetBuddy(this);

src/localbuddy.cpp

➞

Show inline comments

@@ @@ -20,15 +20,21 @@ @@
 #include "transport/localbuddy.h"
 #include "transport/user.h"
 namespace Transport {
 LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id) : Buddy(rosterManager, id) {
+LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id, const std::string &name, const std::string &alias, const std::vector<std::string> &groups, BuddyFlag flags) : Buddy(rosterManager, id, flags) {
 	m_status = Swift::StatusShow::None;
 	m_firstSet = true;
 	m_alias = alias;
 	m_name = name;
 	m_groups = groups;
 	try {
 		generateJID();
 	} catch (...) {
+	}
+}
 LocalBuddy::~LocalBuddy() {
+}
 bool LocalBuddy::setName(const std::string &name) {
@@ @@ -44,17 +50,12 @@ bool LocalBuddy::setName(const std::string &name) { @@
 		m_name = oldName;
 		return false;
+	}
+}
 void LocalBuddy::setAlias(const std::string &alias) {
 //	if (m_firstSet) {
 //		m_firstSet = false;
 //		m_alias = alias;
 //		return;
 //	}
 	bool changed = m_alias != alias;
 	m_alias = alias;
 	if (changed) {
 		if (getRosterManager()->getUser()->getComponent()->inServerMode() || getRosterManager()->isRemoteRosterSupported()) {
 			getRosterManager()->sendBuddyRosterPush(this);

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -81,35 +81,34 @@ class NetworkConversation : public Conversation { @@
 class NetworkFactory : public Factory {
 	public:
 		NetworkFactory(NetworkPluginServer *nps) {
 			m_nps = nps;
+		}
 		virtual ~NetworkFactory() {}
 		// Creates new conversation (NetworkConversation in this case)
 		Conversation *createConversation(ConversationManager *conversationManager, const std::string &legacyName) {
 			NetworkConversation *nc = new NetworkConversation(conversationManager, legacyName);
 			nc->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, m_nps, _1, _2));
 			return nc;
+		}
 		// Creates new LocalBuddy
 		Buddy *createBuddy(RosterManager *rosterManager, const BuddyInfo &buddyInfo) {
 			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id);
 			buddy->setAlias(buddyInfo.alias);
 			buddy->setFlags((BuddyFlag) (buddyInfo.flags));
 			if (!buddy->setName(buddyInfo.legacyName)) {
 			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id, buddyInfo.legacyName, buddyInfo.alias, buddyInfo.groups, (BuddyFlag) buddyInfo.flags);
 			if (!buddy->isValid()) {
 				delete buddy;
 				return NULL;
+			}
 			if (buddyInfo.subscription == "both") {
 				buddy->setSubscription(Buddy::Both);
+			}
 			else {
 				buddy->setSubscription(Buddy::Ask);
+			}
 			buddy->setGroups(buddyInfo.groups);
 			if (buddyInfo.settings.find("icon_hash") != buddyInfo.settings.end())
 				buddy->setIconHash(buddyInfo.settings.find("icon_hash")->second.s);
 			return buddy;
+		}
 	private:
 	LocalBuddy *buddy = (LocalBuddy *) user->getRosterManager()->getBuddy(payload.buddyname());
 	if (buddy) {
 		handleBuddyPayload(buddy, payload);
 		buddy->handleBuddyChanged();
+	}
 	else {
 		buddy = new LocalBuddy(user->getRosterManager(), -1);
 		if (!buddy->setName(payload.buddyname())) {
 		std::vector<std::string> groups;
 		for (int i = 0; i < payload.group_size(); i++) {
 			groups.push_back(payload.group(i));
+		}
 		buddy = new LocalBuddy(user->getRosterManager(), -1, payload.buddyname(), payload.alias(), groups, BUDDY_JID_ESCAPING);
 		if (!buddy->isValid()) {
 			delete buddy;
 			return;
+		}
 		buddy->setFlags(BUDDY_JID_ESCAPING);
 		handleBuddyPayload(buddy, payload);
 		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;

src/tests/basictest.cpp

➞

Show inline comments

@@ @@ -15,12 +15,30 @@ @@
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/GenericPayloadSerializer.h"
 #include "../storageparser.h"
 #include "Swiften/Parser/PayloadParsers/AttentionParser.h"
 #include "Swiften/Serializer/PayloadSerializers/AttentionSerializer.h"
 #include "Swiften/Parser/PayloadParsers/XHTMLIMParser.h"
 #include "Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.h"
 #include "Swiften/Parser/PayloadParsers/StatsParser.h"
 #include "Swiften/Serializer/PayloadSerializers/StatsSerializer.h"
 #include "Swiften/Parser/PayloadParsers/GatewayPayloadParser.h"
 #include "Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h"
 #include "Swiften/Parser/PayloadParsers/MUCPayloadParser.h"
 #include "transport/BlockParser.h"
 #include "transport/BlockSerializer.h"
 #include "Swiften/Parser/PayloadParsers/InvisibleParser.h"
 #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h"
 using namespace Transport;
 void BasicTest::setMeUp (void) {
 	streamEnded = false;
 	std::istringstream ifs("service.server_mode = 1\nservice.jid=localhost");
 	cfg = new Config();
@@ @@ -37,23 +55,42 @@ void BasicTest::setMeUp (void) { @@
 	component->start();
 	userManager = new UserManager(component, userRegistry);
 	payloadSerializers = new Swift::FullPayloadSerializerCollection();
 	payloadParserFactories = new Swift::FullPayloadParserFactoryCollection();
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::AttentionParser>("attention", "urn:xmpp:attention:0"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::XHTMLIMParser>("html", "http://jabber.org/protocol/xhtml-im"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Transport::BlockParser>("block", "urn:xmpp:block:0"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::InvisibleParser>("invisible", "urn:xmpp:invisible:0"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::StatsParser>("query", "http://jabber.org/protocol/stats"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::GatewayPayloadParser>("query", "jabber:iq:gateway"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::MUCPayloadParser>("x", "http://jabber.org/protocol/muc"));
 	payloadSerializers->addSerializer(new Swift::AttentionSerializer());
 	payloadSerializers->addSerializer(new Swift::XHTMLIMSerializer());
 	payloadSerializers->addSerializer(new Transport::BlockSerializer());
 	payloadSerializers->addSerializer(new Swift::InvisibleSerializer());
 	payloadSerializers->addSerializer(new Swift::StatsSerializer());
 	payloadSerializers->addSerializer(new Swift::SpectrumErrorSerializer());
 	payloadSerializers->addSerializer(new Swift::GatewayPayloadSerializer());
 	parser = new Swift::XMPPParser(this, payloadParserFactories, factories->getXMLParserFactory());
 	serverFromClientSession = boost::shared_ptr<Swift::ServerFromClientSession>(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(),
 			payloadParserFactories, payloadSerializers, userRegistry, factories->getXMLParserFactory(), Swift::JID("user@localhost/resource")));
 	serverFromClientSession->startSession();
 	serverFromClientSession->onDataWritten.connect(boost::bind(&BasicTest::handleDataReceived, this, _1));
 	dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->addSession(serverFromClientSession);
 	parser->parse("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' to='localhost' version='1.0'>");
 	received.clear();
 	receivedData.clear();
 	loop->processEvents();
+}
 void BasicTest::tearMeDown (void) {
 	dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->removeSession(serverFromClientSession);
 	delete component;
@@ @@ -61,23 +98,29 @@ void BasicTest::tearMeDown (void) { @@
 	delete factories;
 	delete factory;
 	delete loop;
 	delete cfg;
 	delete parser;
 	received.clear();
 	receivedData.clear();
+}
 void BasicTest::handleDataReceived(const Swift::SafeByteArray &data) {
 // 	std::cout << safeByteArrayToString(data) << "\n";
 	receivedData += safeByteArrayToString(data) + "\n";
 	parser->parse(safeByteArrayToString(data));
+}
 void BasicTest::handleStreamStart(const Swift::ProtocolHeader&) {
+}
 void BasicTest::dumpReceived() {
 	std::cout << receivedData << "\n";
+}
 void BasicTest::handleElement(boost::shared_ptr<Swift::Element> element) {
 	received.push_back(element);
+}
 void BasicTest::handleStreamEnd() {
 	streamEnded = true;

src/tests/basictest.h

➞

Show inline comments

@@ @@ -66,18 +66,18 @@ class TestingFactory : public Factory { @@
 			Conversation *nc = new TestingConversation(conversationManager, legacyName);
 			return nc;
+		}
 		// Creates new LocalBuddy
 		Buddy *createBuddy(RosterManager *rosterManager, const BuddyInfo &buddyInfo) {
 			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id);
 			buddy->setAlias(buddyInfo.alias);
 			buddy->setName(buddyInfo.legacyName);
 			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id, buddyInfo.legacyName, buddyInfo.alias, buddyInfo.groups, (BuddyFlag) buddyInfo.flags);
 			if (!buddy->isValid()) {
 				delete buddy;
 				return NULL;
+			}
 			buddy->setSubscription(Buddy::Ask);
 			buddy->setGroups(buddyInfo.groups);
 			buddy->setFlags((BuddyFlag) buddyInfo.flags);
 			if (buddyInfo.settings.find("icon_hash") != buddyInfo.settings.end())
 				buddy->setIconHash(buddyInfo.settings.find("icon_hash")->second.s);
 			return buddy;
+		}
 };
@@ @@ -96,12 +96,14 @@ class BasicTest : public Swift::XMPPParserClient { @@
 	void handleStreamEnd();
 	void injectPresence(boost::shared_ptr<Swift::Presence> &response);
 	void injectIQ(boost::shared_ptr<Swift::IQ> iq);
 	void dumpReceived();
 	Swift::Stanza *getStanza(boost::shared_ptr<Swift::Element> element);
 	protected:
 		bool streamEnded;
 		UserManager *userManager;
 		boost::shared_ptr<Swift::ServerFromClientSession> serverFromClientSession;
@@ @@ -113,8 +115,9 @@ class BasicTest : public Swift::XMPPParserClient { @@
 		Swift::Server *server;
 		Swift::DummyNetworkFactories *factories;
 		Swift::DummyEventLoop *loop;
 		TestingFactory *factory;
 		Component *component;
 		std::vector<boost::shared_ptr<Swift::Element> > received;
 		std::string receivedData;
 };

src/tests/rostermanager.cpp

➞

Show inline comments

+	}
 	void add2Buddies() {
 		User *user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(user);
 		LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1);
 		buddy->setFlags(BUDDY_JID_ESCAPING);
 		buddy->setName("buddy1");
 		buddy->setAlias("Buddy 1");
 		std::vector<std::string> grp;
 		grp.push_back("group1");
-		buddy->setGroups(grp);
+		LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "Buddy 1", grp, BUDDY_JID_ESCAPING);
 		buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1");
 		user->getRosterManager()->setBuddy(buddy);
 		buddy = new LocalBuddy(user->getRosterManager(), -1);
 		buddy->setFlags(BUDDY_JID_ESCAPING);
 		buddy->setName("buddy2");
 		buddy->setAlias("Buddy 2");
 		std::vector<std::string> grp2;
 		grp2.push_back("group2");
-		buddy->setGroups(grp2);
+		buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy2", "Buddy 2", grp2, BUDDY_JID_ESCAPING);
 		buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status2");
 		user->getRosterManager()->setBuddy(buddy);
+	}
 	void setBuddy() {
 		add2Buddies();

src/tests/user.cpp

➞

Show inline comments

 			tearMeDown();
+		}
 	void handleUserCreated(User *user) {
 		user->onReadyToConnect.connect(boost::bind(&UserTest::handleUserReadyToConnect, this, user));
 		user->onPresenceChanged.connect(boost::bind(&UserTest::handleUserPresenceChanged, this, user, _1));
 		user->onRoomJoined.connect(boost::bind(&UserTest::handleRoomJoined, this, user, _1, _2, _3));
+		user->onRoomJoined.connect(boost::bind(&UserTest::handleRoomJoined, this, user, _1, _2, _3, _4));
 		user->onRoomLeft.connect(boost::bind(&UserTest::handleRoomLeft, this, user, _1));
+	}
 	void handleUserReadyToConnect(User *user) {
 		readyToConnect = true;
+	}
 	void handleUserPresenceChanged(User *user, Swift::Presence::ref presence) {
 		changedPresence = presence;
+	}
 	void handleRoomJoined(User *user, const std::string &r, const std::string &nickname, const std::string &password) {
+	void handleRoomJoined(User *user, const std::string &jid, const std::string &r, const std::string &nickname, const std::string &password) {
 		room = r;
 		roomNickname = nickname;
 		roomPassword = password;
+	}
 	void handleRoomLeft(User *user, const std::string &r) {
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
+	}
 	void handleDisconnected() {
 		User *user = userManager->getUser("user@localhost");
 		user->handleDisconnected("Connection error");
+		user->handleDisconnected("Connection error", Swift::SpectrumErrorPayload::CONNECTION_ERROR_AUTHENTICATION_FAILED);
 		loop->processEvents();
 		CPPUNIT_ASSERT(streamEnded);
 		user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(!user);

src/transport.cpp

➞

Show inline comments

@@ @@ -201,13 +201,15 @@ void Component::start() { @@
 	else if (m_server) {
 		LOG4CXX_INFO(logger, "Starting component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server->start();
 		//Type casting to BoostConnectionServer since onStopped signal is not defined in ConnectionServer
 		//Ideally, onStopped must be defined in ConnectionServer
 		if (boost::dynamic_pointer_cast<Swift::BoostConnectionServer>(m_server->getConnectionServer())) {
 			boost::dynamic_pointer_cast<Swift::BoostConnectionServer>(m_server->getConnectionServer())->onStopped.connect(boost::bind(&Component::handleServerStopped, this, _1));
+		}
 		// We're connected right here, because we're in server mode...
 		handleConnected();
+	}
+}

src/user.cpp

➞

Show inline comments

@@ @@ -176,12 +176,13 @@ void User::setConnected(bool connected) { @@
 	updateLastActivity();
 	sendCurrentPresence();
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	int currentResourcesCount = m_presenceOracle->getAllPresence(m_jid).size();
 	m_conversationManager->resetResources();
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)

0 comments (0 inline, 0 general)