1 files changed, 40 insertions, 56 deletions
diff --git a/tests/parser/messageIdSequenceTest.cpp b/tests/parser/messageIdSequenceTest.cpp
index 6382adef..f9a1ede5 100644
--- a/tests/parser/messageIdSequenceTest.cpp
+++ b/tests/parser/messageIdSequenceTest.cpp
@@ -17,79 +17,63 @@
 // 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         messageIdSequenceTest
+#define VMIME_TEST_SUITE_MODULE  "Parser"
 
-#include "tests/parser/testUtils.hpp"
 
-using namespace unitpp;
+VMIME_TEST_SUITE_BEGIN
 
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testParse)
+		VMIME_TEST(testGenerate)
+	VMIME_TEST_LIST_END
 
-namespace
-{
-	class messageIdSequenceTest : public suite
-	{
-		void testParse()
-		{
-			vmime::messageIdSequence s1;
-			s1.parse("");
-
-			assert_eq("1", 0, s1.getMessageIdCount());
-
-			vmime::messageIdSequence s2;
-			s2.parse("   \t  ");
 
-			assert_eq("2", 0, s2.getMessageIdCount());
-
-			vmime::messageIdSequence s3;
-			s3.parse("<a@b>");
+	void testParse()
+	{
+		vmime::messageIdSequence s1;
+		s1.parse("");
 
-			assert_eq("3.1", 1, s3.getMessageIdCount());
-			assert_eq("3.2", "a", s3.getMessageIdAt(0)->getLeft());
-			assert_eq("3.3", "b", s3.getMessageIdAt(0)->getRight());
+		VASSERT_EQ("1", 0, s1.getMessageIdCount());
 
-			vmime::messageIdSequence s4;
-			s4.parse("<a@b>  \r\n\t<c@d>");
+		vmime::messageIdSequence s2;
+		s2.parse("   \t  ");
 
-			assert_eq("4.1", 2, s4.getMessageIdCount());
-			assert_eq("4.2", "a", s4.getMessageIdAt(0)->getLeft());
-			assert_eq("4.3", "b", s4.getMessageIdAt(0)->getRight());
-			assert_eq("4.4", "c", s4.getMessageIdAt(1)->getLeft());
-			assert_eq("4.5", "d", s4.getMessageIdAt(1)->getRight());
-		}
+		VASSERT_EQ("2", 0, s2.getMessageIdCount());
 
-		void testGenerate()
-		{
-			vmime::messageIdSequence s1;
-			s1.appendMessageId(vmime::create <vmime::messageId>("a", "b"));
+		vmime::messageIdSequence s3;
+		s3.parse("<a@b>");
 
-			assert_eq("1", "<a@b>", s1.generate());
+		VASSERT_EQ("3.1", 1, s3.getMessageIdCount());
+		VASSERT_EQ("3.2", "a", s3.getMessageIdAt(0)->getLeft());
+		VASSERT_EQ("3.3", "b", s3.getMessageIdAt(0)->getRight());
 
-			vmime::messageIdSequence s2;
-			s2.appendMessageId(vmime::create <vmime::messageId>("a", "b"));
-			s2.appendMessageId(vmime::create <vmime::messageId>("c", "d"));
+		vmime::messageIdSequence s4;
+		s4.parse("<a@b>  \r\n\t<c@d>");
 
-			assert_eq("2", "<a@b> <c@d>", s2.generate());
-		}
+		VASSERT_EQ("4.1", 2, s4.getMessageIdCount());
+		VASSERT_EQ("4.2", "a", s4.getMessageIdAt(0)->getLeft());
+		VASSERT_EQ("4.3", "b", s4.getMessageIdAt(0)->getRight());
+		VASSERT_EQ("4.4", "c", s4.getMessageIdAt(1)->getLeft());
+		VASSERT_EQ("4.5", "d", s4.getMessageIdAt(1)->getRight());
+	}
 
-	public:
+	void testGenerate()
+	{
+		vmime::messageIdSequence s1;
+		s1.appendMessageId(vmime::create <vmime::messageId>("a", "b"));
 
-		messageIdSequenceTest() : suite("vmime::messageIdSequence")
-		{
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+		VASSERT_EQ("1", "<a@b>", s1.generate());
 
-			add("Parse", testcase(this, "Parse", &messageIdSequenceTest::testParse));
-			add("Generate", testcase(this, "Generate", &messageIdSequenceTest::testGenerate));
+		vmime::messageIdSequence s2;
+		s2.appendMessageId(vmime::create <vmime::messageId>("a", "b"));
+		s2.appendMessageId(vmime::create <vmime::messageId>("c", "d"));
 
-			suite::main().add("vmime::messageIdSequence", this);
-		}
+		VASSERT_EQ("2", "<a@b> <c@d>", s2.generate());
+	}
 
-	};
+VMIME_TEST_SUITE_END
 
-	messageIdSequenceTest* theTest = new messageIdSequenceTest();
-}