4 files changed, 0 insertions, 442 deletions
diff --git a/Swiften b/Swiften
new file mode 160000
+Subproject 8213ba16d0043d2461f4b031c881d61dda5a38c
diff --git a/Swiften/Queries/UnitTest/IQRouterTest.cpp b/Swiften/Queries/UnitTest/IQRouterTest.cpp
deleted file mode 100644
index 5760b09..0000000
--- a/Swiften/Queries/UnitTest/IQRouterTest.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
-
-#include "Swiften/Queries/IQHandler.h"
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Queries/DummyIQChannel.h"
-
-using namespace Swift;
-
-class IQRouterTest : public CppUnit::TestFixture
-{
-		CPPUNIT_TEST_SUITE(IQRouterTest);
-		CPPUNIT_TEST(testRemoveHandler);
-		CPPUNIT_TEST(testRemoveHandler_AfterHandleIQ);
-		CPPUNIT_TEST(testHandleIQ_SuccesfulHandlerFirst);
-		CPPUNIT_TEST(testHandleIQ_SuccesfulHandlerLast);
-		CPPUNIT_TEST(testHandleIQ_NoSuccesfulHandler);
-		CPPUNIT_TEST(testHandleIQ_HandlerRemovedDuringHandle);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		IQRouterTest() {}
-
-		void setUp() {
-			channel_ = new DummyIQChannel();
-		}
-
-		void tearDown() {
-			delete channel_;
-		}
-
-		void testRemoveHandler() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler1(true, &testling);
-			DummyIQHandler handler2(true, &testling);
-			testling.removeHandler(&handler1);
-
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-
-			CPPUNIT_ASSERT_EQUAL(0, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(1, handler2.called);
-		}
-
-		void testRemoveHandler_AfterHandleIQ() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler1(true, &testling);
-			DummyIQHandler handler2(true, &testling);
-
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-			testling.removeHandler(&handler1);
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-
-			CPPUNIT_ASSERT_EQUAL(1, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(1, handler2.called);
-		}
-
-		void testHandleIQ_SuccesfulHandlerFirst() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler1(true, &testling);
-			DummyIQHandler handler2(false, &testling);
-
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-
-			CPPUNIT_ASSERT_EQUAL(1, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(0, handler2.called);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(channel_->iqs_.size()));
-		}
-
-		void testHandleIQ_SuccesfulHandlerLast() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler1(false, &testling);
-			DummyIQHandler handler2(true, &testling);
-
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-
-			CPPUNIT_ASSERT_EQUAL(1, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(1, handler2.called);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(channel_->iqs_.size()));
-		}
-
-		void testHandleIQ_NoSuccesfulHandler() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler(false, &testling);
-
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-			CPPUNIT_ASSERT(channel_->iqs_[0]->getPayload<ErrorPayload>());
-		}
-
-
-		void testHandleIQ_HandlerRemovedDuringHandle() {
-			IQRouter testling(channel_);
-			RemovingIQHandler handler1(&testling);
-			DummyIQHandler handler2(true, &testling);
-
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-			channel_->onIQReceived(boost::shared_ptr<IQ>(new IQ()));
-
-			CPPUNIT_ASSERT_EQUAL(1, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(2, handler2.called);
-		}
-
-	private:
-		struct DummyIQHandler : public IQHandler {
-			DummyIQHandler(bool handle, IQRouter* router) : handle(handle), router(router), called(0) {
-				router->addHandler(this);
-			}
-
-			~DummyIQHandler() {
-				router->removeHandler(this);
-			}
-
-			virtual bool handleIQ(boost::shared_ptr<IQ>) {
-				called++;
-				return handle;
-			}
-			bool handle;
-			IQRouter* router;
-			int called;
-		};
-
-		struct RemovingIQHandler : public IQHandler {
-			RemovingIQHandler(IQRouter* router) : router(router), called(0) {
-				router->addHandler(this);
-			}
-
-			virtual bool handleIQ(boost::shared_ptr<IQ>) {
-				called++;
-				router->removeHandler(this);
-				return false;
-			}
-			IQRouter* router;
-			int called;
-		};
-
-
-		DummyIQChannel* channel_;
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(IQRouterTest);
diff --git a/Swiften/Queries/UnitTest/RequestTest.cpp b/Swiften/Queries/UnitTest/RequestTest.cpp
deleted file mode 100644
index c569bb5..0000000
--- a/Swiften/Queries/UnitTest/RequestTest.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
-
-#include "Swiften/Queries/GenericRequest.h"
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Queries/DummyIQChannel.h"
-#include "Swiften/Elements/Payload.h"
-
-using namespace Swift;
-
-class RequestTest : public CppUnit::TestFixture
-{
-		CPPUNIT_TEST_SUITE(RequestTest);
-		CPPUNIT_TEST(testSendGet);
-		CPPUNIT_TEST(testSendSet);
-		CPPUNIT_TEST(testHandleIQ);
-		CPPUNIT_TEST(testHandleIQ_InvalidID);
-		CPPUNIT_TEST(testHandleIQ_Error);
-		CPPUNIT_TEST(testHandleIQ_ErrorWithoutPayload);
-		CPPUNIT_TEST(testHandleIQ_BeforeSend);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		class MyPayload : public Payload {
-			public:
-				MyPayload(const String& s = "") : text_(s) {}
-				String text_;
-		};
-
-		typedef GenericRequest<MyPayload> MyRequest;
-
-	public:
-		RequestTest() {}
-
-		void setUp() {
-			channel_ = new DummyIQChannel();
-			router_ = new IQRouter(channel_);
-			payload_ = boost::shared_ptr<Payload>(new MyPayload("foo"));
-			responsePayload_ = boost::shared_ptr<Payload>(new MyPayload("bar"));
-			responsesReceived_ = 0;
-		}
-
-		void tearDown() {
-			delete router_;
-			delete channel_;
-		}
-
-		void testSendSet() {
-			MyRequest testling(IQ::Set, JID("foo@bar.com/baz"), payload_, router_);
-			testling.send();
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-			CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), channel_->iqs_[0]->getTo());
-			CPPUNIT_ASSERT_EQUAL(IQ::Set, channel_->iqs_[0]->getType());
-			CPPUNIT_ASSERT_EQUAL(String("test-id"), channel_->iqs_[0]->getID());
-		}
-
-		void testSendGet() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.send();
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-			CPPUNIT_ASSERT_EQUAL(IQ::Get, channel_->iqs_[0]->getType());
-		}
-
-		void testHandleIQ() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-			
-			channel_->onIQReceived(createResponse("test-id"));
-
-			CPPUNIT_ASSERT_EQUAL(1, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-		}
-
-		// FIXME: Doesn't test that it didn't handle the payload
-		void testHandleIQ_InvalidID() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse("different-id"));
-
-			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-		}
-
-		void testHandleIQ_Error() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			boost::shared_ptr<IQ> error = createError("test-id");
-			boost::shared_ptr<Payload> errorPayload = boost::shared_ptr<ErrorPayload>(new ErrorPayload(ErrorPayload::FeatureNotImplemented));
-			error->addPayload(errorPayload);
-			channel_->onIQReceived(error);
-
-			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-			CPPUNIT_ASSERT_EQUAL(ErrorPayload::FeatureNotImplemented, receivedErrors[0].getCondition());
-		}
-
-		void testHandleIQ_ErrorWithoutPayload() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createError("test-id"));
-
-			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-			CPPUNIT_ASSERT_EQUAL(ErrorPayload::UndefinedCondition, receivedErrors[0].getCondition());
-		}
-
-		void testHandleIQ_BeforeSend() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			channel_->onIQReceived(createResponse("test-id"));
-
-			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(channel_->iqs_.size()));
-		}
-	
-	private:
-		void handleResponse(boost::shared_ptr<Payload> p, const boost::optional<ErrorPayload>& e) {
-			if (e) {
-				receivedErrors.push_back(*e);
-			}
-			else {
-				boost::shared_ptr<MyPayload> payload(boost::dynamic_pointer_cast<MyPayload>(p));
-				CPPUNIT_ASSERT(payload);
-				CPPUNIT_ASSERT_EQUAL(String("bar"), payload->text_);
-				++responsesReceived_;
-			}
-		}
-
-		boost::shared_ptr<IQ> createResponse(const String& id) {
-			boost::shared_ptr<IQ> iq(new IQ(IQ::Result));
-			iq->addPayload(responsePayload_);
-			iq->setID(id);
-			return iq;
-		}
-
-		boost::shared_ptr<IQ> createError(const String& id) {
-			boost::shared_ptr<IQ> iq(new IQ(IQ::Error));
-			iq->setID(id);
-			return iq;
-		}
-	
-	private:
-		IQRouter* router_;
-		DummyIQChannel* channel_;
-		boost::shared_ptr<Payload> payload_;
-		boost::shared_ptr<Payload> responsePayload_;
-		int responsesReceived_;
-		std::vector<ErrorPayload> receivedErrors;
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(RequestTest);
diff --git a/Swiften/Queries/UnitTest/ResponderTest.cpp b/Swiften/Queries/UnitTest/ResponderTest.cpp
deleted file mode 100644
index 5c758e4..0000000
--- a/Swiften/Queries/UnitTest/ResponderTest.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
-
-#include "Swiften/Queries/Responder.h"
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Queries/DummyIQChannel.h"
-#include "Swiften/Elements/SoftwareVersion.h"
-
-using namespace Swift;
-
-class ResponderTest : public CppUnit::TestFixture
-{
-		CPPUNIT_TEST_SUITE(ResponderTest);
-		CPPUNIT_TEST(testConstructor);
-		CPPUNIT_TEST(testHandleIQ_Set);
-		CPPUNIT_TEST(testHandleIQ_Get);
-		CPPUNIT_TEST(testHandleIQ_Error);
-		CPPUNIT_TEST(testHandleIQ_Result);
-		CPPUNIT_TEST(testHandleIQ_NoPayload);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		ResponderTest() {}
-
-		void setUp() {
-			channel_ = new DummyIQChannel();
-			router_ = new IQRouter(channel_);
-			payload_ = boost::shared_ptr<SoftwareVersion>(new SoftwareVersion("foo"));
-		}
-
-		void tearDown() {
-			delete router_;
-			delete channel_;
-		}
-
-		void testConstructor() {
-			MyResponder testling(router_);
-
-			channel_->onIQReceived(createRequest(IQ::Set));
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling.setPayloads_.size()));
-		}
-
-		void testHandleIQ_Set() {
-			MyResponder testling(router_);
-
-			CPPUNIT_ASSERT(dynamic_cast<IQHandler*>(&testling)->handleIQ(createRequest(IQ::Set)));
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling.setPayloads_.size()));
-			CPPUNIT_ASSERT(payload_ == testling.setPayloads_[0]);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.getPayloads_.size()));
-		}
-
-		void testHandleIQ_Get() {
-			MyResponder testling(router_);
-
-			CPPUNIT_ASSERT(dynamic_cast<IQHandler*>(&testling)->handleIQ(createRequest(IQ::Get)));
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling.getPayloads_.size()));
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.setPayloads_.size()));
-			CPPUNIT_ASSERT(payload_ == testling.getPayloads_[0]);
-		}
-
-		void testHandleIQ_Error() {
-			MyResponder testling(router_);
-
-			CPPUNIT_ASSERT(!dynamic_cast<IQHandler*>(&testling)->handleIQ(createRequest(IQ::Error)));
-
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.getPayloads_.size()));
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.setPayloads_.size()));
-		}
-
-		void testHandleIQ_Result() {
-			MyResponder testling(router_);
-
-			CPPUNIT_ASSERT(!dynamic_cast<IQHandler*>(&testling)->handleIQ(createRequest(IQ::Result)));
-
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.getPayloads_.size()));
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.setPayloads_.size()));
-		}
-
-		void testHandleIQ_NoPayload() {
-			MyResponder testling(router_);
-
-			CPPUNIT_ASSERT(!dynamic_cast<IQHandler*>(&testling)->handleIQ(boost::shared_ptr<IQ>(new IQ(IQ::Get))));
-
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.getPayloads_.size()));
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.setPayloads_.size()));
-		}
-
-	private:
-		boost::shared_ptr<IQ> createRequest(IQ::Type type) {
-			boost::shared_ptr<IQ> iq(new IQ(type));
-			iq->addPayload(payload_);
-			iq->setID("myid");
-			iq->setFrom(JID("foo@bar.com/baz"));
-			return iq;
-		}
-
-	private:
-		class MyResponder : public Responder<SoftwareVersion> {
-			public:
-				MyResponder(IQRouter* router) : Responder<SoftwareVersion>(router), getRequestResponse_(true), setRequestResponse_(true) {}
-
-				virtual bool handleGetRequest(const JID& from, const String& id, boost::shared_ptr<SoftwareVersion> payload) {
-					CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), from);
-					CPPUNIT_ASSERT_EQUAL(String("myid"), id);
-					getPayloads_.push_back(payload);
-					return getRequestResponse_;
-				}
-				virtual bool handleSetRequest(const JID& from, const String& id, boost::shared_ptr<SoftwareVersion> payload) {
-					CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), from);
-					CPPUNIT_ASSERT_EQUAL(String("myid"), id);
-					setPayloads_.push_back(payload);
-					return setRequestResponse_;
-				}
-
-				bool getRequestResponse_;
-				bool setRequestResponse_;
-				std::vector<boost::shared_ptr<SoftwareVersion> > getPayloads_;
-				std::vector<boost::shared_ptr<SoftwareVersion> > setPayloads_;
-		};
-
-	private:
-		IQRouter* router_;
-		DummyIQChannel* channel_;
-		boost::shared_ptr<SoftwareVersion> payload_;
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(ResponderTest);