Convert tabs to 4 spaces for all source files

Removed trailing spaces and whitespace on empty lines in the process. Changed CheckTabs.py tool to disallow hard tabs in source files. Test-Information: Manually checked 30 random files that the conversion worked as expected. Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
author: Tobias Markmann <tm@ayena.de> 2016-03-31 14:57:35 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2016-03-31 14:57:35 (GMT)
commit: cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch)
tree: 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Queries/UnitTest
parent: 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff)
download: swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip
swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2
3 files changed, 608 insertions, 608 deletions
diff --git a/Swiften/Queries/UnitTest/IQRouterTest.cpp b/Swiften/Queries/UnitTest/IQRouterTest.cpp
index 44315c4..d0d4911 100644
--- a/Swiften/Queries/UnitTest/IQRouterTest.cpp
+++ b/Swiften/Queries/UnitTest/IQRouterTest.cpp
@@ -18,161 +18,161 @@
 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(testSendIQ_WithFrom);
-		CPPUNIT_TEST(testSendIQ_WithoutFrom);
-		CPPUNIT_TEST(testHandleIQ_WithFrom);
-		CPPUNIT_TEST_SUITE_END();
+        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(testSendIQ_WithFrom);
+        CPPUNIT_TEST(testSendIQ_WithoutFrom);
+        CPPUNIT_TEST(testHandleIQ_WithFrom);
+        CPPUNIT_TEST_SUITE_END();
 
-	public:
-		void setUp() {
-			channel_ = new DummyIQChannel();
-		}
+    public:
+        void setUp() {
+            channel_ = new DummyIQChannel();
+        }
 
-		void tearDown() {
-			delete channel_;
-		}
+        void tearDown() {
+            delete channel_;
+        }
 
-		void testRemoveHandler() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler1(true, &testling);
-			DummyIQHandler handler2(true, &testling);
-			testling.removeHandler(&handler1);
+        void testRemoveHandler() {
+            IQRouter testling(channel_);
+            DummyIQHandler handler1(true, &testling);
+            DummyIQHandler handler2(true, &testling);
+            testling.removeHandler(&handler1);
 
-			channel_->onIQReceived(boost::make_shared<IQ>());
+            channel_->onIQReceived(boost::make_shared<IQ>());
 
-			CPPUNIT_ASSERT_EQUAL(0, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(1, handler2.called);
-		}
+            CPPUNIT_ASSERT_EQUAL(0, handler1.called);
+            CPPUNIT_ASSERT_EQUAL(1, handler2.called);
+        }
 
-		void testRemoveHandler_AfterHandleIQ() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler2(true, &testling);
-			DummyIQHandler handler1(true, &testling);
-
-			channel_->onIQReceived(boost::make_shared<IQ>());
-			testling.removeHandler(&handler1);
-			channel_->onIQReceived(boost::make_shared<IQ>());
-
-			CPPUNIT_ASSERT_EQUAL(1, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(1, handler2.called);
-		}
-
-		void testHandleIQ_SuccesfulHandlerFirst() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler2(false, &testling);
-			DummyIQHandler handler1(true, &testling);
-
-			channel_->onIQReceived(boost::make_shared<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 handler2(true, &testling);
-			DummyIQHandler handler1(false, &testling);
-
-			channel_->onIQReceived(boost::make_shared<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::make_shared<IQ>());
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
-			CPPUNIT_ASSERT(channel_->iqs_[0]->getPayload<ErrorPayload>());
-		}
-
-
-		void testHandleIQ_HandlerRemovedDuringHandle() {
-			IQRouter testling(channel_);
-			DummyIQHandler handler2(true, &testling);
-			RemovingIQHandler handler1(&testling);
-
-			channel_->onIQReceived(boost::make_shared<IQ>());
-			channel_->onIQReceived(boost::make_shared<IQ>());
-
-			CPPUNIT_ASSERT_EQUAL(1, handler1.called);
-			CPPUNIT_ASSERT_EQUAL(2, handler2.called);
-		}
-
-		void testSendIQ_WithFrom() {
-			IQRouter testling(channel_);
-			testling.setFrom(JID("foo@bar.com/baz"));
-
-			testling.sendIQ(boost::make_shared<IQ>());
-
-			CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), channel_->iqs_[0]->getFrom());
-		}
-
-		void testSendIQ_WithoutFrom() {
-			IQRouter testling(channel_);
+        void testRemoveHandler_AfterHandleIQ() {
+            IQRouter testling(channel_);
+            DummyIQHandler handler2(true, &testling);
+            DummyIQHandler handler1(true, &testling);
+
+            channel_->onIQReceived(boost::make_shared<IQ>());
+            testling.removeHandler(&handler1);
+            channel_->onIQReceived(boost::make_shared<IQ>());
+
+            CPPUNIT_ASSERT_EQUAL(1, handler1.called);
+            CPPUNIT_ASSERT_EQUAL(1, handler2.called);
+        }
+
+        void testHandleIQ_SuccesfulHandlerFirst() {
+            IQRouter testling(channel_);
+            DummyIQHandler handler2(false, &testling);
+            DummyIQHandler handler1(true, &testling);
+
+            channel_->onIQReceived(boost::make_shared<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 handler2(true, &testling);
+            DummyIQHandler handler1(false, &testling);
+
+            channel_->onIQReceived(boost::make_shared<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::make_shared<IQ>());
+
+            CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
+            CPPUNIT_ASSERT(channel_->iqs_[0]->getPayload<ErrorPayload>());
+        }
+
+
+        void testHandleIQ_HandlerRemovedDuringHandle() {
+            IQRouter testling(channel_);
+            DummyIQHandler handler2(true, &testling);
+            RemovingIQHandler handler1(&testling);
+
+            channel_->onIQReceived(boost::make_shared<IQ>());
+            channel_->onIQReceived(boost::make_shared<IQ>());
+
+            CPPUNIT_ASSERT_EQUAL(1, handler1.called);
+            CPPUNIT_ASSERT_EQUAL(2, handler2.called);
+        }
+
+        void testSendIQ_WithFrom() {
+            IQRouter testling(channel_);
+            testling.setFrom(JID("foo@bar.com/baz"));
+
+            testling.sendIQ(boost::make_shared<IQ>());
+
+            CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), channel_->iqs_[0]->getFrom());
+        }
+
+        void testSendIQ_WithoutFrom() {
+            IQRouter testling(channel_);
 
-			testling.sendIQ(boost::make_shared<IQ>());
+            testling.sendIQ(boost::make_shared<IQ>());
 
-			CPPUNIT_ASSERT_EQUAL(JID(), channel_->iqs_[0]->getFrom());
-		}
+            CPPUNIT_ASSERT_EQUAL(JID(), channel_->iqs_[0]->getFrom());
+        }
 
-		void testHandleIQ_WithFrom() {
-			IQRouter testling(channel_);
-			testling.setFrom(JID("foo@bar.com/baz"));
-			DummyIQHandler handler(false, &testling);
+        void testHandleIQ_WithFrom() {
+            IQRouter testling(channel_);
+            testling.setFrom(JID("foo@bar.com/baz"));
+            DummyIQHandler handler(false, &testling);
 
-			channel_->onIQReceived(boost::make_shared<IQ>());
+            channel_->onIQReceived(boost::make_shared<IQ>());
 
-			CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), channel_->iqs_[0]->getFrom());
-		}
+            CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), channel_->iqs_[0]->getFrom());
+        }
 
-	private:
-		struct DummyIQHandler : public IQHandler {
-			DummyIQHandler(bool handle, IQRouter* router) : handle(handle), router(router), called(0) {
-				router->addHandler(this);
-			}
+    private:
+        struct DummyIQHandler : public IQHandler {
+            DummyIQHandler(bool handle, IQRouter* router) : handle(handle), router(router), called(0) {
+                router->addHandler(this);
+            }
 
-			~DummyIQHandler() {
-				router->removeHandler(this);
-			}
+            ~DummyIQHandler() {
+                router->removeHandler(this);
+            }
 
-			virtual bool handleIQ(boost::shared_ptr<IQ>) {
-				called++;
-				return handle;
-			}
-			bool handle;
-			IQRouter* router;
-			int called;
-		};
+            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);
-			}
+        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;
-		};
+            virtual bool handleIQ(boost::shared_ptr<IQ>) {
+                called++;
+                router->removeHandler(this);
+                return false;
+            }
+            IQRouter* router;
+            int called;
+        };
 
 
-		DummyIQChannel* channel_;
+        DummyIQChannel* channel_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(IQRouterTest);
diff --git a/Swiften/Queries/UnitTest/RequestTest.cpp b/Swiften/Queries/UnitTest/RequestTest.cpp
index 2fd5867..93aa9b1 100644
--- a/Swiften/Queries/UnitTest/RequestTest.cpp
+++ b/Swiften/Queries/UnitTest/RequestTest.cpp
@@ -20,348 +20,348 @@
 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(testHandleIQ_DifferentPayload);
-		CPPUNIT_TEST(testHandleIQ_RawXMLPayload);
-		CPPUNIT_TEST(testHandleIQ_GetWithSameID);
-		CPPUNIT_TEST(testHandleIQ_SetWithSameID);
-		CPPUNIT_TEST(testHandleIQ_IncorrectSender);
-		CPPUNIT_TEST(testHandleIQ_IncorrectSenderForServerQuery);
-		CPPUNIT_TEST(testHandleIQ_IncorrectOtherResourceSenderForServerQuery);
-		CPPUNIT_TEST(testHandleIQ_ServerRespondsWithDomain);
-		CPPUNIT_TEST(testHandleIQ_ServerRespondsWithBareJID);
-		CPPUNIT_TEST(testHandleIQ_ServerRespondsWithoutFrom);
-		CPPUNIT_TEST(testHandleIQ_ServerRespondsWithFullJID);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		class MyPayload : public Payload {
-			public:
-				MyPayload(const std::string& s = "") : text_(s) {}
-				std::string text_;
-		};
-
-		struct MyOtherPayload : public Payload {
-		};
-
-		class MyRequest : public Request {
-			public:
-				MyRequest(
-						IQ::Type type,
-						const JID& receiver,
-						boost::shared_ptr<Payload> payload,
-						IQRouter* router) :
-							Request(type, receiver, payload, router) {
-				}
-
-				virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
-					onResponse(payload, error);
-				}
-
-			public:
-				boost::signal<void (boost::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
-		};
-
-	public:
-		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(std::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(JID("foo@bar.com/baz"),"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(JID("foo@bar.com/baz"),"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(JID("foo@bar.com/baz"),"test-id");
-			boost::shared_ptr<Payload> errorPayload = boost::make_shared<ErrorPayload>(ErrorPayload::InternalServerError);
-			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::InternalServerError, 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(JID("foo@bar.com/baz"),"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(JID("foo@bar.com/baz"),"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()));
-		}
-	
-		void testHandleIQ_DifferentPayload() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleDifferentResponse, this, _1, _2));
-			testling.send();
-
-			responsePayload_ = boost::make_shared<MyOtherPayload>();
-			channel_->onIQReceived(createResponse(JID("foo@bar.com/baz"),"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()));
-		}
-
-		void testHandleIQ_RawXMLPayload() {
-			payload_ = boost::make_shared<RawXMLPayload>("<bla/>");
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			testling.onResponse.connect(boost::bind(&RequestTest::handleRawXMLResponse, this, _1, _2));
-			testling.send();
-
-			responsePayload_ = boost::make_shared<MyOtherPayload>();
-			channel_->onIQReceived(createResponse(JID("foo@bar.com/baz"),"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()));
-		}
-
-	 void testHandleIQ_GetWithSameID() {
-			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> response = createResponse(JID("foo@bar.com/baz"),"test-id");
-			response->setType(IQ::Get);
-			channel_->onIQReceived(response);
-
-			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(channel_->iqs_.size()));
-		}
-
-		void testHandleIQ_SetWithSameID() {
-			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> response = createResponse(JID("foo@bar.com/baz"), "test-id");
-			response->setType(IQ::Set);
-			channel_->onIQReceived(response);
-
-			CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
-			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(channel_->iqs_.size()));
-		}
-
-		void testHandleIQ_IncorrectSender() {
-			MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID("anotherfoo@bar.com/baz"), "test-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_IncorrectSenderForServerQuery() {
-			MyRequest testling(IQ::Get, JID(), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID("foo@bar.com/baz"), "test-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_IncorrectOtherResourceSenderForServerQuery() {
-			MyRequest testling(IQ::Get, JID(), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID("alice@wonderland.lit/RabbitHole"), "test-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_ServerRespondsWithDomain() {
-			MyRequest testling(IQ::Get, JID(), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID("wonderland.lit"),"test-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_ServerRespondsWithBareJID() {
-			MyRequest testling(IQ::Get, JID(), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID("alice@wonderland.lit"),"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()));
-		}
-
-		// This tests a bug in ejabberd servers (2.0.5)
-		void testHandleIQ_ServerRespondsWithFullJID() {
-			MyRequest testling(IQ::Get, JID(), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID("alice@wonderland.lit/TeaParty"),"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()));
-		}
-
-		void testHandleIQ_ServerRespondsWithoutFrom() {
-			MyRequest testling(IQ::Get, JID(), payload_, router_);
-			router_->setJID("alice@wonderland.lit/TeaParty");
-			testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
-			testling.send();
-
-			channel_->onIQReceived(createResponse(JID(),"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()));
-		}
-
-
-
-	private:
-		void handleResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref 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(std::string("bar"), payload->text_);
-				++responsesReceived_;
-			}
-		}
-
-		void handleDifferentResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref e) {
-			CPPUNIT_ASSERT(!e);
-			CPPUNIT_ASSERT(!p);
-			++responsesReceived_;
-		}
-
-		void handleRawXMLResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref e) {
-			CPPUNIT_ASSERT(!e);
-			CPPUNIT_ASSERT(p);
-			CPPUNIT_ASSERT(boost::dynamic_pointer_cast<MyOtherPayload>(p));
-			++responsesReceived_;
-		}
-
-		boost::shared_ptr<IQ> createResponse(const JID& from, const std::string& id) {
-			boost::shared_ptr<IQ> iq(new IQ(IQ::Result));
-			iq->setFrom(from);
-			iq->addPayload(responsePayload_);
-			iq->setID(id);
-			return iq;
-		}
-
-		boost::shared_ptr<IQ> createError(const JID& from, const std::string& id) {
-			boost::shared_ptr<IQ> iq(new IQ(IQ::Error));
-			iq->setFrom(from);
-			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(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(testHandleIQ_DifferentPayload);
+        CPPUNIT_TEST(testHandleIQ_RawXMLPayload);
+        CPPUNIT_TEST(testHandleIQ_GetWithSameID);
+        CPPUNIT_TEST(testHandleIQ_SetWithSameID);
+        CPPUNIT_TEST(testHandleIQ_IncorrectSender);
+        CPPUNIT_TEST(testHandleIQ_IncorrectSenderForServerQuery);
+        CPPUNIT_TEST(testHandleIQ_IncorrectOtherResourceSenderForServerQuery);
+        CPPUNIT_TEST(testHandleIQ_ServerRespondsWithDomain);
+        CPPUNIT_TEST(testHandleIQ_ServerRespondsWithBareJID);
+        CPPUNIT_TEST(testHandleIQ_ServerRespondsWithoutFrom);
+        CPPUNIT_TEST(testHandleIQ_ServerRespondsWithFullJID);
+        CPPUNIT_TEST_SUITE_END();
+
+    public:
+        class MyPayload : public Payload {
+            public:
+                MyPayload(const std::string& s = "") : text_(s) {}
+                std::string text_;
+        };
+
+        struct MyOtherPayload : public Payload {
+        };
+
+        class MyRequest : public Request {
+            public:
+                MyRequest(
+                        IQ::Type type,
+                        const JID& receiver,
+                        boost::shared_ptr<Payload> payload,
+                        IQRouter* router) :
+                            Request(type, receiver, payload, router) {
+                }
+
+                virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
+                    onResponse(payload, error);
+                }
+
+            public:
+                boost::signal<void (boost::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
+        };
+
+    public:
+        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(std::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(JID("foo@bar.com/baz"),"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(JID("foo@bar.com/baz"),"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(JID("foo@bar.com/baz"),"test-id");
+            boost::shared_ptr<Payload> errorPayload = boost::make_shared<ErrorPayload>(ErrorPayload::InternalServerError);
+            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::InternalServerError, 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(JID("foo@bar.com/baz"),"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(JID("foo@bar.com/baz"),"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()));
+        }
+
+        void testHandleIQ_DifferentPayload() {
+            MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
+            testling.onResponse.connect(boost::bind(&RequestTest::handleDifferentResponse, this, _1, _2));
+            testling.send();
+
+            responsePayload_ = boost::make_shared<MyOtherPayload>();
+            channel_->onIQReceived(createResponse(JID("foo@bar.com/baz"),"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()));
+        }
+
+        void testHandleIQ_RawXMLPayload() {
+            payload_ = boost::make_shared<RawXMLPayload>("<bla/>");
+            MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
+            testling.onResponse.connect(boost::bind(&RequestTest::handleRawXMLResponse, this, _1, _2));
+            testling.send();
+
+            responsePayload_ = boost::make_shared<MyOtherPayload>();
+            channel_->onIQReceived(createResponse(JID("foo@bar.com/baz"),"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()));
+        }
+
+     void testHandleIQ_GetWithSameID() {
+            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> response = createResponse(JID("foo@bar.com/baz"),"test-id");
+            response->setType(IQ::Get);
+            channel_->onIQReceived(response);
+
+            CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
+            CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
+            CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(channel_->iqs_.size()));
+        }
+
+        void testHandleIQ_SetWithSameID() {
+            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> response = createResponse(JID("foo@bar.com/baz"), "test-id");
+            response->setType(IQ::Set);
+            channel_->onIQReceived(response);
+
+            CPPUNIT_ASSERT_EQUAL(0, responsesReceived_);
+            CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(receivedErrors.size()));
+            CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(channel_->iqs_.size()));
+        }
+
+        void testHandleIQ_IncorrectSender() {
+            MyRequest testling(IQ::Get, JID("foo@bar.com/baz"), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID("anotherfoo@bar.com/baz"), "test-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_IncorrectSenderForServerQuery() {
+            MyRequest testling(IQ::Get, JID(), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID("foo@bar.com/baz"), "test-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_IncorrectOtherResourceSenderForServerQuery() {
+            MyRequest testling(IQ::Get, JID(), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID("alice@wonderland.lit/RabbitHole"), "test-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_ServerRespondsWithDomain() {
+            MyRequest testling(IQ::Get, JID(), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID("wonderland.lit"),"test-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_ServerRespondsWithBareJID() {
+            MyRequest testling(IQ::Get, JID(), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID("alice@wonderland.lit"),"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()));
+        }
+
+        // This tests a bug in ejabberd servers (2.0.5)
+        void testHandleIQ_ServerRespondsWithFullJID() {
+            MyRequest testling(IQ::Get, JID(), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID("alice@wonderland.lit/TeaParty"),"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()));
+        }
+
+        void testHandleIQ_ServerRespondsWithoutFrom() {
+            MyRequest testling(IQ::Get, JID(), payload_, router_);
+            router_->setJID("alice@wonderland.lit/TeaParty");
+            testling.onResponse.connect(boost::bind(&RequestTest::handleResponse, this, _1, _2));
+            testling.send();
+
+            channel_->onIQReceived(createResponse(JID(),"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()));
+        }
+
+
+
+    private:
+        void handleResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref 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(std::string("bar"), payload->text_);
+                ++responsesReceived_;
+            }
+        }
+
+        void handleDifferentResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref e) {
+            CPPUNIT_ASSERT(!e);
+            CPPUNIT_ASSERT(!p);
+            ++responsesReceived_;
+        }
+
+        void handleRawXMLResponse(boost::shared_ptr<Payload> p, ErrorPayload::ref e) {
+            CPPUNIT_ASSERT(!e);
+            CPPUNIT_ASSERT(p);
+            CPPUNIT_ASSERT(boost::dynamic_pointer_cast<MyOtherPayload>(p));
+            ++responsesReceived_;
+        }
+
+        boost::shared_ptr<IQ> createResponse(const JID& from, const std::string& id) {
+            boost::shared_ptr<IQ> iq(new IQ(IQ::Result));
+            iq->setFrom(from);
+            iq->addPayload(responsePayload_);
+            iq->setID(id);
+            return iq;
+        }
+
+        boost::shared_ptr<IQ> createError(const JID& from, const std::string& id) {
+            boost::shared_ptr<IQ> iq(new IQ(IQ::Error));
+            iq->setFrom(from);
+            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
index 42d8651..c3474f2 100644
--- a/Swiften/Queries/UnitTest/ResponderTest.cpp
+++ b/Swiften/Queries/UnitTest/ResponderTest.cpp
@@ -19,140 +19,140 @@
 using namespace Swift;
 
 class ResponderTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(ResponderTest);
-		CPPUNIT_TEST(testConstructor);
-		CPPUNIT_TEST(testStart);
-		CPPUNIT_TEST(testStop);
-		CPPUNIT_TEST(testHandleIQ_Set);
-		CPPUNIT_TEST(testHandleIQ_Get);
-		CPPUNIT_TEST(testHandleIQ_Error);
-		CPPUNIT_TEST(testHandleIQ_Result);
-		CPPUNIT_TEST(testHandleIQ_NoPayload);
-		CPPUNIT_TEST_SUITE_END();
+        CPPUNIT_TEST_SUITE(ResponderTest);
+        CPPUNIT_TEST(testConstructor);
+        CPPUNIT_TEST(testStart);
+        CPPUNIT_TEST(testStop);
+        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:
-		void setUp() {
-			channel_ = new DummyIQChannel();
-			router_ = new IQRouter(channel_);
-			payload_ = boost::make_shared<SoftwareVersion>("foo");
-		}
+    public:
+        void setUp() {
+            channel_ = new DummyIQChannel();
+            router_ = new IQRouter(channel_);
+            payload_ = boost::make_shared<SoftwareVersion>("foo");
+        }
 
-		void tearDown() {
-			delete router_;
-			delete channel_;
-		}
-
-		void testConstructor() {
-			MyResponder testling(router_);
-
-			channel_->onIQReceived(createRequest(IQ::Set));
-
-			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.setPayloads_.size()));
-		}
-
-		void testStart() {
-			MyResponder testling(router_);
-
-			testling.start();
-			channel_->onIQReceived(createRequest(IQ::Set));
-
-			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling.setPayloads_.size()));
-		}
-
-		void testStop() {
-			MyResponder testling(router_);
-
-			testling.start();
-			testling.stop();
-			channel_->onIQReceived(createRequest(IQ::Set));
-
-			CPPUNIT_ASSERT_EQUAL(0, 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::make_shared<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) {}
+        void tearDown() {
+            delete router_;
+            delete channel_;
+        }
+
+        void testConstructor() {
+            MyResponder testling(router_);
+
+            channel_->onIQReceived(createRequest(IQ::Set));
+
+            CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(testling.setPayloads_.size()));
+        }
+
+        void testStart() {
+            MyResponder testling(router_);
+
+            testling.start();
+            channel_->onIQReceived(createRequest(IQ::Set));
+
+            CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(testling.setPayloads_.size()));
+        }
+
+        void testStop() {
+            MyResponder testling(router_);
+
+            testling.start();
+            testling.stop();
+            channel_->onIQReceived(createRequest(IQ::Set));
+
+            CPPUNIT_ASSERT_EQUAL(0, 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::make_shared<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 JID&, const std::string& id, boost::shared_ptr<SoftwareVersion> payload) {
-					CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), from);
-					CPPUNIT_ASSERT_EQUAL(std::string("myid"), id);
-					getPayloads_.push_back(payload);
-					return getRequestResponse_;
-				}
-				virtual bool handleSetRequest(const JID& from, const JID&, const std::string& id, boost::shared_ptr<SoftwareVersion> payload) {
-					CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), from);
-					CPPUNIT_ASSERT_EQUAL(std::string("myid"), id);
-					setPayloads_.push_back(payload);
-					return setRequestResponse_;
-				}
+                virtual bool handleGetRequest(const JID& from, const JID&, const std::string& id, boost::shared_ptr<SoftwareVersion> payload) {
+                    CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), from);
+                    CPPUNIT_ASSERT_EQUAL(std::string("myid"), id);
+                    getPayloads_.push_back(payload);
+                    return getRequestResponse_;
+                }
+                virtual bool handleSetRequest(const JID& from, const JID&, const std::string& id, boost::shared_ptr<SoftwareVersion> payload) {
+                    CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com/baz"), from);
+                    CPPUNIT_ASSERT_EQUAL(std::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_;
-		};
+                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_;
+    private:
+        IQRouter* router_;
+        DummyIQChannel* channel_;
+        boost::shared_ptr<SoftwareVersion> payload_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ResponderTest);
author	Tobias Markmann <tm@ayena.de>	2016-03-31 14:57:35 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2016-03-31 14:57:35 (GMT)
commit	cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch)
tree	18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Queries/UnitTest
parent	1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff)
download	swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2