15 files changed, 458 insertions, 175 deletions
diff --git a/Swiften/IDN/ICUConverter.cpp b/Swiften/IDN/ICUConverter.cpp
new file mode 100644
index 0000000..f698eb9
--- /dev/null
+++ b/Swiften/IDN/ICUConverter.cpp
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2012-2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/IDN/ICUConverter.h>
+
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wheader-hygiene"
+#include <unicode/uidna.h>
+#include <unicode/usprep.h>
+#include <unicode/ucnv.h>
+#include <unicode/ustring.h>
+
+ #include <boost/numeric/conversion/cast.hpp>
+
+using namespace Swift;
+using boost::numeric_cast;
+
+namespace {
+	typedef std::vector<UChar, SafeAllocator<UChar> > ICUString;
+
+	const char* toConstCharArray(const std::string& input) {
+		return input.c_str();
+	}
+
+	const char* toConstCharArray(const std::vector<unsigned char, SafeAllocator<unsigned char> >& input) {
+		return reinterpret_cast<const char*>(vecptr(input));
+	}
+
+	template<typename T>
+	ICUString convertToICUString(const T& s) {
+		ICUString result;
+		result.resize(s.size());
+		UErrorCode status = U_ZERO_ERROR;
+		int32_t icuResultLength = numeric_cast<int32_t>(result.size());
+		u_strFromUTF8Lenient(vecptr(result), numeric_cast<int32_t>(result.size()), &icuResultLength, toConstCharArray(s), numeric_cast<int32_t>(s.size()), &status);
+		if (status == U_BUFFER_OVERFLOW_ERROR) {
+			status = U_ZERO_ERROR;
+			result.resize(numeric_cast<size_t>(icuResultLength));
+			u_strFromUTF8Lenient(vecptr(result), numeric_cast<int32_t>(result.size()), &icuResultLength, toConstCharArray(s), numeric_cast<int32_t>(s.size()), &status);
+		}
+		if (U_FAILURE(status)) {
+			return ICUString();
+		}
+		result.resize(numeric_cast<size_t>(icuResultLength));
+		return result;
+	}
+
+	std::vector<char, SafeAllocator<char> > convertToArray(const ICUString& input) {
+		std::vector<char, SafeAllocator<char> > result;
+		result.resize(input.size());
+		UErrorCode status = U_ZERO_ERROR;
+		int32_t inputLength = numeric_cast<int32_t>(result.size());
+		u_strToUTF8(vecptr(result), numeric_cast<int32_t>(result.size()), &inputLength, vecptr(input), numeric_cast<int32_t>(input.size()), &status);
+		if (status == U_BUFFER_OVERFLOW_ERROR) {
+			status = U_ZERO_ERROR;
+			result.resize(numeric_cast<size_t>(inputLength));
+			u_strToUTF8(vecptr(result), numeric_cast<int32_t>(result.size()), &inputLength, vecptr(input), numeric_cast<int32_t>(input.size()), &status);
+		}
+		if (U_FAILURE(status)) {
+			return std::vector<char, SafeAllocator<char> >();
+		}
+
+		result.resize(numeric_cast<size_t>(inputLength) + 1);
+		result[result.size() - 1] = '\0';
+		return result;
+	}
+
+	std::string convertToString(const ICUString& input) {
+		return std::string(vecptr(convertToArray(input)));
+	}
+
+	UStringPrepProfileType getICUProfileType(IDNConverter::StringPrepProfile profile) {
+		switch(profile) {
+			case IDNConverter::NamePrep: return USPREP_RFC3491_NAMEPREP;
+			case IDNConverter::XMPPNodePrep: return USPREP_RFC3920_NODEPREP;
+			case IDNConverter::XMPPResourcePrep: return USPREP_RFC3920_RESOURCEPREP;
+			case IDNConverter::SASLPrep: return USPREP_RFC4013_SASLPREP;
+		}
+		assert(false);
+		return USPREP_RFC3491_NAMEPREP;
+	}
+
+	template<typename StringType>
+	std::vector<char, SafeAllocator<char> > getStringPreparedDetail(const StringType& s, IDNConverter::StringPrepProfile profile) {
+		UErrorCode status = U_ZERO_ERROR;
+
+		boost::shared_ptr<UStringPrepProfile> icuProfile(usprep_openByType(getICUProfileType(profile), &status), usprep_close);
+		assert(U_SUCCESS(status));
+
+		ICUString icuInput = convertToICUString(s);
+		ICUString icuResult;
+		UParseError parseError;
+		icuResult.resize(icuInput.size());
+		int32_t icuResultLength = usprep_prepare(icuProfile.get(), vecptr(icuInput), numeric_cast<int32_t>(icuInput.size()), vecptr(icuResult), numeric_cast<int32_t>(icuResult.size()), USPREP_ALLOW_UNASSIGNED, &parseError, &status); 
+		icuResult.resize(numeric_cast<size_t>(icuResultLength));
+		if (status == U_BUFFER_OVERFLOW_ERROR) {
+			status = U_ZERO_ERROR;
+			icuResult.resize(numeric_cast<size_t>(icuResultLength));
+			icuResultLength = usprep_prepare(icuProfile.get(), vecptr(icuInput), numeric_cast<int32_t>(icuInput.size()), vecptr(icuResult), numeric_cast<int32_t>(icuResult.size()), USPREP_ALLOW_UNASSIGNED, &parseError, &status); 
+			icuResult.resize(numeric_cast<size_t>(icuResultLength));
+		}
+		if (U_FAILURE(status)) {
+			return std::vector<char, SafeAllocator<char> >();
+		}
+		icuResult.resize(numeric_cast<size_t>(icuResultLength));
+
+		return convertToArray(icuResult);
+	}
+}
+
+namespace Swift {
+
+std::string ICUConverter::getStringPrepared(const std::string& s, StringPrepProfile profile) {
+	if (s.empty()) {
+		return "";
+	}
+	std::vector<char, SafeAllocator<char> > preparedData = getStringPreparedDetail(s, profile);
+	if (preparedData.empty()) {
+		throw std::exception();
+	}
+	return std::string(vecptr(preparedData));
+}
+
+SafeByteArray ICUConverter::getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) {
+	if (s.empty()) {
+		return SafeByteArray();
+	}
+	std::vector<char, SafeAllocator<char> > preparedData = getStringPreparedDetail(s, profile);
+	if (preparedData.empty()) {
+		throw std::exception();
+	}
+	return createSafeByteArray(reinterpret_cast<const char*>(vecptr(preparedData)));
+}
+
+boost::optional<std::string> ICUConverter::getIDNAEncoded(const std::string& domain) {
+	UErrorCode status = U_ZERO_ERROR;
+	ICUString icuInput = convertToICUString(domain);
+	ICUString icuResult;
+	icuResult.resize(icuInput.size());
+	UParseError parseError;
+	int32_t icuResultLength = uidna_IDNToASCII(vecptr(icuInput), numeric_cast<int32_t>(icuInput.size()), vecptr(icuResult), numeric_cast<int32_t>(icuResult.size()), UIDNA_USE_STD3_RULES, &parseError, &status);
+	if (status == U_BUFFER_OVERFLOW_ERROR) {
+		status = U_ZERO_ERROR;
+		icuResult.resize(numeric_cast<size_t>(icuResultLength));
+		icuResultLength = uidna_IDNToASCII(vecptr(icuInput), numeric_cast<int32_t>(icuInput.size()), vecptr(icuResult), numeric_cast<int32_t>(icuResult.size()), UIDNA_USE_STD3_RULES, &parseError, &status);
+	}
+	if (U_FAILURE(status)) {
+		return boost::optional<std::string>();
+	}
+	icuResult.resize(numeric_cast<size_t>(icuResultLength));
+	return convertToString(icuResult);
+}
+
+}
diff --git a/Swiften/IDN/ICUConverter.h b/Swiften/IDN/ICUConverter.h
new file mode 100644
index 0000000..05eafcc
--- /dev/null
+++ b/Swiften/IDN/ICUConverter.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2012-2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+#include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
+#include <Swiften/IDN/IDNConverter.h>
+
+namespace Swift {
+	class SWIFTEN_API ICUConverter : public IDNConverter {
+		public:
+			virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+			virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+
+			virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) SWIFTEN_OVERRIDE;
+	};
+}
diff --git a/Swiften/IDN/IDNA.cpp b/Swiften/IDN/IDNA.cpp
deleted file mode 100644
index 16b4183..0000000
--- a/Swiften/IDN/IDNA.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include <Swiften/IDN/IDNA.h>
-
-#include <stringprep.h>
-#include <vector>
-#include <cstdlib>
-#include <idna.h>
-
-namespace Swift {
-
-std::string IDNA::getEncoded(const std::string& domain) {
-	char* output;
-	if (idna_to_ascii_8z(domain.c_str(), &output, 0) == IDNA_SUCCESS) {
-		std::string result(output);
-		free(output);
-		return result;
-	}
-	else {
-		return domain;
-	}
-}
-
-}
diff --git a/Swiften/IDN/IDNA.h b/Swiften/IDN/IDNA.h
deleted file mode 100644
index 19af1e6..0000000
--- a/Swiften/IDN/IDNA.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <string>
-
-namespace Swift {
-	class IDNA {
-		public:
-			static std::string getEncoded(const std::string& s);
-	};
-}
diff --git a/Swiften/IDN/IDNConverter.cpp b/Swiften/IDN/IDNConverter.cpp
new file mode 100644
index 0000000..7705812
--- /dev/null
+++ b/Swiften/IDN/IDNConverter.cpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/IDN/IDNConverter.h>
+
+namespace Swift {
+
+IDNConverter::~IDNConverter() {
+}
+
+}
diff --git a/Swiften/IDN/IDNConverter.h b/Swiften/IDN/IDNConverter.h
new file mode 100644
index 0000000..f6974bc
--- /dev/null
+++ b/Swiften/IDN/IDNConverter.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+#include <Swiften/Base/API.h>
+#include <Swiften/Base/SafeByteArray.h>
+#include <boost/optional.hpp>
+
+namespace Swift {
+	class SWIFTEN_API IDNConverter {
+		public:
+			virtual ~IDNConverter();
+
+			enum StringPrepProfile {
+				NamePrep,
+				XMPPNodePrep,
+				XMPPResourcePrep,
+				SASLPrep
+			};
+
+			virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) = 0;
+			virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) = 0;
+
+			// Thread-safe
+			virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) = 0;
+	};
+}
diff --git a/Swiften/IDN/LibIDNConverter.cpp b/Swiften/IDN/LibIDNConverter.cpp
new file mode 100644
index 0000000..45b1d14
--- /dev/null
+++ b/Swiften/IDN/LibIDNConverter.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2012-2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/IDN/LibIDNConverter.h>
+
+extern "C" {
+	#include <stringprep.h>
+	#include <idna.h>
+}
+
+#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Base/SafeAllocator.h>
+#include <boost/shared_ptr.hpp>
+
+using namespace Swift;
+
+namespace {
+	static const int MAX_STRINGPREP_SIZE = 1024;
+
+	const Stringprep_profile* getLibIDNProfile(IDNConverter::StringPrepProfile profile) {
+		switch(profile) {
+			case IDNConverter::NamePrep: return stringprep_nameprep;
+			case IDNConverter::XMPPNodePrep: return stringprep_xmpp_nodeprep;
+			case IDNConverter::XMPPResourcePrep: return stringprep_xmpp_resourceprep;
+			case IDNConverter::SASLPrep: return stringprep_saslprep;
+		}
+		assert(false);
+		return 0;
+	}
+
+	template<typename StringType, typename ContainerType>
+	ContainerType getStringPreparedInternal(const StringType& s, IDNConverter::StringPrepProfile profile) {
+		ContainerType input(s.begin(), s.end());
+		input.resize(MAX_STRINGPREP_SIZE);
+		if (stringprep(&input[0], MAX_STRINGPREP_SIZE, static_cast<Stringprep_profile_flags>(0), getLibIDNProfile(profile)) == 0) {
+			return input;
+		}
+		else {
+			return ContainerType();
+		}
+	}
+}
+
+namespace Swift {
+
+std::string LibIDNConverter::getStringPrepared(const std::string& s, StringPrepProfile profile) {
+	std::vector<char> preparedData = getStringPreparedInternal< std::string, std::vector<char> >(s, profile);
+	if (preparedData.empty()) {
+		throw std::exception();
+	}
+	return std::string(vecptr(preparedData));
+}
+
+SafeByteArray LibIDNConverter::getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) {
+	std::vector<char, SafeAllocator<char> > preparedData = getStringPreparedInternal<SafeByteArray, std::vector<char, SafeAllocator<char> > >(s, profile);
+	if (preparedData.empty()) {
+		throw std::exception();
+	}
+	return createSafeByteArray(reinterpret_cast<const char*>(vecptr(preparedData)));
+}
+
+boost::optional<std::string> LibIDNConverter::getIDNAEncoded(const std::string& domain) {
+	char* output;
+	if (idna_to_ascii_8z(domain.c_str(), &output, IDNA_USE_STD3_ASCII_RULES) == IDNA_SUCCESS) {
+		std::string result(output);
+		free(output);
+		return result;
+	}
+	else {
+		return boost::optional<std::string>();
+	}
+}
+
+}
diff --git a/Swiften/IDN/LibIDNConverter.h b/Swiften/IDN/LibIDNConverter.h
new file mode 100644
index 0000000..4cfff1a
--- /dev/null
+++ b/Swiften/IDN/LibIDNConverter.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2012-2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+#include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
+#include <Swiften/IDN/IDNConverter.h>
+
+namespace Swift {
+	class SWIFTEN_API LibIDNConverter : public IDNConverter {
+		public:
+			virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+			virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+
+			virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) SWIFTEN_OVERRIDE;
+	};
+}
+
diff --git a/Swiften/IDN/PlatformIDNConverter.cpp b/Swiften/IDN/PlatformIDNConverter.cpp
new file mode 100644
index 0000000..4882b60
--- /dev/null
+++ b/Swiften/IDN/PlatformIDNConverter.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/IDN/PlatformIDNConverter.h>
+#if defined(HAVE_LIBIDN)
+#include <Swiften/IDN/LibIDNConverter.h>
+#elif defined(HAVE_ICU)
+#include <Swiften/IDN/ICUConverter.h>
+#endif
+
+namespace Swift {
+
+IDNConverter* PlatformIDNConverter::create() {
+#if defined(HAVE_LIBIDN)
+	return new LibIDNConverter();
+#elif defined(HAVE_ICU)
+	return new ICUConverter();
+#else
+#if defined(NEED_IDN)
+#error "No IDN implementation"
+#endif
+	return 0;
+#endif
+}
+
+}
diff --git a/Swiften/IDN/PlatformIDNConverter.h b/Swiften/IDN/PlatformIDNConverter.h
new file mode 100644
index 0000000..4b1025b
--- /dev/null
+++ b/Swiften/IDN/PlatformIDNConverter.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2012 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/API.h>
+
+namespace Swift {
+	class IDNConverter;
+
+	namespace PlatformIDNConverter {
+		SWIFTEN_API IDNConverter* create();
+	}
+}
diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript
index 99b35fd..4c1a71d 100644
--- a/Swiften/IDN/SConscript
+++ b/Swiften/IDN/SConscript
@@ -1,14 +1,28 @@
 Import("swiften_env", "env")
 
+
+objects = swiften_env.SwiftenObject(["IDNConverter.cpp"])
+
 myenv = swiften_env.Clone()
+if myenv.get("NEED_IDN"):
+	myenv.Append(CPPDEFINES = ["NEED_IDN"])
+if myenv.get("HAVE_ICU") :
+	myenv.MergeFlags(swiften_env["ICU_FLAGS"])
+	myenv.Append(CPPDEFINES = ["HAVE_ICU"])
+	objects += myenv.SwiftenObject(["ICUConverter.cpp"])
+if myenv.get("HAVE_LIBIDN") :
 	myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"])
+	myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"])
+	objects += myenv.SwiftenObject(["LibIDNConverter.cpp"])
+objects += myenv.SwiftenObject(["PlatformIDNConverter.cpp"])
 
-objects = myenv.SwiftenObject([
-			"StringPrep.cpp",
-			"IDNA.cpp",
-		])
 swiften_env.Append(SWIFTEN_OBJECTS = [objects])
 
-env.Append(UNITTEST_SOURCES = [
-			File("UnitTest/StringPrepTest.cpp"),
-	])
+if env["TEST"] :
+	test_env = myenv.Clone()
+	test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"])
+	env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([
+				File("UnitTest/IDNConverterTest.cpp"),
+	]))
+
+
diff --git a/Swiften/IDN/StringPrep.cpp b/Swiften/IDN/StringPrep.cpp
deleted file mode 100644
index 9085569..0000000
--- a/Swiften/IDN/StringPrep.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include <Swiften/IDN/StringPrep.h>
-
-extern "C"
-{
-	#include <stringprep.h>
-};
-
-#include <vector>
-#include <cassert>
-#include <Swiften/Base/SafeAllocator.h>
-
-using namespace Swift;
-
-	namespace {
-	static const int MAX_STRINGPREP_SIZE = 1024;
-
-	const Stringprep_profile* getLibIDNProfile(StringPrep::Profile profile) {
-		switch(profile) {
-			case StringPrep::NamePrep: return stringprep_nameprep; break;
-			case StringPrep::XMPPNodePrep: return stringprep_xmpp_nodeprep; break;
-			case StringPrep::XMPPResourcePrep: return stringprep_xmpp_resourceprep; break;
-			case StringPrep::SASLPrep: return stringprep_saslprep; break;
-		}
-		assert(false);
-		return 0;
-	}
-
-	template<typename StringType, typename ContainerType>
-	ContainerType getStringPrepared(const StringType& s, StringPrep::Profile profile) {
-		ContainerType input(s.begin(), s.end());
-		input.resize(MAX_STRINGPREP_SIZE);
-		if (stringprep(&input[0], MAX_STRINGPREP_SIZE, static_cast<Stringprep_profile_flags>(0), getLibIDNProfile(profile)) == 0) {
-			return input;
-		}
-		else {
-			return ContainerType();
-		}
-	}
-}
-
-namespace Swift {
-
-std::string StringPrep::getPrepared(const std::string& s, Profile profile) {
-	std::vector<char> preparedData = getStringPrepared< std::string, std::vector<char> >(s, profile);
-	if (preparedData.empty()) {
-		throw std::exception();
-	}
-	return std::string(vecptr(preparedData));
-}
-
-SafeByteArray StringPrep::getPrepared(const SafeByteArray& s, Profile profile) {
-	std::vector<char, SafeAllocator<char> > preparedData = getStringPrepared<SafeByteArray, std::vector<char, SafeAllocator<char> > >(s, profile);
-	if (preparedData.empty()) {
-		throw std::exception();
-	}
-	return createSafeByteArray(reinterpret_cast<const char*>(vecptr(preparedData)));
-}
-
-}
diff --git a/Swiften/IDN/StringPrep.h b/Swiften/IDN/StringPrep.h
deleted file mode 100644
index dc8fadc..0000000
--- a/Swiften/IDN/StringPrep.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <string>
-#include <Swiften/Base/SafeByteArray.h>
-
-namespace Swift {
-	class StringPrep {
-		public:
-			enum Profile {
-				NamePrep,
-				XMPPNodePrep,
-				XMPPResourcePrep,
-				SASLPrep,
-			};
-
-			static std::string getPrepared(const std::string& s, Profile profile);
-			static SafeByteArray getPrepared(const SafeByteArray& s, Profile profile);
-	};
-}
diff --git a/Swiften/IDN/UnitTest/IDNConverterTest.cpp b/Swiften/IDN/UnitTest/IDNConverterTest.cpp
new file mode 100644
index 0000000..a66e141
--- /dev/null
+++ b/Swiften/IDN/UnitTest/IDNConverterTest.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010 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 <boost/shared_ptr.hpp>
+#include <Swiften/IDN/IDNConverter.h>
+#include <Swiften/IDN/PlatformIDNConverter.h>
+
+using namespace Swift;
+
+class IDNConverterTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(IDNConverterTest);
+		CPPUNIT_TEST(testStringPrep);
+		CPPUNIT_TEST(testStringPrep_Empty);
+		CPPUNIT_TEST(testGetEncoded);
+		CPPUNIT_TEST(testGetEncoded_International);
+		CPPUNIT_TEST(testGetEncoded_Invalid);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void setUp() {
+			testling = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
+		}
+
+		void testStringPrep() {
+			std::string result = testling->getStringPrepared("tron\xc3\x87on", IDNConverter::NamePrep);
+
+			CPPUNIT_ASSERT_EQUAL(std::string("tron\xc3\xa7on"), result);
+		}
+
+		void testStringPrep_Empty() {
+			CPPUNIT_ASSERT_EQUAL(std::string(""), testling->getStringPrepared("", IDNConverter::NamePrep));
+			CPPUNIT_ASSERT_EQUAL(std::string(""), testling->getStringPrepared("", IDNConverter::XMPPNodePrep));
+			CPPUNIT_ASSERT_EQUAL(std::string(""), testling->getStringPrepared("", IDNConverter::XMPPResourcePrep));
+		}
+
+		void testGetEncoded() {
+			boost::optional<std::string> result = testling->getIDNAEncoded("www.swift.im");
+			CPPUNIT_ASSERT(!!result);
+			CPPUNIT_ASSERT_EQUAL(std::string("www.swift.im"), *result);
+		}
+
+		void testGetEncoded_International() {
+			boost::optional<std::string> result = testling->getIDNAEncoded("www.tron\xc3\x87on.com");
+			CPPUNIT_ASSERT(!!result);
+			CPPUNIT_ASSERT_EQUAL(std::string("www.xn--tronon-zua.com"), *result); 
+		}
+
+		void testGetEncoded_Invalid() {
+			boost::optional<std::string> result = testling->getIDNAEncoded("www.foo,bar.com");
+			CPPUNIT_ASSERT(!result);
+		}
+
+	private:
+		boost::shared_ptr<IDNConverter> testling;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(IDNConverterTest);
diff --git a/Swiften/IDN/UnitTest/StringPrepTest.cpp b/Swiften/IDN/UnitTest/StringPrepTest.cpp
deleted file mode 100644
index beab01e..0000000
--- a/Swiften/IDN/UnitTest/StringPrepTest.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2010 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/IDN/StringPrep.h"
-
-using namespace Swift;
-
-class StringPrepTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(StringPrepTest);
-		CPPUNIT_TEST(testStringPrep);
-		CPPUNIT_TEST(testStringPrep_Empty);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		void testStringPrep() {
-			std::string result = StringPrep::getPrepared("tron\xc3\x87on", StringPrep::NamePrep);
-
-			CPPUNIT_ASSERT_EQUAL(std::string("tron\xc3\xa7on"), result);
-		}
-
-		void testStringPrep_Empty() {
-			CPPUNIT_ASSERT_EQUAL(std::string(""), StringPrep::getPrepared("", StringPrep::NamePrep));
-			CPPUNIT_ASSERT_EQUAL(std::string(""), StringPrep::getPrepared("", StringPrep::XMPPNodePrep));
-			CPPUNIT_ASSERT_EQUAL(std::string(""), StringPrep::getPrepared("", StringPrep::XMPPResourcePrep));
-		}
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(StringPrepTest);