2 files changed, 15 insertions, 14 deletions
diff --git a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
index 925c775..e090c6c 100644
--- a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
+++ b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
@@ -7,7 +7,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swiften/FileTransfer/FileReadBytestream.h"
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/FileTransfer/FileReadBytestream.h>
 #include "SwifTools/Application/PlatformApplicationPathProvider.h"
 
 using namespace Swift;
@@ -30,24 +31,24 @@ class FileReadBytestreamTest : public CppUnit::TestFixture {
 		}
 
 		void testRead() {
-			std::auto_ptr<FileReadBytestream> testling(createTestling());
+			boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
-			ByteArray result = testling->read(10);
+			std::vector<unsigned char> result = testling->read(10);
 
-			CPPUNIT_ASSERT_EQUAL(std::string("/*\n * Copy"), result.toString());
+			CPPUNIT_ASSERT(ByteArray::create("/*\n * Copy") == result);
 		}
 
 		void testRead_Twice() {
-			std::auto_ptr<FileReadBytestream> testling(createTestling());
+			boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
 			testling->read(10);
-			ByteArray result = testling->read(10);
+			ByteArray result(testling->read(10));
 
 			CPPUNIT_ASSERT_EQUAL(std::string("right (c) "), result.toString());
 		}
 
 		void testIsFinished_NotFinished() {
-			std::auto_ptr<FileReadBytestream> testling(createTestling());
+			boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
 			testling->read(10);
 
@@ -55,7 +56,7 @@ class FileReadBytestreamTest : public CppUnit::TestFixture {
 		}
 
 		void testIsFinished_IsFinished() {
-			std::auto_ptr<FileReadBytestream> testling(createTestling());
+			boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
 			testling->read(4096);
 
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index 992ee50..45a04ba 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -8,10 +8,10 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <boost/algorithm/string.hpp>
 
-#include "Swiften/VCards/VCardFileStorage.h"
-#include "Swiften/JID/JID.h"
+#include <Swiften/VCards/VCardFileStorage.h>
+#include <Swiften/JID/JID.h>
 #include "SwifTools/Application/PlatformApplicationPathProvider.h"
-#include "Swiften/Elements/VCard.h"
+#include <Swiften/Elements/VCard.h>
 
 using namespace Swift;
 
@@ -35,7 +35,7 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
 		}
 
 		void testSetVCard() {
-			std::auto_ptr<VCardFileStorage> testling(createTestling());
+			boost::shared_ptr<VCardFileStorage> testling(createTestling());
 			VCard::ref vcard(new VCard());
 			vcard->setFullName("Alice In Wonderland");
 
@@ -49,7 +49,7 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
 		}
 
 		void testGetVCard() {
-			std::auto_ptr<VCardFileStorage> testling(createTestling());
+			boost::shared_ptr<VCardFileStorage> testling(createTestling());
 			VCard::ref vcard(new VCard());
 			vcard->setFullName("Alice In Wonderland");
 			testling->setVCard(JID("alice@wonderland.lit"), vcard);
@@ -59,7 +59,7 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
 		}
 
 		void testGetVCard_FileDoesNotExist() {
-			std::auto_ptr<VCardFileStorage> testling(createTestling());
+			boost::shared_ptr<VCardFileStorage> testling(createTestling());
 			VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
 			CPPUNIT_ASSERT(!result);
 		}