3 files changed, 29 insertions, 23 deletions
diff --git a/Swiften/QA/ClientTest/Makefile.inc b/Swiften/QA/ClientTest/Makefile.inc
index 08a9b5b..16a87cf 100644
--- a/Swiften/QA/ClientTest/Makefile.inc
+++ b/Swiften/QA/ClientTest/Makefile.inc
@@ -7,6 +7,7 @@ CLIENTTEST_OBJECTS = \
 TEST_TARGETS += ClientTest
 
 CLEANFILES += $(CLIENTTEST_OBJECTS) $(CLIENTTEST_TARGET)
+DEPS += $(CLIENTTEST_SOURCES:.cpp=.dep)
 
 $(CLIENTTEST_TARGET): $(SWIFTEN_TARGET) $(CLIENTTEST_OBJECTS) $(BUNDLED_LIBS)
 	$(QUIET_LINK)$(CXX) -o $(CLIENTTEST_TARGET) $(CLIENTTEST_OBJECTS) $(LDFLAGS) $(CPPCLIENT_LDFLAGS) $(SWIFTEN_TARGET) $(BUNDLED_LIBS) $(LIBS)
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
index 639097a..6090a97 100644
--- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
@@ -4,6 +4,7 @@
 #include "Swiften/Base/String.h"
 #include "Swiften/Base/sleep.h"
 #include "Swiften/Network/BoostConnection.h"
+#include "Swiften/Network/BoostIOServiceThread.h"
 #include "Swiften/EventLoop/DummyEventLoop.h"
 
 using namespace Swift;
@@ -11,41 +12,44 @@ using namespace Swift;
 class BoostConnectionTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(BoostConnectionTest);
 		CPPUNIT_TEST(testDestructor);
-    CPPUNIT_TEST(testDestructor_PendingEvents);
+		CPPUNIT_TEST(testDestructor_PendingEvents);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		BoostConnectionTest() {}
 
-    void setUp() {
-      eventLoop_ = new DummyEventLoop();
-    }
+		void setUp() {
+			eventLoop_ = new DummyEventLoop();
+			boostIOServiceThread_ = new BoostIOServiceThread();
+		}
 
-    void tearDown() {
-      delete eventLoop_;
-    }
+		void tearDown() {
+			delete boostIOServiceThread_;
+			delete eventLoop_;
+		}
 
 		void testDestructor() {
-      {
-        std::string domain("el-tramo.be");
-        std::auto_ptr<BoostConnection> testling(new BoostConnection(domain));
-        testling->connect();
-      }
-    }
+			{
+				std::string domain("el-tramo.be");
+				std::auto_ptr<BoostConnection> testling(new BoostConnection(&boostIOServiceThread_->getIOService()));
+				testling->connect(domain);
+			}
+		}
 
 		void testDestructor_PendingEvents() {
-      {
-        std::auto_ptr<BoostConnection> testling(new BoostConnection("el-tramo.be"));
-        testling->connect();
-        while (!eventLoop_->hasEvents()) {
-          Swift::sleep(10);
-        }
-      }
-      eventLoop_->processEvents();
+			{
+				std::auto_ptr<BoostConnection> testling(new BoostConnection(&boostIOServiceThread_->getIOService()));
+				testling->connect("el-tramo.be");
+				while (!eventLoop_->hasEvents()) {
+					Swift::sleep(10);
+				}
+			}
+			eventLoop_->processEvents();
 		}
 
-  private:
-    DummyEventLoop* eventLoop_;
+	private:
+		BoostIOServiceThread* boostIOServiceThread_;
+		DummyEventLoop* eventLoop_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(BoostConnectionTest);
diff --git a/Swiften/QA/NetworkTest/Makefile.inc b/Swiften/QA/NetworkTest/Makefile.inc
index 055937b..5ac14c0 100644
--- a/Swiften/QA/NetworkTest/Makefile.inc
+++ b/Swiften/QA/NetworkTest/Makefile.inc
@@ -9,6 +9,7 @@ NETWORKTEST_OBJECTS = \
 TEST_TARGETS += NetworkTest
 
 CLEANFILES += $(NETWORKTEST_OBJECTS) $(NETWORKTEST_TARGET)
+DEPS += $(NETWORKTEST_SOURCES:.cpp=.dep)
 
 $(NETWORKTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(NETWORKTEST_OBJECTS) $(BUNDLED_LIBS)
 	$(QUIET_LINK)$(CXX) -o $(NETWORKTEST_TARGET) $(NETWORKTEST_OBJECTS) $(LDFLAGS) $(CPPNETWORK_LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(BUNDLED_LIBS) $(LIBS)