4 files changed, 68 insertions, 8 deletions
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
index 2135ef4..2c588e5 100644
--- a/Swiften/QA/SConscript
+++ b/Swiften/QA/SConscript
@@ -5,7 +5,7 @@ SConscript(dirs = [
 #		"ReconnectTest",
 		"ClientTest",
 #		"DNSSDTest",
-#		"StorageTest",
+		"StorageTest",
 		"TLSTest",
 		"ScriptedTests",
 		"ProxyProviderTest",
diff --git a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
index c36420a..d70d9c9 100644
--- a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
+++ b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,7 +9,8 @@
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/FileTransfer/FileReadBytestream.h>
-#include "SwifTools/Application/PlatformApplicationPathProvider.h"
+
+#include <SwifTools/Application/PlatformApplicationPathProvider.h>
 
 using namespace Swift;
 
@@ -33,18 +34,18 @@ class FileReadBytestreamTest : public CppUnit::TestFixture {
 		void testRead() {
 			boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
-			std::vector<unsigned char> result = testling->read(10);
+			boost::shared_ptr< std::vector<unsigned char> > result = testling->read(10);
 
-			CPPUNIT_ASSERT(ByteArray::create("/*\n * Copy") == result);
+			CPPUNIT_ASSERT(createByteArray("/*\n * Copy") == *result.get());
 		}
 
 		void testRead_Twice() {
 			boost::shared_ptr<FileReadBytestream> testling(createTestling());
 
 			testling->read(10);
-			ByteArray result(testling->read(10));
+			boost::shared_ptr< std::vector<unsigned char> > result = testling->read(10);
 
-			CPPUNIT_ASSERT_EQUAL(std::string("right (c) "), result.toString());
+			CPPUNIT_ASSERT_EQUAL(std::string("right (c) "), byteArrayToString(*result));
 		}
 
 		void testIsFinished_NotFinished() {
diff --git a/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp b/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp
new file mode 100644
index 0000000..3686cf9
--- /dev/null
+++ b/Swiften/QA/StorageTest/FileWriteBytestreamTest.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <boost/bind.hpp>
+#include <boost/filesystem.hpp>
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/FileTransfer/FileWriteBytestream.h>
+
+using namespace Swift;
+
+class FileWriteBytestreamTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(FileWriteBytestreamTest);
+		CPPUNIT_TEST(testSuccessfulWrite);
+		CPPUNIT_TEST(testFailingWrite);
+		CPPUNIT_TEST_SUITE_END();
+
+	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));
+
+			CPPUNIT_ASSERT_EQUAL(true, writeBytestream->write(createByteArray("Some data.")));
+			CPPUNIT_ASSERT_EQUAL(true, onWriteWasCalled);
+
+			boost::filesystem::remove(filename);
+		}
+
+		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);
+		}
+
+
+		void handleOnWrite(const std::vector<unsigned char>& /*data*/) {
+			onWriteWasCalled = true;
+		}
+
+	private:
+		bool onWriteWasCalled;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(FileWriteBytestreamTest);
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index 6d65b30..fff2a2b 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -15,7 +15,8 @@ if env["TEST"] :
 	myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
 
 	tester = myenv.Program("StorageTest", [
-			"VCardFileStorageTest.cpp",
+			#"VCardFileStorageTest.cpp",
 			"FileReadBytestreamTest.cpp",
+			"FileWriteBytestreamTest.cpp",
 		])
 	myenv.Test(tester, "system", is_checker = True)