2 files changed, 51 insertions, 0 deletions
diff --git a/Swiften/Base/UnitTest/PathTest.cpp b/Swiften/Base/UnitTest/PathTest.cpp
new file mode 100644
index 0000000..f5f99e7
--- /dev/null
+++ b/Swiften/Base/UnitTest/PathTest.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <Swiften/Base/Path.h>
+#include <Swiften/Base/Platform.h>
+
+using namespace Swift;
+
+class PathTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(PathTest);
+		CPPUNIT_TEST(testStringToPath);
+		CPPUNIT_TEST(testPathToString);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void testStringToPath() {
+#ifdef SWIFTEN_PLATFORM_WINDOWS
+			CPPUNIT_ASSERT(std::wstring(L"tron\xe7on") == stringToPath("tron\xc3\xa7on").native());
+#else
+			CPPUNIT_ASSERT_EQUAL(std::string("tron\xc3\xa7on"), stringToPath("tron\xc3\xa7on").native());
+#endif
+		}
+
+		void testPathToString() {
+			CPPUNIT_ASSERT_EQUAL(std::string("tron\xc3\xa7on"), pathToString(stringToPath("tron\xc3\xa7on")));
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PathTest);
+
diff --git a/Swiften/Base/UnitTest/StringTest.cpp b/Swiften/Base/UnitTest/StringTest.cpp
index b29f331..ffca98a 100644
--- a/Swiften/Base/UnitTest/StringTest.cpp
+++ b/Swiften/Base/UnitTest/StringTest.cpp
@@ -9,6 +9,7 @@
 #include <string>
 
 #include <Swiften/Base/String.h>
+#include <Swiften/Base/Platform.h>
 
 using namespace Swift;
 
@@ -24,6 +25,10 @@ class StringTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testReplaceAll_ConsecutiveChars);
 		CPPUNIT_TEST(testReplaceAll_MatchingReplace);
 		CPPUNIT_TEST(testSplit);
+#ifdef SWIFTEN_PLATFORM_WINDOWS
+		CPPUNIT_TEST(testConvertWStringToString);
+		CPPUNIT_TEST(testConvertStringToWString);
+#endif
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -109,6 +114,16 @@ class StringTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(std::string("def"), result[1]);
 			CPPUNIT_ASSERT_EQUAL(std::string("ghi"), result[2]);
 		}
+
+#ifdef SWIFTEN_PLATFORM_WINDOWS
+		void testConvertWStringToString() {
+			CPPUNIT_ASSERT_EQUAL(std::string("tron\xc3\xa7on"), convertWStringToString(std::wstring(L"tron\xe7on")));
+		}
+
+		void testConvertStringToWString() {
+			CPPUNIT_ASSERT(std::wstring(L"tron\xe7on") == convertStringToWString(std::string("tron\xc3\xa7on")));
+		}
+#endif
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(StringTest);