Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-04-18 20:27:42 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-18 20:27:42 (GMT) |
| commit | 603f4622bad15da3b800bab5277091904a47f972 (patch) | |
| tree | d5d454b13515cdc1ff290a6d77736dde8c6f2d8f /Swiften/IDN/UnitTest | |
| parent | 2a1b34a623e6e4f28481400637a3a99d5f7adc53 (diff) | |
| download | swift-603f4622bad15da3b800bab5277091904a47f972.zip swift-603f4622bad15da3b800bab5277091904a47f972.tar.bz2 | |
Fix ICU compilation.
Change-Id: I87be125a96f3b9f6755c52c58ba02bb85d945bf9
Diffstat (limited to 'Swiften/IDN/UnitTest')
| -rw-r--r-- | Swiften/IDN/UnitTest/IDNATest.cpp | 35 | ||||
| -rw-r--r-- | Swiften/IDN/UnitTest/IDNConverterTest.cpp | 56 | ||||
| -rw-r--r-- | Swiften/IDN/UnitTest/StringPrepTest.cpp | 34 |
3 files changed, 56 insertions, 69 deletions
diff --git a/Swiften/IDN/UnitTest/IDNATest.cpp b/Swiften/IDN/UnitTest/IDNATest.cpp deleted file mode 100644 index 09e79c8..0000000 --- a/Swiften/IDN/UnitTest/IDNATest.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2012 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/IDNA.h> - -using namespace Swift; - -class IDNATest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(IDNATest); - CPPUNIT_TEST(testGetEncoded); - CPPUNIT_TEST(testGetEncoded_International); - CPPUNIT_TEST_SUITE_END(); - - public: - void testGetEncoded() { - std::string result = IDNA::getEncoded("www.swift.im"); - - CPPUNIT_ASSERT_EQUAL(std::string("www.swift.im"), result); - } - - void testGetEncoded_International() { - std::string result = IDNA::getEncoded("www.tron\xc3\x87on.com"); - - CPPUNIT_ASSERT_EQUAL(std::string("www.xn--tronon-zua.com"), result); - } -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(IDNATest); - diff --git a/Swiften/IDN/UnitTest/IDNConverterTest.cpp b/Swiften/IDN/UnitTest/IDNConverterTest.cpp new file mode 100644 index 0000000..285cf4b --- /dev/null +++ b/Swiften/IDN/UnitTest/IDNConverterTest.cpp @@ -0,0 +1,56 @@ +/* + * 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_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() { + std::string result = testling->getIDNAEncoded("www.swift.im"); + CPPUNIT_ASSERT_EQUAL(std::string("www.swift.im"), result); + } + + void testGetEncoded_International() { + std::string result = testling->getIDNAEncoded("www.tron\xc3\x87on.com"); + CPPUNIT_ASSERT_EQUAL(std::string("www.xn--tronon-zua.com"), 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); |