3 files changed, 39 insertions, 26 deletions
diff --git a/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
index 80f5ebd..5b385c2 100644
--- a/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
+++ b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
@@ -7,9 +7,9 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swiften/Client/DummyStanzaChannel.h"
-#include "Swiften/Presence/DirectedPresenceSender.h"
-#include "Swiften/Presence/StanzaChannelPresenceSender.h"
+#include <Swiften/Client/DummyStanzaChannel.h>
+#include <Swiften/Presence/DirectedPresenceSender.h>
+#include <Swiften/Presence/StanzaChannelPresenceSender.h>
 
 using namespace Swift;
 
@@ -41,7 +41,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSendPresence() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel->sentStanzas.size()));
@@ -50,7 +50,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSendPresence_UndirectedPresenceWithDirectedPresenceReceivers() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"), DirectedPresenceSender::AndSendPresence);
 
 			testling->sendPresence(testPresence);
@@ -64,7 +64,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSendPresence_DirectedPresenceWithDirectedPresenceReceivers() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"), DirectedPresenceSender::AndSendPresence);
 			channel->sentStanzas.clear();
 
@@ -77,7 +77,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testAddDirectedPresenceReceiver() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 			channel->sentStanzas.clear();
 
@@ -90,7 +90,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testAddDirectedPresenceReceiver_WithoutSendingPresence() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 			channel->sentStanzas.clear();
 
@@ -100,7 +100,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testAddDirectedPresenceReceiver_AfterSendingDirectedPresence() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 			secondTestPresence->setTo(JID("foo@bar.com"));
 			testling->sendPresence(secondTestPresence);
@@ -115,7 +115,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testRemoveDirectedPresenceReceiver() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"), DirectedPresenceSender::DontSendPresence);
 
 			testling->removeDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"), DirectedPresenceSender::AndSendPresence);
@@ -127,7 +127,7 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testRemoveDirectedPresenceReceiver_WithoutSendingPresence() {
-			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
+			boost::shared_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"), DirectedPresenceSender::AndSendPresence);
 			channel->sentStanzas.clear();
 
diff --git a/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp b/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp
index 132c865..3a6ab31 100644
--- a/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp
+++ b/Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp
@@ -9,10 +9,10 @@
 #include <vector>
 #include <boost/bind.hpp>
 
-#include "Swiften/Presence/PayloadAddingPresenceSender.h"
-#include "Swiften/Presence/StanzaChannelPresenceSender.h"
-#include "Swiften/Elements/Body.h"
-#include "Swiften/Client/DummyStanzaChannel.h"
+#include <Swiften/Presence/PayloadAddingPresenceSender.h>
+#include <Swiften/Presence/StanzaChannelPresenceSender.h>
+#include <Swiften/Elements/Body.h>
+#include <Swiften/Client/DummyStanzaChannel.h>
 
 using namespace Swift;
 
@@ -23,6 +23,7 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testSendPresenceDoesNotAlterOriginalPayload);
 		CPPUNIT_TEST(testSetPayloadAfterInitialPresenceResendsPresence);
 		CPPUNIT_TEST(testSetPayloadAfterUnavailablePresenceDoesNotResendPresence);
+		CPPUNIT_TEST(testSetPayloadAfterResetDoesNotResendPresence);
 		CPPUNIT_TEST(testSendDirectedPresenceIsNotResent);
 		CPPUNIT_TEST_SUITE_END();
 
@@ -38,7 +39,7 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSetPayloadAddsPayloadOnPresenceSend() {
-			std::auto_ptr<PayloadAddingPresenceSender> testling(createSender());
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
 
 			testling->setPayload(MyPayload::create("foo"));
 			testling->sendPresence(Presence::create("bar"));
@@ -49,7 +50,7 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSetNullPayloadDoesNotAddPayloadOnPresenceSend() {
-			std::auto_ptr<PayloadAddingPresenceSender> testling(createSender());
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
 
 			testling->setPayload(MyPayload::ref());
 			testling->sendPresence(Presence::create("bar"));
@@ -60,7 +61,7 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSendPresenceDoesNotAlterOriginalPayload() {
-			std::auto_ptr<PayloadAddingPresenceSender> testling(createSender());
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
 
 			testling->setPayload(MyPayload::create("foo"));
 			Presence::ref presence(Presence::create("bar"));
@@ -70,7 +71,7 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSetPayloadAfterInitialPresenceResendsPresence() {
-			std::auto_ptr<PayloadAddingPresenceSender> testling(createSender());
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
 
 			testling->sendPresence(Presence::create("bar"));
 			testling->setPayload(MyPayload::create("foo"));
@@ -81,7 +82,9 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSetPayloadAfterUnavailablePresenceDoesNotResendPresence() {
-			std::auto_ptr<PayloadAddingPresenceSender> testling(createSender());
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
+
+			testling->sendPresence(Presence::create("bar"));
 
 			Presence::ref presence = Presence::create("bar");
 			presence->setType(Presence::Unavailable);
@@ -89,11 +92,21 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 
 			testling->setPayload(MyPayload::create("foo"));
 
+			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(stanzaChannel->sentStanzas.size()));
+		}
+
+		void testSetPayloadAfterResetDoesNotResendPresence() {
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
+			testling->sendPresence(Presence::create("bar"));
+
+			testling->reset();
+			testling->setPayload(MyPayload::create("foo"));
+
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(stanzaChannel->sentStanzas.size()));
 		}
 
 		void testSendDirectedPresenceIsNotResent() {
-			std::auto_ptr<PayloadAddingPresenceSender> testling(createSender());
+			boost::shared_ptr<PayloadAddingPresenceSender> testling(createSender());
 
 			testling->sendPresence(Presence::create("bar"));
 			Presence::ref directedPresence = Presence::create("baz");
@@ -106,8 +119,8 @@ class PayloadAddingPresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 	private:
-		std::auto_ptr<PayloadAddingPresenceSender> createSender() {
-			std::auto_ptr<PayloadAddingPresenceSender> sender(new PayloadAddingPresenceSender(presenceSender));
+		boost::shared_ptr<PayloadAddingPresenceSender> createSender() {
+			boost::shared_ptr<PayloadAddingPresenceSender> sender(new PayloadAddingPresenceSender(presenceSender));
 			return sender;
 		}
 
diff --git a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
index 24cc62c..179538e 100644
--- a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
+++ b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
@@ -9,9 +9,9 @@
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "Swiften/Presence/PresenceOracle.h"
-#include "Swiften/Client/DummyStanzaChannel.h"
-#include "Swiften/Presence/SubscriptionManager.h"
+#include <Swiften/Presence/PresenceOracle.h>
+#include <Swiften/Client/DummyStanzaChannel.h>
+#include <Swiften/Presence/SubscriptionManager.h>
 
 using namespace Swift;