libtransport.git Changeset - c86358c64f5f

Changeset - c86358c64f5f

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Jan Kaluza - 14 years ago 2011-10-19 14:35:27
hanzz.k@gmail.com

Preparation for better tests

6 files changed with 58 insertions and 8 deletions:

include/Swiften/Network/DummyNetworkFactories.cpp

include/Swiften/Network/DummyNetworkFactories.h

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

include/Swiften/Server/ServerStanzaChannel.cpp

src/tests/component.cpp

0 comments (0 inline, 0 general)

include/Swiften/Network/DummyNetworkFactories.cpp

➞

Show inline comments

@@ @@ -8,22 +8,24 @@ @@
 #include <Swiften/Network/DummyTimerFactory.h>
 #include <Swiften/Network/DummyConnectionFactory.h>
 #include <Swiften/Network/PlatformDomainNameResolver.h>
 #include <Swiften/Network/DummyConnectionServerFactory.h>
 namespace Swift {
 DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) {
 	timerFactory = new DummyTimerFactory();
 	connectionFactory = new DummyConnectionFactory(eventLoop);
 	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
 	connectionServerFactory = new DummyConnectionServerFactory(eventLoop);
 	m_platformXMLParserFactory =  new PlatformXMLParserFactory();
+}
 DummyNetworkFactories::~DummyNetworkFactories() {
 	delete connectionServerFactory;
 	delete domainNameResolver;
 	delete connectionFactory;
 	delete timerFactory;
 	delete m_platformXMLParserFactory;
+}
+}

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 #pragma once
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 namespace Swift {
 	class EventLoop;
 	class DummyNetworkFactories : public NetworkFactories {
 		public:
 			DummyNetworkFactories(EventLoop *eventLoop);
 			~DummyNetworkFactories();
 			virtual TimerFactory* getTimerFactory() const {
 				return timerFactory;
+			}
@@ @@ -28,30 +29,31 @@ namespace Swift { @@
 				return domainNameResolver;
+			}
 			ConnectionServerFactory* getConnectionServerFactory() const {
 				return connectionServerFactory;
+			}
 			virtual Swift::NATTraverser* getNATTraverser() const {
 				return 0;
+			}
 			Swift::XMLParserFactory* getXMLParserFactory() const {
-				return 0;
+				return m_platformXMLParserFactory;
+			}
             Swift::TLSContextFactory* getTLSContextFactory() const {
                 return 0;
+            }
             Swift::ProxyProvider* getProxyProvider() const {
                 return 0;
+            }
 		private:
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 	};
+}

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -27,33 +27,35 @@ @@
 #include <Swiften/Elements/StartTLSRequest.h>
 #include <Swiften/Elements/TLSProceed.h>
 #include <iostream>
 namespace Swift {
 ServerFromClientSession::ServerFromClientSession(
 		const std::string& id,
 		boost::shared_ptr<Connection> connection,
 		PayloadParserFactoryCollection* payloadParserFactories,
 		PayloadSerializerCollection* payloadSerializers,
 		UserRegistry* userRegistry,
 		XMLParserFactory* factory) :
 		XMLParserFactory* factory,
 		Swift::JID remoteJID) :
 			Session(connection, payloadParserFactories, payloadSerializers, factory),
 			id_(id),
 			userRegistry_(userRegistry),
 			authenticated_(false),
 			initialized(false),
 			allowSASLEXTERNAL(false),
 			tlsLayer(0),
 			tlsConnected(false) {
 				setRemoteJID(remoteJID);
+}
 ServerFromClientSession::~ServerFromClientSession() {
 	if (tlsLayer) {
 		delete tlsLayer;
+	}
+}
 void ServerFromClientSession::handlePasswordValid() {
 	if (!isInitialized()) {
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthSuccess>(new AuthSuccess()));
 		authenticated_ = true;

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -30,25 +30,26 @@ namespace Swift { @@
 	class TLSServerLayer;
 	class TLSServerContextFactory;
 	class PKCS12Certificate;
 	class ServerFromClientSession : public Session {
 		public:
 			ServerFromClientSession(
 					const std::string& id,
 					boost::shared_ptr<Connection> connection,
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					UserRegistry* userRegistry,
 					XMLParserFactory* factory);
 					XMLParserFactory* factory,
 					Swift::JID remoteJID = Swift::JID());
 			~ServerFromClientSession();
 			boost::signal<void ()> onSessionStarted;
 			void setAllowSASLEXTERNAL();
 			const std::string &getUser() {
 				return user_;
+			}
 			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, const PKCS12Certificate& cert);
 			Swift::JID getBareJID() {
 				return Swift::JID(user_, getLocalJID().getDomain());

include/Swiften/Server/ServerStanzaChannel.cpp

➞

Show inline comments

@@ @@ -20,25 +20,24 @@ namespace { @@
 // 	};
 	struct HasJID {
 		HasJID(const JID& jid) : jid(jid) {}
 		bool operator()(const boost::shared_ptr<ServerFromClientSession> session) const {
 			return session->getRemoteJID().equals(jid, JID::WithResource);
+		}
 		JID jid;
 	};
+}
 void ServerStanzaChannel::addSession(boost::shared_ptr<ServerFromClientSession> session) {
 	std::cout << "ADDING SESSION\n";
 	sessions[session->getRemoteJID().toBare().toString()].push_back(session);
 	session->onSessionFinished.connect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session));
 	session->onElementReceived.connect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session));
+}
 void ServerStanzaChannel::removeSession(boost::shared_ptr<ServerFromClientSession> session) {
 	session->onSessionFinished.disconnect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session));
 	session->onElementReceived.disconnect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session));
 	std::list<boost::shared_ptr<ServerFromClientSession> > &lst = sessions[session->getRemoteJID().toBare().toString()];
 	lst.erase(std::remove(lst.begin(), lst.end(), session), lst.end());
+}

src/tests/component.cpp

➞

Show inline comments

 #include "transport/userregistry.h"
 #include "transport/config.h"
 #include "transport/transport.h"
 #include "transport/conversation.h"
 #include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
 #include <Swiften/Server/Server.h>
 #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"
 using namespace Transport;
 class TestingConversation : public Conversation {
 	public:
 		TestingConversation(ConversationManager *conversationManager, const std::string &legacyName, bool muc = false) : Conversation(conversationManager, legacyName, muc) {
+		}
 		// Called when there's new message to legacy network from XMPP network
 		void sendMessage(boost::shared_ptr<Swift::Message> &message) {
+		}
@@ @@ -39,62 +43,102 @@ class TestingFactory : public Factory { @@
 			LocalBuddy *buddy = new LocalBuddy(rosterManager, buddyInfo.id);
 			buddy->setAlias(buddyInfo.alias);
 			buddy->setName(buddyInfo.legacyName);
 			buddy->setSubscription(buddyInfo.subscription);
 			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;
+		}
 };
 class ComponentTest : public CPPUNIT_NS :: TestFixture {
+class ComponentTest : public CPPUNIT_NS :: TestFixture, public Swift::XMPPParserClient {
 	CPPUNIT_TEST_SUITE(ComponentTest);
-	CPPUNIT_TEST(presence);
+	CPPUNIT_TEST(handlePresenceWithNode);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		void setUp (void) {
 			std::istringstream ifs("service.server_mode = 1\n");
 			cfg = new Config();
 			cfg->load(ifs);
 			factory = new TestingFactory();
 			loop = new Swift::DummyEventLoop();
 			factories = new Swift::DummyNetworkFactories(loop);
 			userRegistry = new UserRegistry(cfg, factories);
 			component = new Component(loop, factories, cfg, factory, userRegistry);
 			component->start();
 			payloadSerializers = new Swift::FullPayloadSerializerCollection();
 			payloadParserFactories = new Swift::FullPayloadParserFactoryCollection();
 			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(&ComponentTest::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();
 			loop->processEvents();
+		}
 		void tearDown (void) {
 			dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->removeSession(serverFromClientSession);
 			delete component;
 			delete userRegistry;
 			delete factories;
 			delete factory;
 			delete loop;
 			delete cfg;
 			delete parser;
 			received.clear();
+		}
 	void presence() {
 	void handleDataReceived(const Swift::SafeByteArray &data) {
 		parser->parse(safeByteArrayToString(data));
+	}
 	void handleStreamStart(const Swift::ProtocolHeader&) {
+	}
 	void handleElement(boost::shared_ptr<Swift::Element> element) {
 		received.push_back(element);
+	}
 	void handleStreamEnd() {
+	}
 	void handlePresenceWithNode() {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("localhost");
 		response->setFrom("user@localhost/resource");
 		dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->onPresenceReceived(response);
 		loop->processEvents();
+	}
 	private:
 		boost::shared_ptr<Swift::ServerFromClientSession> serverFromClientSession;
 		Swift::FullPayloadSerializerCollection* payloadSerializers;
 		Swift::FullPayloadParserFactoryCollection* payloadParserFactories;
 		Swift::XMPPParser *parser;
 		UserRegistry *userRegistry;
 		Config *cfg;
 		Swift::Server *server;
 		Swift::DummyNetworkFactories *factories;
 		Swift::DummyEventLoop *loop;
 		TestingFactory *factory;
 		Component *component;
-		std::vector<std::string> received;
+		std::vector<boost::shared_ptr<Swift::Element> > received;
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (ComponentTest);

0 comments (0 inline, 0 general)