3 files changed, 274 insertions, 0 deletions
diff --git a/Swiften/Queries/UnitTest/Makefile.inc b/Swiften/Queries/UnitTest/Makefile.inc
new file mode 100644
index 0000000..265357f
--- /dev/null
+++ b/Swiften/Queries/UnitTest/Makefile.inc
@@ -0,0 +1,3 @@
+UNITTEST_SOURCES += \
+	Swiften/Queries/UnitTest/RequestTest.cpp \
+	Swiften/Queries/UnitTest/ResponderTest.cpp
diff --git a/Swiften/Queries/UnitTest/RequestTest.cpp b/Swiften/Queries/UnitTest/RequestTest.cpp
new file mode 100644
index 0000000..31c0603
--- /dev/null
+++ b/Swiften/Queries/UnitTest/RequestTest.cpp
@@ -0,0 +1,139 @@
+#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_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;
+			errorsReceived_ = 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, errorsReceived_);
+			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, errorsReceived_);
+			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();
+
+			channel_->onIQReceived(createError("test-id"));
+
+			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
+			CPPUNIT_ASSERT_EQUAL(1, errorsReceived_);
+			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
+		}
+	
+	private:
+		void handleResponse(boost::shared_ptr<Payload> p, const boost::optional<Error>& e) {
+			if (e) {
+				++errorsReceived_;
+			}
+			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_;
+		int errorsReceived_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(RequestTest);
diff --git a/Swiften/Queries/UnitTest/ResponderTest.cpp b/Swiften/Queries/UnitTest/ResponderTest.cpp
new file mode 100644
index 0000000..5c758e4
--- /dev/null
+++ b/Swiften/Queries/UnitTest/ResponderTest.cpp
@@ -0,0 +1,132 @@
+#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);