Moved to CppUnit for unit tests framework.

1 files changed, 195 insertions, 209 deletions

diff --git a/tests/parser/encoderTest.cpp b/tests/parser/encoderTest.cpp
index 55c83f83..38e4ff4e 100644
--- a/tests/parser/encoderTest.cpp
+++ b/tests/parser/encoderTest.cpp
@@ -17,282 +17,268 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "../lib/unit++/unit++.h"
+#include "tests/testUtils.hpp"
 
-#include <iostream>
-#include <ostream>
 
-#include "vmime/vmime.hpp"
-#include "vmime/platforms/posix/posixHandler.hpp"
+#define VMIME_TEST_SUITE         encoderTest
+#define VMIME_TEST_SUITE_MODULE  "Parser"
 
-using namespace unitpp;
 
+VMIME_TEST_SUITE_BEGIN
 
-namespace
-{
-	class encoderTest : public suite
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testBase64)
+		VMIME_TEST(testQuotedPrintable)
+	VMIME_TEST_LIST_END
+
+
+	// Encoding helper function
+	static const vmime::string encode(const vmime::string& name, const vmime::string& in, int maxLineLength = 0)
 	{
-		// Encoding helper function
-		static const vmime::string encode(const vmime::string& name, const vmime::string& in, int maxLineLength = 0)
-		{
-			vmime::ref <vmime::encoder> enc = vmime::encoderFactory::getInstance()->create(name);
+		vmime::ref <vmime::encoder> enc = vmime::encoderFactory::getInstance()->create(name);
 
-			if (maxLineLength != 0)
-				enc->getProperties()["maxlinelength"] = maxLineLength;
+		if (maxLineLength != 0)
+			enc->getProperties()["maxlinelength"] = maxLineLength;
 
-			vmime::utility::inputStreamStringAdapter vin(in);
+		vmime::utility::inputStreamStringAdapter vin(in);
 
-			std::ostringstream out;
-			vmime::utility::outputStreamAdapter vout(out);
+		std::ostringstream out;
+		vmime::utility::outputStreamAdapter vout(out);
 
-			enc->encode(vin, vout);
+		enc->encode(vin, vout);
 
-			return (out.str());
-		}
+		return (out.str());
+	}
 
-		// Decoding helper function
-		static const vmime::string decode(const vmime::string& name, const vmime::string& in, int maxLineLength = 0)
-		{
-			vmime::ref <vmime::encoder> enc = vmime::encoderFactory::getInstance()->create(name);
+	// Decoding helper function
+	static const vmime::string decode(const vmime::string& name, const vmime::string& in, int maxLineLength = 0)
+	{
+		vmime::ref <vmime::encoder> enc = vmime::encoderFactory::getInstance()->create(name);
 
-			if (maxLineLength != 0)
-				enc->getProperties()["maxlinelength"] = maxLineLength;
+		if (maxLineLength != 0)
+			enc->getProperties()["maxlinelength"] = maxLineLength;
 
-			vmime::utility::inputStreamStringAdapter vin(in);
+		vmime::utility::inputStreamStringAdapter vin(in);
 
-			std::ostringstream out;
-			vmime::utility::outputStreamAdapter vout(out);
+		std::ostringstream out;
+		vmime::utility::outputStreamAdapter vout(out);
 
-			enc->decode(vin, vout);
+		enc->decode(vin, vout);
 
-			return (out.str());
-		}
+		return (out.str());
+	}
 
 
-		void testBase64()
+	void testBase64()
+	{
+		static const vmime::string testSuites[] =
 		{
-			static const vmime::string testSuites[] =
-			{
-				// Test 1
-				"",
+			// Test 1
+			"",
+
+			"",
 
-				"",
+			// Test 2
+			"A",
 
-				// Test 2
-				"A",
+			"QQ==",
 
-				"QQ==",
+			// Test 3
+			"AB",
 
-				// Test 3
-				"AB",
+			"QUI=",
 
-				"QUI=",
+			// Test 4
+			"ABC",
 
-				// Test 4
-				"ABC",
+			"QUJD",
 
-				"QUJD",
+			// Test 5
+			"foo",
 
-				// Test 5
-				"foo",
+			"Zm9v",
 
-				"Zm9v",
+			// Test 6
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
 
-				// Test 6
-				"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+			"QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAx"
+			"MjM0NTY3ODk=",
 
-				"QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ejAx"
-				"MjM0NTY3ODk=",
+			// Test 7
+			vmime::string(
+			"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+			"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+			"\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+			"\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+			"\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+			"\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+			"\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+			"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+			"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+			"\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+			"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+			"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+			"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+			"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+			"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+			"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+			256),
 
-				// Test 7
-				vmime::string(
-				"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-				"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
-				"\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
-				"\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
-				"\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
-				"\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
-				"\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
-				"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
-				"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
-				"\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
-				"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
-				"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
-				"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
-				"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
-				"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef"
-				"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
-				256),
+			"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1"
+			"Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWpr"
+			"bG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6Ch"
+			"oqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX"
+			"2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="
+		};
 
-				"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1"
-				"Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWpr"
-				"bG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6Ch"
-				"oqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX"
-				"2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="
-			};
 
+		for (unsigned int i = 0 ; i < sizeof(testSuites) / sizeof(testSuites[0]) / 2 ; ++i)
+		{
+			const vmime::string decoded = testSuites[i * 2];
+			const vmime::string encoded = testSuites[i * 2 + 1];
 
-			for (unsigned int i = 0 ; i < sizeof(testSuites) / sizeof(testSuites[0]) / 2 ; ++i)
-			{
-				const vmime::string decoded = testSuites[i * 2];
-				const vmime::string encoded = testSuites[i * 2 + 1];
+			std::ostringstream oss;
+			oss << "[Base64] Test " << (i + 1) << ": ";
 
-				std::ostringstream oss;
-				oss << "[Base64] Test " << (i + 1) << ": ";
+			// Encoding
+			VASSERT_EQ(oss.str() + "encoding", encoded, encode("base64", decoded));
 
-				// Encoding
-				assert_eq(oss.str() + "encoding", encoded, encode("base64", decoded));
+			// Decoding
+			VASSERT_EQ(oss.str() + "decoding", decoded, decode("base64", encoded));
 
-				// Decoding
-				assert_eq(oss.str() + "decoding", decoded, decode("base64", encoded));
+			// Multiple and successive encoding/decoding
+			VASSERT_EQ(oss.str() + "multiple1", decoded,
+				decode("base64",
+					encode("base64", decoded)));
 
-				// Multiple and successive encoding/decoding
-				assert_eq(oss.str() + "multiple1", decoded,
+			VASSERT_EQ(oss.str() + "multiple2", decoded,
+				decode("base64",
 					decode("base64",
-						encode("base64", decoded)));
+						encode("base64",
+							encode("base64", decoded)))));
 
-				assert_eq(oss.str() + "multiple2", decoded,
+			VASSERT_EQ(oss.str() + "multiple3", decoded,
+				decode("base64",
 					decode("base64",
 						decode("base64",
 							encode("base64",
-								encode("base64", decoded)))));
-
-				assert_eq(oss.str() + "multiple3", decoded,
-					decode("base64",
-						decode("base64",
-							decode("base64",
 								encode("base64",
-									encode("base64",
-										encode("base64", decoded)))))));
+									encode("base64", decoded)))))));
 
-				assert_eq(oss.str() + "multiple4", decoded,
+			VASSERT_EQ(oss.str() + "multiple4", decoded,
+				decode("base64",
 					decode("base64",
 						decode("base64",
 							decode("base64",
-								decode("base64",
+								encode("base64",
 									encode("base64",
 										encode("base64",
-											encode("base64",
-												encode("base64", decoded)))))))));
-			}
+											encode("base64", decoded)))))))));
 		}
+	}
 
-		void testQuotedPrintable()
+	void testQuotedPrintable()
+	{
+		static const vmime::string testSuites[] =
 		{
-			static const vmime::string testSuites[] =
-			{
-				// Test 1
-				"",
-
-				"",
-
-				// Test 2
-				"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
-
-				"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
-
-				// Test 3
-				"0123456789012345678901234567890123456789012345678901234567890123456789012"
-				"3456789012345678901234567890123456789012345678901234567890123456789012345"
-				"6789",
-
-				"0123456789012345678901234567890123456789012345678901234567890123456789012=\r\n"
-				"3456789012345678901234567890123456789012345678901234567890123456789012345=\r\n"
-				"6789",
-
-				// Test 4
-				vmime::string(
-				"\x89\xe8\x24\x04\x2f\xe8\xff\xfb\xeb\xff\x90\xd7\x74\x8d\x00\x26\x89\x55"
-				"\x83\xe5\x08\xec\x04\xc7\xa0\x24\x05\xa2\xe8\x08\x43\xee\x00\x00\xc0\x85"
-				"\x0a\x74\xec\x89\xc3\x5d\xb6\x8d\x00\x00\x00\x00\x04\xc7\xa8\x24\x05\xa2"
-				"\xe8\x08\x43\xd4\x00\x00\xe8\xeb\xf6\x89\x89\x55\x81\xe5\xa8\xec\x00\x00"
-				"\x89\x00\xfc\x75\x75\x8b\x89\x08\xf8\x5d\xb9\xe8\xff\xff\x83\xff\x14\xfe"
-				"\x47\x74\xc0\x31\x9d\x8d\xff\x68\xff\xff\x85\x89\xff\x68\xff\xff\x85\x8d"
-				"\xff\x6c\xff\xff\x04\x89\xe8\x24\xfa\x50\xff\xff\x45\xc7\x00\xec\x00\x00"
-				"\x31\x00\x89\xc0\x24\x44\x89\x08\x24\x5c\x89\x04\x24\x34\x87\xe8\xff\xf6"
-				"\x89\xff\x24\x34\x2f\xe8\xff\xf9\x8b\xff\xf8\x5d\x75\x8b\x89\xfc\x5d\xec"
-				"\xbe\xc3\x00\x13\x00\x00\xe7\xeb\xb6\x8d\x00\x00\x00\x00\x89\x55\x57\xe5"
-				"\x53\x56\xec\x81\x01\xdc\x00\x00\x45\xbb\x05\x5c\x8b\x08\x0c\x55\xe4\x83"
-				"\x8b\xf0\x89\x02\x24\x5c\xc7\x04\x24\x04\x00\x06\x00\x00\xec\xa3\x05\xa9"
-				"\xe8\x08\xf7\x2a\xff\xff\x04\xc7\x46\x24\x05\x5c\xb9\x08\x5c\x50\x08\x05"
-				"\x4c\x89\x04\x24\xf5\xe8\xff\xf7\xc7\xff\x24\x04\x5c\x46\x08\x05\xe9\xe8"
-				"\xff\xf8\xc7\xff\x24\x04\x1d\x70\x08\x05\x55\xe8\x00\xbb\xb8\x00\x00\x01"
-				"\x00\x00\xd2\x31\x08\xa3\x05\xa7\xb8\x08\x00\x01\x00\x00\x0c\xa3\x05\xa7",
-				18 * 16),
-
-				"=89=E8$=04/=E8=FF=FB=EB=FF=90=D7t=8D=00&=89U=83=E5=08=EC=04=C7=A0$=05=A2=E8=\r\n"
-				"=08C=EE=00=00=C0=85=0At=EC=89=C3]=B6=8D=00=00=00=00=04=C7=A8$=05=A2=E8=08=\r\n"
-				"C=D4=00=00=E8=EB=F6=89=89U=81=E5=A8=EC=00=00=89=00=FCuu=8B=89=08=F8]=B9=E8=\r\n"
-				"=FF=FF=83=FF=14=FEGt=C01=9D=8D=FFh=FF=FF=85=89=FFh=FF=FF=85=8D=FFl=FF=FF=04=\r\n"
-				"=89=E8$=FAP=FF=FFE=C7=00=EC=00=001=00=89=C0$D=89=08$\\=89=04$4=87=E8=FF=F6=\r\n"
-				"=89=FF$4/=E8=FF=F9=8B=FF=F8]u=8B=89=FC]=EC=BE=C3=00=13=00=00=E7=EB=B6=8D=00=\r\n"
-				"=00=00=00=89UW=E5SV=EC=81=01=DC=00=00E=BB=05\\=8B=08=0CU=E4=83=8B=F0=89=02=\r\n"
-				"$\\=C7=04$=04=00=06=00=00=EC=A3=05=A9=E8=08=F7*=FF=FF=04=C7F$=05\\=B9=08\\P=08=\r\n"
-				"=05L=89=04$=F5=E8=FF=F7=C7=FF$=04\\F=08=05=E9=E8=FF=F8=C7=FF$=04=1Dp=08=05=\r\n"
-				"U=E8=00=BB=B8=00=00=01=00=00=D21=08=A3=05=A7=B8=08=00=01=00=00=0C=A3=05=A7=\r\n"
-			};
-
-
-			for (unsigned int i = 0 ; i < sizeof(testSuites) / sizeof(testSuites[0]) / 2 ; ++i)
-			{
-				const vmime::string decoded = testSuites[i * 2];
-				const vmime::string encoded = testSuites[i * 2 + 1];
-
-				std::ostringstream oss;
-				oss << "[QP] Test " << (i + 1) << ": ";
-
-				// Encoding
-				assert_eq(oss.str() + "encoding", encoded, encode("quoted-printable", decoded, 74));
-
-				// Decoding
-				assert_eq(oss.str() + "decoding", decoded, decode("quoted-printable", encoded, 74));
-
-				// Multiple and successive encoding/decoding
-				assert_eq(oss.str() + "multiple1", decoded,
-					decode("quoted-printable",
-						encode("quoted-printable", decoded)));
+			// Test 1
+			"",
+
+			"",
+
+			// Test 2
+			"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+
+			"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+
+			// Test 3
+			"0123456789012345678901234567890123456789012345678901234567890123456789012"
+			"3456789012345678901234567890123456789012345678901234567890123456789012345"
+			"6789",
+
+			"0123456789012345678901234567890123456789012345678901234567890123456789012=\r\n"
+			"3456789012345678901234567890123456789012345678901234567890123456789012345=\r\n"
+			"6789",
+
+			// Test 4
+			vmime::string(
+			"\x89\xe8\x24\x04\x2f\xe8\xff\xfb\xeb\xff\x90\xd7\x74\x8d\x00\x26\x89\x55"
+			"\x83\xe5\x08\xec\x04\xc7\xa0\x24\x05\xa2\xe8\x08\x43\xee\x00\x00\xc0\x85"
+			"\x0a\x74\xec\x89\xc3\x5d\xb6\x8d\x00\x00\x00\x00\x04\xc7\xa8\x24\x05\xa2"
+			"\xe8\x08\x43\xd4\x00\x00\xe8\xeb\xf6\x89\x89\x55\x81\xe5\xa8\xec\x00\x00"
+			"\x89\x00\xfc\x75\x75\x8b\x89\x08\xf8\x5d\xb9\xe8\xff\xff\x83\xff\x14\xfe"
+			"\x47\x74\xc0\x31\x9d\x8d\xff\x68\xff\xff\x85\x89\xff\x68\xff\xff\x85\x8d"
+			"\xff\x6c\xff\xff\x04\x89\xe8\x24\xfa\x50\xff\xff\x45\xc7\x00\xec\x00\x00"
+			"\x31\x00\x89\xc0\x24\x44\x89\x08\x24\x5c\x89\x04\x24\x34\x87\xe8\xff\xf6"
+			"\x89\xff\x24\x34\x2f\xe8\xff\xf9\x8b\xff\xf8\x5d\x75\x8b\x89\xfc\x5d\xec"
+			"\xbe\xc3\x00\x13\x00\x00\xe7\xeb\xb6\x8d\x00\x00\x00\x00\x89\x55\x57\xe5"
+			"\x53\x56\xec\x81\x01\xdc\x00\x00\x45\xbb\x05\x5c\x8b\x08\x0c\x55\xe4\x83"
+			"\x8b\xf0\x89\x02\x24\x5c\xc7\x04\x24\x04\x00\x06\x00\x00\xec\xa3\x05\xa9"
+			"\xe8\x08\xf7\x2a\xff\xff\x04\xc7\x46\x24\x05\x5c\xb9\x08\x5c\x50\x08\x05"
+			"\x4c\x89\x04\x24\xf5\xe8\xff\xf7\xc7\xff\x24\x04\x5c\x46\x08\x05\xe9\xe8"
+			"\xff\xf8\xc7\xff\x24\x04\x1d\x70\x08\x05\x55\xe8\x00\xbb\xb8\x00\x00\x01"
+			"\x00\x00\xd2\x31\x08\xa3\x05\xa7\xb8\x08\x00\x01\x00\x00\x0c\xa3\x05\xa7",
+			18 * 16),
+
+			"=89=E8$=04/=E8=FF=FB=EB=FF=90=D7t=8D=00&=89U=83=E5=08=EC=04=C7=A0$=05=A2=E8=\r\n"
+			"=08C=EE=00=00=C0=85=0At=EC=89=C3]=B6=8D=00=00=00=00=04=C7=A8$=05=A2=E8=08=\r\n"
+			"C=D4=00=00=E8=EB=F6=89=89U=81=E5=A8=EC=00=00=89=00=FCuu=8B=89=08=F8]=B9=E8=\r\n"
+			"=FF=FF=83=FF=14=FEGt=C01=9D=8D=FFh=FF=FF=85=89=FFh=FF=FF=85=8D=FFl=FF=FF=04=\r\n"
+			"=89=E8$=FAP=FF=FFE=C7=00=EC=00=001=00=89=C0$D=89=08$\\=89=04$4=87=E8=FF=F6=\r\n"
+			"=89=FF$4/=E8=FF=F9=8B=FF=F8]u=8B=89=FC]=EC=BE=C3=00=13=00=00=E7=EB=B6=8D=00=\r\n"
+			"=00=00=00=89UW=E5SV=EC=81=01=DC=00=00E=BB=05\\=8B=08=0CU=E4=83=8B=F0=89=02=\r\n"
+			"$\\=C7=04$=04=00=06=00=00=EC=A3=05=A9=E8=08=F7*=FF=FF=04=C7F$=05\\=B9=08\\P=08=\r\n"
+			"=05L=89=04$=F5=E8=FF=F7=C7=FF$=04\\F=08=05=E9=E8=FF=F8=C7=FF$=04=1Dp=08=05=\r\n"
+			"U=E8=00=BB=B8=00=00=01=00=00=D21=08=A3=05=A7=B8=08=00=01=00=00=0C=A3=05=A7=\r\n"
+		};
+
+
+		for (unsigned int i = 0 ; i < sizeof(testSuites) / sizeof(testSuites[0]) / 2 ; ++i)
+		{
+			const vmime::string decoded = testSuites[i * 2];
+			const vmime::string encoded = testSuites[i * 2 + 1];
+
+			std::ostringstream oss;
+			oss << "[QP] Test " << (i + 1) << ": ";
+
+			// Encoding
+			VASSERT_EQ(oss.str() + "encoding", encoded, encode("quoted-printable", decoded, 74));
+
+			// Decoding
+			VASSERT_EQ(oss.str() + "decoding", decoded, decode("quoted-printable", encoded, 74));
+
+			// Multiple and successive encoding/decoding
+			VASSERT_EQ(oss.str() + "multiple1", decoded,
+				decode("quoted-printable",
+					encode("quoted-printable", decoded)));
 
-				assert_eq(oss.str() + "multiple2", decoded,
+			VASSERT_EQ(oss.str() + "multiple2", decoded,
+				decode("quoted-printable",
 					decode("quoted-printable",
-						decode("quoted-printable",
-							encode("quoted-printable",
-								encode("quoted-printable", decoded)))));
+						encode("quoted-printable",
+							encode("quoted-printable", decoded)))));
 
-				assert_eq(oss.str() + "multiple3", decoded,
+			VASSERT_EQ(oss.str() + "multiple3", decoded,
+				decode("quoted-printable",
 					decode("quoted-printable",
 						decode("quoted-printable",
-							decode("quoted-printable",
+							encode("quoted-printable",
 								encode("quoted-printable",
-									encode("quoted-printable",
-										encode("quoted-printable", decoded)))))));
+									encode("quoted-printable", decoded)))))));
 
-				assert_eq(oss.str() + "multiple4", decoded,
+			VASSERT_EQ(oss.str() + "multiple4", decoded,
+				decode("quoted-printable",
 					decode("quoted-printable",
 						decode("quoted-printable",
 							decode("quoted-printable",
-								decode("quoted-printable",
+								encode("quoted-printable",
 									encode("quoted-printable",
 										encode("quoted-printable",
-											encode("quoted-printable",
-												encode("quoted-printable", decoded)))))))));
-			}
+											encode("quoted-printable", decoded)))))))));
 		}
+	}
 
-		// TODO: UUEncode
-
-	public:
-
-		encoderTest() : suite("vmime::encoder")
-		{
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
-
-			add("Base64", testcase(this, "Base64", &encoderTest::testBase64));
-			add("QuotedPrintable", testcase(this, "QuotedPrintable", &encoderTest::testQuotedPrintable));
-
-			suite::main().add("vmime::encoder", this);
-		}
+	// TODO: UUEncode
 
-	};
+VMIME_TEST_SUITE_END
 
-	encoderTest* theTest = new encoderTest();
-}