1 files changed, 4 insertions, 6 deletions
diff --git a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
index 978bf3b..1bfee10 100644
--- a/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
+++ b/Swiften/Network/UnitTest/BOSHConnectionPoolTest.cpp
@@ -13,19 +13,18 @@
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/Network/Connection.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/BOSHConnection.h>
-#include <Swiften/Network/BOSHConnectionFactory.h>
 #include <Swiften/Network/BOSHConnectionPool.h>
 #include <Swiften/Network/HostAddressPort.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 
 using namespace Swift;
 
 typedef boost::shared_ptr<BOSHConnectionPool> PoolRef;
 
@@ -52,19 +51,19 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 					"requests='2' "
 					"hold='1' "
 					"maxpause='120' "
 					"sid='" + sid + "' "
 					"ver='1.6' "
 					"from='wonderland.lit' "
 					"xmlns='http://jabber.org/protocol/httpbind'/>";
 			eventLoop = new DummyEventLoop();
 			connectionFactory = new MockConnectionFactory(eventLoop);
-			factory = boost::make_shared<BOSHConnectionFactory>(URL("http", to, 5280, path), connectionFactory, &parserFactory, static_cast<TLSContextFactory*>(NULL));
+			boshURL = URL("http", to, 5280, path);
 			sessionTerminated = 0;
 			sessionStarted = 0;
 			initialRID = 2349876;
 			xmppDataRead.clear();
 			boshDataRead.clear();
 			boshDataWritten.clear();
 		}
 
 		void tearDown() {
@@ -210,20 +209,19 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT(c1->pending);
 			CPPUNIT_ASSERT_EQUAL(st(6), boshDataWritten.size()); /* Don't send data, no room */
 			eventLoop->processEvents();
 			CPPUNIT_ASSERT_EQUAL(st(2), connectionFactory->connections.size());
 		}
 
 		void testSession() {
 			to = "prosody.doomsong.co.uk";
 			path = "http-bind/";
-			factory = boost::make_shared<BOSHConnectionFactory>(URL("http", to, 5280, path), connectionFactory, &parserFactory, static_cast<TLSContextFactory*>(NULL));
-
+			boshURL = URL("http", to, 5280, path);
 
 			PoolRef testling = createTestling();
 			CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 			eventLoop->processEvents();
 			CPPUNIT_ASSERT_EQUAL(st(1), boshDataWritten.size()); /* header*/
 			CPPUNIT_ASSERT_EQUAL(st(1), connectionFactory->connections.size());
 
 			std::string response = "<body authid='743da605-4c2e-4de1-afac-ac040dd4a940' xmpp:version='1.0' xmlns:stream='http://etherx.jabber.org/streams' xmlns:xmpp='urn:xmpp:xbosh' inactivity='60' wait='60' polling='5' secure='true' hold='1' from='prosody.doomsong.co.uk' ver='1.6' sid='743da605-4c2e-4de1-afac-ac040dd4a940' requests='2' xmlns='http://jabber.org/protocol/httpbind'><stream:features><auth xmlns='http://jabber.org/features/iq-auth'/><mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><mechanism>SCRAM-SHA-1</mechanism><mechanism>DIGEST-MD5</mechanism></mechanisms></stream:features></body>";
 			readResponse(response, connectionFactory->connections[0]);
@@ -275,19 +273,19 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 			size_t bodyPosition = response.find("\r\n\r\n");
 			CPPUNIT_ASSERT_EQUAL(fullBody, response.substr(bodyPosition+4));
 
 
 		}
 
 	private:
 
 		PoolRef createTestling() {
-			PoolRef pool = boost::make_shared<BOSHConnectionPool>(factory, to, initialRID, URL(), "", "");
+			PoolRef pool = boost::make_shared<BOSHConnectionPool>(boshURL, connectionFactory, &parserFactory, static_cast<TLSContextFactory*>(NULL), to, initialRID, URL(), "", "");
 			pool->onXMPPDataRead.connect(boost::bind(&BOSHConnectionPoolTest::handleXMPPDataRead, this, _1));
 			pool->onBOSHDataRead.connect(boost::bind(&BOSHConnectionPoolTest::handleBOSHDataRead, this, _1));
 			pool->onBOSHDataWritten.connect(boost::bind(&BOSHConnectionPoolTest::handleBOSHDataWritten, this, _1));
 			pool->onSessionStarted.connect(boost::bind(&BOSHConnectionPoolTest::handleSessionStarted, this));
 			pool->onSessionTerminated.connect(boost::bind(&BOSHConnectionPoolTest::handleSessionTerminated, this));
 			return pool;
 		}
 
 		std::string lastBody() {
@@ -395,29 +393,29 @@ class BOSHConnectionPoolTest : public CppUnit::TestFixture {
 			std::string result = "POST /" + path + " HTTP/1.1\r\n"
 						+ "Host: " + to + ":" + port + "\r\n"
 						+ "Content-Type: text/xml; charset=utf-8\r\n"
 						+ "Content-Length: " + boost::lexical_cast<std::string>(body.size()) + "\r\n\r\n"
 						+ body;
 			return result;
 		}
 
 	private:
+		URL boshURL;
 		DummyEventLoop* eventLoop;
 		MockConnectionFactory* connectionFactory;
 		std::vector<std::string> xmppDataRead;
 		std::vector<std::string> boshDataRead;
 		std::vector<std::string> boshDataWritten;
 		PlatformXMLParserFactory parserFactory;
 		std::string to;
 		std::string path;
 		std::string port;
 		std::string sid;
 		std::string initial;
 		long initialRID;
-		boost::shared_ptr<BOSHConnectionFactory> factory;
 		int sessionStarted;
 		int sessionTerminated;
 
 };
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION(BOSHConnectionPoolTest);