2 files changed, 17 insertions, 0 deletions
diff --git a/Swiften/StringCodecs/UnitTest/HexifyTest.cpp b/Swiften/StringCodecs/UnitTest/HexifyTest.cpp
index 9cbd0d4..38233f9 100644
--- a/Swiften/StringCodecs/UnitTest/HexifyTest.cpp
+++ b/Swiften/StringCodecs/UnitTest/HexifyTest.cpp
@@ -11,22 +11,28 @@
 #include <string>
 #include <Swiften/Base/ByteArray.h>
 
 using namespace Swift;
 
 class HexifyTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(HexifyTest);
 		CPPUNIT_TEST(testHexify);
 		CPPUNIT_TEST(testHexify_Byte);
+		CPPUNIT_TEST(testUnhexify);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testHexify() {
 			CPPUNIT_ASSERT_EQUAL(std::string("4206b23ca6b0a643d20d89b04ff58cf78b8096ed"), Hexify::hexify(createByteArray("\x42\x06\xb2\x3c\xa6\xb0\xa6\x43\xd2\x0d\x89\xb0\x4f\xf5\x8c\xf7\x8b\x80\x96\xed")));
 		}
 
 		void testHexify_Byte() {
 			CPPUNIT_ASSERT_EQUAL(std::string("b2"), Hexify::hexify(0xb2));
 		}
+
+		void testUnhexify() {
+			CPPUNIT_ASSERT_EQUAL(std::string("ffaf02"), Hexify::hexify(Hexify::unhexify("ffaf02")));
+			CPPUNIT_ASSERT(createByteArray("\x01\x23\xf2", 3) == Hexify::unhexify("0123f2"));
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HexifyTest);
diff --git a/Swiften/StringCodecs/UnitTest/MD5Test.cpp b/Swiften/StringCodecs/UnitTest/MD5Test.cpp
index ce7e422..c62c46a 100644
--- a/Swiften/StringCodecs/UnitTest/MD5Test.cpp
+++ b/Swiften/StringCodecs/UnitTest/MD5Test.cpp
@@ -13,26 +13,37 @@
 #include <Swiften/StringCodecs/MD5.h>
 #include <Swiften/Base/ByteArray.h>
 
 using namespace Swift;
 
 class MD5Test : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(MD5Test);
 		CPPUNIT_TEST(testGetHash_Empty);
 		CPPUNIT_TEST(testGetHash_Alphabet);
+		CPPUNIT_TEST(testIncrementalTest);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testGetHash_Empty() {
 			ByteArray result(MD5::getHash(createByteArray("")));
 
 			CPPUNIT_ASSERT_EQUAL(createByteArray("\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e", 16), result);
 		}
 
 		void testGetHash_Alphabet() {
 			ByteArray result(MD5::getHash(createByteArray("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")));
 
 			CPPUNIT_ASSERT_EQUAL(createByteArray("\xd1\x74\xab\x98\xd2\x77\xd9\xf5\xa5\x61\x1c\x2c\x9f\x41\x9d\x9f", 16), result);
 		}
+
+		void testIncrementalTest() {
+			MD5 testling;
+			testling.update(createByteArray("ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+			testling.update(createByteArray("abcdefghijklmnopqrstuvwxyz0123456789"));
+
+			ByteArray result = testling.getHash();
+
+			CPPUNIT_ASSERT_EQUAL(createByteArray("\xd1\x74\xab\x98\xd2\x77\xd9\xf5\xa5\x61\x1c\x2c\x9f\x41\x9d\x9f", 16), result);
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(MD5Test);