6 files changed, 54 insertions, 4 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 35bb096..09d357c 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -6,6 +6,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
+#include <iostream>
 
 #include "Swiften/Client/Client.h"
 #include "Swiften/Network/TimerFactory.h"
diff --git a/Swiften/QA/ProxyProviderTest/.gitignore b/Swiften/QA/ProxyProviderTest/.gitignore
new file mode 100644
index 0000000..9d4b9b8
--- /dev/null
+++ b/Swiften/QA/ProxyProviderTest/.gitignore
@@ -0,0 +1 @@
+ProxyProviderTest
diff --git a/Swiften/QA/ProxyProviderTest/ProxyProviderTest.cpp b/Swiften/QA/ProxyProviderTest/ProxyProviderTest.cpp
new file mode 100644
index 0000000..ddaee01
--- /dev/null
+++ b/Swiften/QA/ProxyProviderTest/ProxyProviderTest.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010 Thilo Cestonaro
+ * Licensed under the BSD License.
+ * See Documentation/Licenses/BSD.txt for more information.
+ */
+
+#include <iostream>
+
+#include <Swiften/Network/PlatformProxyProvider.h>
+#include <Swiften/Base/foreach.h>
+
+using namespace Swift;
+
+int main(void)
+{
+	int ret = 0;
+	HostAddressPort hap;
+	
+	std::cout << "constructing PlatfromProxyProvider instance ..." << std::endl;
+	PlatformProxyProvider ppp;
+
+	hap = ppp.getSOCKS5Proxy();
+	std::cout << "SOCKS5 Proxy configured: " << hap.isValid() << std::endl;
+	if(hap.isValid()) {
+		std::cout << "SOCKS5 Proxy: " << hap.getAddress().toString() << ":" << hap.getPort() << std::endl;
+	}
+
+	hap = ppp.getHTTPConnectProxy();
+	std::cout << "HTTPConnect Proxy configured: " << hap.isValid() << std::endl;
+	if(hap.isValid()) {
+		std::cout << "HTTPConnect Proxy: " << hap.getAddress().toString() << ":" << hap.getPort() << std::endl;
+	}
+
+	return ret;
+}
diff --git a/Swiften/QA/ProxyProviderTest/SConscript b/Swiften/QA/ProxyProviderTest/SConscript
new file mode 100644
index 0000000..2eb123d
--- /dev/null
+++ b/Swiften/QA/ProxyProviderTest/SConscript
@@ -0,0 +1,11 @@
+import os
+
+Import("env")
+
+myenv = env.Clone()
+myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+
+myenv.Program("ProxyProviderTest", [
+		"ProxyProviderTest.cpp",
+	])
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
index 25ba814..2f2be6e 100644
--- a/Swiften/QA/SConscript
+++ b/Swiften/QA/SConscript
@@ -5,7 +5,8 @@ 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 925c775..73df0a0 100644
--- a/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
+++ b/Swiften/QA/StorageTest/FileReadBytestreamTest.cpp
@@ -7,6 +7,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
+#include <Swiften/Base/ByteArray.h>
 #include "Swiften/FileTransfer/FileReadBytestream.h"
 #include "SwifTools/Application/PlatformApplicationPathProvider.h"
 
@@ -32,16 +33,16 @@ class FileReadBytestreamTest : public CppUnit::TestFixture {
 		void testRead() {
 			std::auto_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());
 
 			testling->read(10);
-			ByteArray result = testling->read(10);
+			ByteArray result(testling->read(10));
 
 			CPPUNIT_ASSERT_EQUAL(std::string("right (c) "), result.toString());
 		}