2 files changed, 0 insertions, 126 deletions
diff --git a/Swiften b/Swiften
new file mode 160000
+Subproject 8213ba16d0043d2461f4b031c881d61dda5a38c
diff --git a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
deleted file mode 100644
index 2c9c526..0000000
--- a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-
-#include "Swiften/Presence/PresenceOracle.h"
-#include "Swiften/Client/DummyStanzaChannel.h"
-
-using namespace Swift;
-
-class PresencePointerPair {
-	public:
-		boost::shared_ptr<Presence> one;
-		boost::shared_ptr<Presence> two;
-};
-
-class SubscriptionRequestInfo {
-	public:
-		boost::optional<JID> jid;
-		boost::optional<String> reason;
-};
-
-class PresenceOracleTest : public CppUnit::TestFixture
-{
-		CPPUNIT_TEST_SUITE(PresenceOracleTest);
-		CPPUNIT_TEST(testFirstPresence);
-		CPPUNIT_TEST(testSecondPresence);
-		CPPUNIT_TEST(testSubscriptionRequest);
-		CPPUNIT_TEST_SUITE_END();
-
-	private:
-		PresenceOracle* oracle_;
-		DummyStanzaChannel* stanzaChannel_;
-
-	public:
-
-		void handlePresenceChange(boost::shared_ptr<Presence> newPresence, boost::shared_ptr<Presence> lastPresence, PresencePointerPair* out) {
-			CPPUNIT_ASSERT(out->one.get() == NULL);
-			CPPUNIT_ASSERT(out->two.get() == NULL);
-			out->one = newPresence;
-			out->two = lastPresence;
-			CPPUNIT_ASSERT(newPresence.get());
-			CPPUNIT_ASSERT_EQUAL(newPresence, out->one);
-		}
-		
-		void handlePresenceSubscriptionRequest(const JID& jid, const String& reason, SubscriptionRequestInfo* info) {
-			CPPUNIT_ASSERT(!info->jid);
-			CPPUNIT_ASSERT(!info->reason);
-			info->jid = jid;
-			info->reason = reason;
-		}
-
-		void setUp() {
-			stanzaChannel_ = new DummyStanzaChannel();
-			oracle_ = new PresenceOracle(stanzaChannel_);
-		}
-
-		void tearDown() {
-			delete oracle_;
-			delete stanzaChannel_;
-		}
-
-		void testFirstPresence() {
-			PresencePointerPair out;
-			oracle_->onPresenceChange.connect(boost::bind(&PresenceOracleTest::handlePresenceChange, this, _1, _2, &out));
-
-			SubscriptionRequestInfo info;
-			oracle_->onPresenceSubscriptionRequest.connect(boost::bind(&PresenceOracleTest::handlePresenceSubscriptionRequest, this, _1, _2, &info));
-
-			boost::shared_ptr<Presence> sentPresence(new Presence("blarb"));
-			stanzaChannel_->onPresenceReceived(sentPresence);
-
-			CPPUNIT_ASSERT(!info.jid);
-			CPPUNIT_ASSERT(!info.reason);
-			CPPUNIT_ASSERT(out.two.get() == NULL);
-			CPPUNIT_ASSERT_EQUAL(sentPresence, out.one);
-		}
-		
-		void testSecondPresence() {
-			PresencePointerPair out;
-			oracle_->onPresenceChange.connect(boost::bind(&PresenceOracleTest::handlePresenceChange, this, _1, _2, &out));
-
-			boost::shared_ptr<Presence> sentPresence1(new Presence("blarb"));
-			stanzaChannel_->onPresenceReceived(sentPresence1);
-			CPPUNIT_ASSERT_EQUAL(sentPresence1, out.one);
-			out.one = boost::shared_ptr<Presence>();
-			
-			SubscriptionRequestInfo info;
-			oracle_->onPresenceSubscriptionRequest.connect(boost::bind(&PresenceOracleTest::handlePresenceSubscriptionRequest, this, _1, _2, &info));
-
-			boost::shared_ptr<Presence> sentPresence2(new Presence("test2"));
-			stanzaChannel_->onPresenceReceived(sentPresence2);
-
-			CPPUNIT_ASSERT(!info.jid);
-			CPPUNIT_ASSERT(!info.reason);
-			CPPUNIT_ASSERT_EQUAL(sentPresence1, out.two);
-			CPPUNIT_ASSERT_EQUAL(sentPresence2, out.one);
-		}
-
-		void testSubscriptionRequest() {
-			PresencePointerPair out;
-			oracle_->onPresenceChange.connect(boost::bind(&PresenceOracleTest::handlePresenceChange, this, _1, _2, &out));
-			SubscriptionRequestInfo info;
-			oracle_->onPresenceSubscriptionRequest.connect(boost::bind(&PresenceOracleTest::handlePresenceSubscriptionRequest, this, _1, _2, &info));
-
-			String reasonText = "Because I want to";
-			JID sentJID = JID("me@example.com");
-
-			boost::shared_ptr<Presence> sentPresence(new Presence());
-			sentPresence->setType(Presence::Subscribe);
-			sentPresence->setFrom(sentJID);
-			sentPresence->setStatus(reasonText);
-			stanzaChannel_->onPresenceReceived(sentPresence);
-
-			CPPUNIT_ASSERT(info.jid);
-			CPPUNIT_ASSERT(info.reason);
-			CPPUNIT_ASSERT_EQUAL(sentJID, info.jid.get());
-			CPPUNIT_ASSERT_EQUAL(reasonText, info.reason.get());
-
-			CPPUNIT_ASSERT(!out.two);
-			CPPUNIT_ASSERT(!out.one);
-		}
-};
-CPPUNIT_TEST_SUITE_REGISTRATION(PresenceOracleTest);
-