1 files changed, 40 insertions, 56 deletions
diff --git a/tests/parser/bodyPartTest.cpp b/tests/parser/bodyPartTest.cpp
index ffbdefda..0591e4d1 100644
--- a/tests/parser/bodyPartTest.cpp
+++ b/tests/parser/bodyPartTest.cpp
@@ -17,77 +17,61 @@
 // 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         bodyPartTest
+#define VMIME_TEST_SUITE_MODULE  "Parser"
 
-using namespace unitpp;
 
+VMIME_TEST_SUITE_BEGIN
 
-namespace
-{
-	class bodyPartTest : public suite
-	{
-		static const vmime::string extractComponentString
-			(const vmime::string& buffer, const vmime::component& c)
-		{
-			return vmime::string(buffer.begin() + c.getParsedOffset(),
-			                     buffer.begin() + c.getParsedOffset() + c.getParsedLength());
-		}
-
-
-		void testParse()
-		{
-			vmime::string str1 = "HEADER\r\n\r\nBODY";
-			vmime::bodyPart p1;
-			p1.parse(str1);
-
-			assert_eq("1", "HEADER\r\n\r\n", extractComponentString(str1, *p1.getHeader()));
-			assert_eq("2", "BODY", extractComponentString(str1, *p1.getBody()));
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testParse)
+		VMIME_TEST(testGenerate)
+	VMIME_TEST_LIST_END
 
-			vmime::string str2 = "HEADER\n\nBODY";
-			vmime::bodyPart p2;
-			p2.parse(str2);
 
-			assert_eq("3", "HEADER\n\n", extractComponentString(str2, *p2.getHeader()));
-			assert_eq("4", "BODY", extractComponentString(str2, *p2.getBody()));
+	static const vmime::string extractComponentString
+		(const vmime::string& buffer, const vmime::component& c)
+	{
+		return vmime::string(buffer.begin() + c.getParsedOffset(),
+		                     buffer.begin() + c.getParsedOffset() + c.getParsedLength());
+	}
 
-			vmime::string str3 = "HEADER\r\n\nBODY";
-			vmime::bodyPart p3;
-			p3.parse(str3);
 
-			assert_eq("5", "HEADER\r\n\n", extractComponentString(str3, *p3.getHeader()));
-			assert_eq("6", "BODY", extractComponentString(str3, *p3.getBody()));
-		}
+	void testParse()
+	{
+		vmime::string str1 = "HEADER\r\n\r\nBODY";
+		vmime::bodyPart p1;
+		p1.parse(str1);
 
-		void testGenerate()
-		{
-			vmime::bodyPart p1;
-			p1.getHeader()->getField("Foo")->setValue(vmime::string("bar"));
-			p1.getBody()->setContents(vmime::create <vmime::stringContentHandler>("Baz"));
+		VASSERT_EQ("1", "HEADER\r\n\r\n", extractComponentString(str1, *p1.getHeader()));
+		VASSERT_EQ("2", "BODY", extractComponentString(str1, *p1.getBody()));
 
-			assert_eq("1", "Foo: bar\r\n\r\nBaz", p1.generate());
-		}
+		vmime::string str2 = "HEADER\n\nBODY";
+		vmime::bodyPart p2;
+		p2.parse(str2);
 
-	public:
+		VASSERT_EQ("3", "HEADER\n\n", extractComponentString(str2, *p2.getHeader()));
+		VASSERT_EQ("4", "BODY", extractComponentString(str2, *p2.getBody()));
 
-		bodyPartTest() : suite("vmime::bodyPart")
-		{
-			// VMime initialization
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+		vmime::string str3 = "HEADER\r\n\nBODY";
+		vmime::bodyPart p3;
+		p3.parse(str3);
 
-			add("Parse", testcase(this, "Parse", &bodyPartTest::testParse));
+		VASSERT_EQ("5", "HEADER\r\n\n", extractComponentString(str3, *p3.getHeader()));
+		VASSERT_EQ("6", "BODY", extractComponentString(str3, *p3.getBody()));
+	}
 
-			add("Generate", testcase(this, "Generate", &bodyPartTest::testGenerate));
+	void testGenerate()
+	{
+		vmime::bodyPart p1;
+		p1.getHeader()->getField("Foo")->setValue(vmime::string("bar"));
+		p1.getBody()->setContents(vmime::create <vmime::stringContentHandler>("Baz"));
 
-			suite::main().add("vmime::bodyPart", this);
-		}
+		VASSERT_EQ("1", "Foo: bar\r\n\r\nBaz", p1.generate());
+	}
 
-	};
+VMIME_TEST_SUITE_END
 
-	bodyPartTest* theTest = new bodyPartTest();
-}