Moved to CppUnit for unit tests framework.

1 files changed, 57 insertions, 73 deletions

diff --git a/tests/parser/mailboxTest.cpp b/tests/parser/mailboxTest.cpp
index 3c991b61..b4683ca2 100644
--- a/tests/parser/mailboxTest.cpp
+++ b/tests/parser/mailboxTest.cpp
@@ -17,113 +17,97 @@
 // 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         mailboxTest
+#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_LIST_END
 
-namespace
-{
-	class mailboxTest : public suite
+
+	void testParse()
 	{
-		void testParse()
+		static const vmime::string testSuitesParse[] =
 		{
-			static const vmime::string testSuitesParse[] =
-			{
-				// Test 1
-				"My (this is a comment)name <me(another \\)comment) @    	somewhere(else).com>",
-
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=My name]]], [email protected]]]]",
-
-				// Test 2
-				"mailbox1 <mailbox@one>,;,,,	,,  	,,;group1:mailbox1@group1,  mailbox2@group2,,\"mailbox #3\" <mailbox3@group2>;, <mailbox@two>,,,,,,,,=?iso-8859-1?q?mailbox_number_3?= <mailbox@three>, =?abc?Q?mailbox?=   	 =?def?Q?_number_4?= <mailbox@four>",
-
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=mailbox1]]], email=mailbox@one],[mailbox-group: name=[text: [[word: charset=us-ascii, buffer=group1]]], list=[[mailbox: name=[text: []], email=mailbox1@group1],[mailbox: name=[text: []], email=mailbox2@group2],[mailbox: name=[text: [[word: charset=us-ascii, buffer=mailbox #3]]], email=mailbox3@group2]]],[mailbox: name=[text: []], email=mailbox@two],[mailbox: name=[text: [[word: charset=iso-8859-1, buffer=mailbox number 3]]], email=mailbox@three],[mailbox: name=[text: [[word: charset=abc, buffer=mailbox],[word: charset=def, buffer= number 4]]], email=mailbox@four]]]",
+			// Test 1
+			"My (this is a comment)name <me(another \\)comment) @    	somewhere(else).com>",
 
-				// Test 3
-				"John Doe <[email protected]>",
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=My name]]], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John Doe]]], [email protected]]]]",
+			// Test 2
+			"mailbox1 <mailbox@one>,;,,,	,,  	,,;group1:mailbox1@group1,  mailbox2@group2,,\"mailbox #3\" <mailbox3@group2>;, <mailbox@two>,,,,,,,,=?iso-8859-1?q?mailbox_number_3?= <mailbox@three>, =?abc?Q?mailbox?=   	 =?def?Q?_number_4?= <mailbox@four>",
 
-				// Test 4
-				"[email protected] (John Doe)",
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=mailbox1]]], email=mailbox@one],[mailbox-group: name=[text: [[word: charset=us-ascii, buffer=group1]]], list=[[mailbox: name=[text: []], email=mailbox1@group1],[mailbox: name=[text: []], email=mailbox2@group2],[mailbox: name=[text: [[word: charset=us-ascii, buffer=mailbox #3]]], email=mailbox3@group2]]],[mailbox: name=[text: []], email=mailbox@two],[mailbox: name=[text: [[word: charset=iso-8859-1, buffer=mailbox number 3]]], email=mailbox@three],[mailbox: name=[text: [[word: charset=abc, buffer=mailbox],[word: charset=def, buffer= number 4]]], email=mailbox@four]]]",
 
-				"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
+			// Test 3
+			"John Doe <[email protected]>",
 
-				// Test 5
-				"John.Doe (ignore) @acme.com (John Doe)",
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John Doe]]], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
+			// Test 4
+			"[email protected] (John Doe)",
 
-				// Test 6
-				"<[email protected]>",
+			"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
+			// Test 5
+			"John.Doe (ignore) @acme.com (John Doe)",
 
-				// Test 7
-				"[email protected]",
+			"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
+			// Test 6
+			"<[email protected]>",
 
-				// Test 8
-				"\"John Doe\" <[email protected]>",
+			"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John Doe]]], [email protected]]]]",
+			// Test 7
+			"[email protected]",
 
-				// Test 9
-				"=?us-ascii?q?John?=<[email protected]>",
+			"[address-list: [[mailbox: name=[text: []], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John]]], [email protected]]]]",
+			// Test 8
+			"\"John Doe\" <[email protected]>",
 
-				// Test 10
-				"\"John\"<[email protected]>",
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John Doe]]], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John]]], [email protected]]]]",
+			// Test 9
+			"=?us-ascii?q?John?=<[email protected]>",
 
-				// Test 11
-				"John<[email protected]>",
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John]]], [email protected]]]]",
 
-				"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John]]], [email protected]]]]"
-			};
+			// Test 10
+			"\"John\"<[email protected]>",
 
-			for (unsigned int i = 0 ; i < sizeof(testSuitesParse) / sizeof(testSuitesParse[0]) / 2 ; ++i)
-			{
-				vmime::string in = testSuitesParse[i * 2];
-				vmime::string out = testSuitesParse[i * 2 + 1];
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John]]], [email protected]]]]",
 
-				std::ostringstream oss;
-				oss << "Test " << (i + 1);
+			// Test 11
+			"John<[email protected]>",
 
-				vmime::addressList addrList;
-				addrList.parse(in);
+			"[address-list: [[mailbox: name=[text: [[word: charset=us-ascii, buffer=John]]], [email protected]]]]"
+		};
 
-				std::ostringstream cmp;
-				cmp << addrList;
-
-				assert_eq(oss.str(), out, cmp.str());
-			}
-		}
+		for (unsigned int i = 0 ; i < sizeof(testSuitesParse) / sizeof(testSuitesParse[0]) / 2 ; ++i)
+		{
+			vmime::string in = testSuitesParse[i * 2];
+			vmime::string out = testSuitesParse[i * 2 + 1];
 
-	public:
+			std::ostringstream oss;
+			oss << "Test " << (i + 1);
 
-		mailboxTest() : suite("vmime::mailbox")
-		{
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+			vmime::addressList addrList;
+			addrList.parse(in);
 
-			add("Parse", testcase(this, "Parse", &mailboxTest::testParse));
+			std::ostringstream cmp;
+			cmp << addrList;
 
-			suite::main().add("vmime::mailbox", this);
+			VASSERT_EQ(oss.str(), out, cmp.str());
 		}
+	}
 
-	};
+VMIME_TEST_SUITE_END
 
-	mailboxTest* theTest = new mailboxTest();
-}