3 files changed, 157 insertions, 157 deletions
diff --git a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
index d70d9c9..5b3867c 100644
--- a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
+++ b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
@@ -15,61 +15,61 @@
 using namespace Swift;
 
 class FileReadBytestreamTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(FileReadBytestreamTest);
-		CPPUNIT_TEST(testRead);
-		CPPUNIT_TEST(testRead_Twice);
-		CPPUNIT_TEST(testIsFinished_NotFinished);
-		CPPUNIT_TEST(testIsFinished_IsFinished);
-		CPPUNIT_TEST_SUITE_END();
+        CPPUNIT_TEST_SUITE(FileReadBytestreamTest);
+        CPPUNIT_TEST(testRead);
+        CPPUNIT_TEST(testRead_Twice);
+        CPPUNIT_TEST(testIsFinished_NotFinished);
+        CPPUNIT_TEST(testIsFinished_IsFinished);
+        CPPUNIT_TEST_SUITE_END();
 
-	public:
-		void setUp() {
-			pathProvider = new PlatformApplicationPathProvider("FileReadBytestreamTest");
-		}
+    public:
+        void setUp() {
+            pathProvider = new PlatformApplicationPathProvider("FileReadBytestreamTest");
+        }
 
-		void tearDown() {
-			delete pathProvider;
-		}
+        void tearDown() {
+            delete pathProvider;
+        }
 
-		void testRead() {
-			boost::shared_ptr<FileReadBytestream> testling(createTestling());
+        void testRead() {
+            boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
-			boost::shared_ptr< std::vector<unsigned char> > result = testling->read(10);
+            boost::shared_ptr< std::vector<unsigned char> > result = testling->read(10);
 
-			CPPUNIT_ASSERT(createByteArray("/*\n * Copy") == *result.get());
-		}
+            CPPUNIT_ASSERT(createByteArray("/*\n * Copy") == *result.get());
+        }
 
-		void testRead_Twice() {
-			boost::shared_ptr<FileReadBytestream> testling(createTestling());
+        void testRead_Twice() {
+            boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
-			testling->read(10);
-			boost::shared_ptr< std::vector<unsigned char> > result = testling->read(10);
+            testling->read(10);
+            boost::shared_ptr< std::vector<unsigned char> > result = testling->read(10);
 
-			CPPUNIT_ASSERT_EQUAL(std::string("right (c) "), byteArrayToString(*result));
-		}
+            CPPUNIT_ASSERT_EQUAL(std::string("right (c) "), byteArrayToString(*result));
+        }
 
-		void testIsFinished_NotFinished() {
-			boost::shared_ptr<FileReadBytestream> testling(createTestling());
+        void testIsFinished_NotFinished() {
+            boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
-			testling->read(10);
+            testling->read(10);
 
-			CPPUNIT_ASSERT(!testling->isFinished());
-		}
+            CPPUNIT_ASSERT(!testling->isFinished());
+        }
 
-		void testIsFinished_IsFinished() {
-			boost::shared_ptr<FileReadBytestream> testling(createTestling());
+        void testIsFinished_IsFinished() {
+            boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
-			testling->read(4096);
+            testling->read(4096);
 
-			CPPUNIT_ASSERT(testling->isFinished());
-		}
+            CPPUNIT_ASSERT(testling->isFinished());
+        }
 
-	private:
-		FileReadBytestream* createTestling() {
-			return new FileReadBytestream(pathProvider->getExecutableDir() / "FileReadBytestreamTest.cpp");
-		}
+    private:
+        FileReadBytestream* createTestling() {
+            return new FileReadBytestream(pathProvider->getExecutableDir() / "FileReadBytestreamTest.cpp");
+        }
 
-		PlatformApplicationPathProvider* pathProvider;
+        PlatformApplicationPathProvider* pathProvider;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FileReadBytestreamTest);
diff --git a/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp b/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp
index 3686cf9..e847c28 100644
--- a/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp
+++ b/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp
@@ -17,42 +17,42 @@
 using namespace Swift;
 
 class FileWriteBytestreamTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(FileWriteBytestreamTest);
-		CPPUNIT_TEST(testSuccessfulWrite);
-		CPPUNIT_TEST(testFailingWrite);
-		CPPUNIT_TEST_SUITE_END();
+        CPPUNIT_TEST_SUITE(FileWriteBytestreamTest);
+        CPPUNIT_TEST(testSuccessfulWrite);
+        CPPUNIT_TEST(testFailingWrite);
+        CPPUNIT_TEST_SUITE_END();
 
-	public:
-		void setUp() {
-			onWriteWasCalled = false;
-		}
+    public:
+        void setUp() {
+            onWriteWasCalled = false;
+        }
 
-		void testSuccessfulWrite() {
-			boost::filesystem::path filename = boost::filesystem::unique_path("write_file_bytestream_test_%%%%%%%%%%%%%%%%.bin");
-			boost::shared_ptr<WriteBytestream> writeBytestream = boost::make_shared<FileWriteBytestream>(filename.string());
-			writeBytestream->onWrite.connect(boost::bind(&FileWriteBytestreamTest::handleOnWrite, this, _1));
+        void testSuccessfulWrite() {
+            boost::filesystem::path filename = boost::filesystem::unique_path("write_file_bytestream_test_%%%%%%%%%%%%%%%%.bin");
+            boost::shared_ptr<WriteBytestream> writeBytestream = boost::make_shared<FileWriteBytestream>(filename.string());
+            writeBytestream->onWrite.connect(boost::bind(&FileWriteBytestreamTest::handleOnWrite, this, _1));
 
-			CPPUNIT_ASSERT_EQUAL(true, writeBytestream->write(createByteArray("Some data.")));
-			CPPUNIT_ASSERT_EQUAL(true, onWriteWasCalled);
+            CPPUNIT_ASSERT_EQUAL(true, writeBytestream->write(createByteArray("Some data.")));
+            CPPUNIT_ASSERT_EQUAL(true, onWriteWasCalled);
 
-			boost::filesystem::remove(filename);
-		}
+            boost::filesystem::remove(filename);
+        }
 
-		void testFailingWrite() {
-			boost::shared_ptr<WriteBytestream> writeBytestream = boost::make_shared<FileWriteBytestream>("");
-			writeBytestream->onWrite.connect(boost::bind(&FileWriteBytestreamTest::handleOnWrite, this, _1));
+        void testFailingWrite() {
+            boost::shared_ptr<WriteBytestream> writeBytestream = boost::make_shared<FileWriteBytestream>("");
+            writeBytestream->onWrite.connect(boost::bind(&FileWriteBytestreamTest::handleOnWrite, this, _1));
 
-			CPPUNIT_ASSERT_EQUAL(false, writeBytestream->write(createByteArray("Some data.")));
-			CPPUNIT_ASSERT_EQUAL(false, onWriteWasCalled);
-		}
+            CPPUNIT_ASSERT_EQUAL(false, writeBytestream->write(createByteArray("Some data.")));
+            CPPUNIT_ASSERT_EQUAL(false, onWriteWasCalled);
+        }
 
 
-		void handleOnWrite(const std::vector<unsigned char>& /*data*/) {
-			onWriteWasCalled = true;
-		}
+        void handleOnWrite(const std::vector<unsigned char>& /*data*/) {
+            onWriteWasCalled = true;
+        }
 
-	private:
-		bool onWriteWasCalled;
+    private:
+        bool onWriteWasCalled;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FileWriteBytestreamTest);
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index 4d639e6..69e5917 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -20,97 +20,97 @@
 using namespace Swift;
 
 class VCardFileStorageTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(VCardFileStorageTest);
-		CPPUNIT_TEST(testSetVCard);
-		// Temporarily disabling this, because it generates error messages on console. Need to figure
-		// out something for not showing error messages during tests.
-		//CPPUNIT_TEST(testSetVCard_LargeFilename);
-		CPPUNIT_TEST(testGetVCard);
-		CPPUNIT_TEST(testGetVCard_FileDoesNotExist);
-		//CPPUNIT_TEST(testGetVCard_LargeFilename);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		void setUp() {
-			pathProvider = new PlatformApplicationPathProvider("VCardStorageTest");
-			vcardsPath = pathProvider->getExecutableDir() / "vcards";
-			boost::filesystem::remove_all(vcardsPath);
-		}
-
-		void tearDown() {
-			delete pathProvider;
-			boost::filesystem::remove_all(vcardsPath);
-		}
-
-		void testSetVCard() {
-			boost::shared_ptr<VCardFileStorage> testling(createTestling());
-			VCard::ref vcard(new VCard());
-			vcard->setFullName("Alice In Wonderland");
-
-			testling->setVCard(JID("alice@wonderland.lit/TeaRoom"), vcard);
-
-			boost::filesystem::path vcardFile(vcardsPath / "alice@wonderland.lit%2fTeaRoom.xml");
-			CPPUNIT_ASSERT(boost::filesystem::exists(vcardFile));
-			ByteArray data;
-			data.readFromFile(vcardFile);
-			CPPUNIT_ASSERT(boost::starts_with(data.toString(), "<vCard xmlns=\"vcard-temp\">"));
-		}
-
-		void testSetVCard_LargeFilename() {
-			std::auto_ptr<VCardFileStorage> testling(createTestling());
-			VCard::ref vcard(new VCard());
-			vcard->setFullName("Alice In Wonderland");
-
-			std::ostringstream s;
-			for (int i = 0; i < 1000; ++i) {
-				s << "_";
-			}
-
-			JID jid("alice@wonderland.lit/" + s.str());
-			testling->setVCard(jid, vcard);
-
-			// Just check whether we don't crash
-		}
-
-		void testGetVCard() {
-			boost::shared_ptr<VCardFileStorage> testling(createTestling());
-			VCard::ref vcard(new VCard());
-			vcard->setFullName("Alice In Wonderland");
-			testling->setVCard(JID("alice@wonderland.lit"), vcard);
-
-			VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
-			CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), result->getFullName());
-		}
-
-		void testGetVCard_LargeFilename() {
-			std::auto_ptr<VCardFileStorage> testling(createTestling());
-			VCard::ref vcard(new VCard());
-			vcard->setFullName("Alice In Wonderland");
-
-			std::ostringstream s;
-			for (int i = 0; i < 1000; ++i) {
-				s << "_";
-			}
-			JID jid("alice@wonderland.lit/" + s.str());
-
-			VCard::ref result = testling->getVCard(jid);
-
-			// Just check that we don't have an exception
-		}
-
-		void testGetVCard_FileDoesNotExist() {
-			boost::shared_ptr<VCardFileStorage> testling(createTestling());
-			VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
-			CPPUNIT_ASSERT(!result);
-		}
-
-	private:
-		VCardFileStorage* createTestling() {
-			return new VCardFileStorage(vcardsPath);
-		}
-
-		PlatformApplicationPathProvider* pathProvider;
-		boost::filesystem::path vcardsPath;
+        CPPUNIT_TEST_SUITE(VCardFileStorageTest);
+        CPPUNIT_TEST(testSetVCard);
+        // Temporarily disabling this, because it generates error messages on console. Need to figure
+        // out something for not showing error messages during tests.
+        //CPPUNIT_TEST(testSetVCard_LargeFilename);
+        CPPUNIT_TEST(testGetVCard);
+        CPPUNIT_TEST(testGetVCard_FileDoesNotExist);
+        //CPPUNIT_TEST(testGetVCard_LargeFilename);
+        CPPUNIT_TEST_SUITE_END();
+
+    public:
+        void setUp() {
+            pathProvider = new PlatformApplicationPathProvider("VCardStorageTest");
+            vcardsPath = pathProvider->getExecutableDir() / "vcards";
+            boost::filesystem::remove_all(vcardsPath);
+        }
+
+        void tearDown() {
+            delete pathProvider;
+            boost::filesystem::remove_all(vcardsPath);
+        }
+
+        void testSetVCard() {
+            boost::shared_ptr<VCardFileStorage> testling(createTestling());
+            VCard::ref vcard(new VCard());
+            vcard->setFullName("Alice In Wonderland");
+
+            testling->setVCard(JID("alice@wonderland.lit/TeaRoom"), vcard);
+
+            boost::filesystem::path vcardFile(vcardsPath / "alice@wonderland.lit%2fTeaRoom.xml");
+            CPPUNIT_ASSERT(boost::filesystem::exists(vcardFile));
+            ByteArray data;
+            data.readFromFile(vcardFile);
+            CPPUNIT_ASSERT(boost::starts_with(data.toString(), "<vCard xmlns=\"vcard-temp\">"));
+        }
+
+        void testSetVCard_LargeFilename() {
+            std::auto_ptr<VCardFileStorage> testling(createTestling());
+            VCard::ref vcard(new VCard());
+            vcard->setFullName("Alice In Wonderland");
+
+            std::ostringstream s;
+            for (int i = 0; i < 1000; ++i) {
+                s << "_";
+            }
+
+            JID jid("alice@wonderland.lit/" + s.str());
+            testling->setVCard(jid, vcard);
+
+            // Just check whether we don't crash
+        }
+
+        void testGetVCard() {
+            boost::shared_ptr<VCardFileStorage> testling(createTestling());
+            VCard::ref vcard(new VCard());
+            vcard->setFullName("Alice In Wonderland");
+            testling->setVCard(JID("alice@wonderland.lit"), vcard);
+
+            VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
+            CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), result->getFullName());
+        }
+
+        void testGetVCard_LargeFilename() {
+            std::auto_ptr<VCardFileStorage> testling(createTestling());
+            VCard::ref vcard(new VCard());
+            vcard->setFullName("Alice In Wonderland");
+
+            std::ostringstream s;
+            for (int i = 0; i < 1000; ++i) {
+                s << "_";
+            }
+            JID jid("alice@wonderland.lit/" + s.str());
+
+            VCard::ref result = testling->getVCard(jid);
+
+            // Just check that we don't have an exception
+        }
+
+        void testGetVCard_FileDoesNotExist() {
+            boost::shared_ptr<VCardFileStorage> testling(createTestling());
+            VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
+            CPPUNIT_ASSERT(!result);
+        }
+
+    private:
+        VCardFileStorage* createTestling() {
+            return new VCardFileStorage(vcardsPath);
+        }
+
+        PlatformApplicationPathProvider* pathProvider;
+        boost::filesystem::path vcardsPath;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(VCardFileStorageTest);