Moved to CppUnit for unit tests framework.

1 files changed, 87 insertions, 104 deletions

diff --git a/tests/parser/datetimeTest.cpp b/tests/parser/datetimeTest.cpp
index d372d685..12bf3dd4 100644
--- a/tests/parser/datetimeTest.cpp
+++ b/tests/parser/datetimeTest.cpp
@@ -17,126 +17,109 @@
 // 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         datetimeTest
+#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(testCompare)
+	VMIME_TEST_LIST_END
 
-namespace
-{
-	class datetimeTest : public suite
+
+	void testParse()
 	{
-		void testParse()
+		struct datetimePair
 		{
-			struct datetimePair
-			{
-				vmime::string parseBuffer;
-				vmime::datetime result;
-			};
-
-			// Here, we can't test all the possible structures for date/time,
-			// so we test some cases. Don't forget to add a new test case
-			// each time you encounter a bug in date/time parsing (after
-			// you have fixed it).
-			datetimePair pairs[] =
-			{
-				{ /* 1 */ "Mon, 8 Nov 2004 13:42:56 +0000 (GMT)",
-				  vmime::datetime(2004, 11, 8, 13, 42, 56, vmime::datetime::GMT) },
-
-				{ /* 2 */ "Sun,  7 Nov 2004 00:43:22 -0500 (EST)",
-				  vmime::datetime(2004, 11, 7, 0, 43, 22, vmime::datetime::GMT_5) },
-
-				{ /* 3 */ "Thu Nov 18 12:11:16 2004",
-				  vmime::datetime(vmime::datetime::now().getYear(), 11, 18, 12, 11, 16, vmime::datetime::GMT) },
-
-				{ /* 4 */ "Sat, 18, 2004 22:36:32 -0400",
-				  vmime::datetime(2004, 1, 18, 22, 36, 32, vmime::datetime::GMT_4) },
-
-				{ /* 5 */ "Mon Dec 13 21:57:18 2004",
-				  vmime::datetime(vmime::datetime::now().getYear(), 12, 13, 21, 57, 18, vmime::datetime::GMT) },
-
-				{ /* 6 */ "18 Nov 2004 21:44:54 +0300",
-				  vmime::datetime(2004, 11, 18, 21, 44, 54, vmime::datetime::GMT3) }
-			};
-
-			for (unsigned int i = 0 ; i < sizeof(pairs) / sizeof(pairs[0]) ; ++i)
-			{
-				vmime::datetime d;
-				d.parse(pairs[i].parseBuffer);
-
-				std::ostringstream oss;
-				oss << (i + 1);
-
-				assert_eq(oss.str(), pairs[i].result, d);
-			}
-		}
-
-		void testGenerate()
+			vmime::string parseBuffer;
+			vmime::datetime result;
+		};
+
+		// Here, we can't test all the possible structures for date/time,
+		// so we test some cases. Don't forget to add a new test case
+		// each time you encounter a bug in date/time parsing (after
+		// you have fixed it).
+		datetimePair pairs[] =
 		{
-			vmime::datetime d1(2005, 7, 8, 4, 5, 6, 1 * 60 + 23);
+			{ /* 1 */ "Mon, 8 Nov 2004 13:42:56 +0000 (GMT)",
+			  vmime::datetime(2004, 11, 8, 13, 42, 56, vmime::datetime::GMT) },
 
-			assert_eq("1", "Fri, 8 Jul 2005 04:05:06 +0123", d1.generate());
-		}
+			{ /* 2 */ "Sun,  7 Nov 2004 00:43:22 -0500 (EST)",
+			  vmime::datetime(2004, 11, 7, 0, 43, 22, vmime::datetime::GMT_5) },
 
-		void testCompare()
-		{
-			// Date1 = Date2
-			vmime::datetime d1(2005, 4, 22, 14, 6, 0, vmime::datetime::GMT2);
-			vmime::datetime d2(2005, 4, 22, 10, 6, 0, vmime::datetime::GMT_2);
-
-			assert_eq("1.1", true,  d1 == d2);
-			assert_eq("1.2", false, d1 != d2);
-			assert_eq("1.3", true,  d1 <= d2);
-			assert_eq("1.4", false, d1 <  d2);
-			assert_eq("1.5", true,  d1 >= d2);
-			assert_eq("1.6", false, d1 >  d2);
-
-			// Date1 < Date2
-			vmime::datetime d3(2005, 4, 22, 14, 6, 0);
-			vmime::datetime d4(2005, 4, 22, 15, 6, 0);
-
-			assert_eq("2.1", false, d3 == d4);
-			assert_eq("2.2", true,  d3 != d4);
-			assert_eq("2.3", true,  d3 <= d4);
-			assert_eq("2.4", true,  d3 <  d4);
-			assert_eq("2.5", false, d3 >= d4);
-			assert_eq("2.6", false, d3 >  d4);
-
-			// Date1 > Date2
-			vmime::datetime d5(2005, 4, 22, 15, 6, 0);
-			vmime::datetime d6(2005, 4, 22, 14, 6, 0);
-
-			assert_eq("3.1", false, d5 == d6);
-			assert_eq("3.2", true,  d5 != d6);
-			assert_eq("3.3", false, d5 <= d6);
-			assert_eq("3.4", false, d5 <  d6);
-			assert_eq("3.5", true,  d5 >= d6);
-			assert_eq("3.6", true,  d5 >  d6);
-		}
+			{ /* 3 */ "Thu Nov 18 12:11:16 2004",
+			  vmime::datetime(vmime::datetime::now().getYear(), 11, 18, 12, 11, 16, vmime::datetime::GMT) },
 
-	public:
+			{ /* 4 */ "Sat, 18, 2004 22:36:32 -0400",
+			  vmime::datetime(2004, 1, 18, 22, 36, 32, vmime::datetime::GMT_4) },
 
-		datetimeTest() : suite("vmime::datetime")
+			{ /* 5 */ "Mon Dec 13 21:57:18 2004",
+			  vmime::datetime(vmime::datetime::now().getYear(), 12, 13, 21, 57, 18, vmime::datetime::GMT) },
+
+			{ /* 6 */ "18 Nov 2004 21:44:54 +0300",
+			  vmime::datetime(2004, 11, 18, 21, 44, 54, vmime::datetime::GMT3) }
+		};
+
+		for (unsigned int i = 0 ; i < sizeof(pairs) / sizeof(pairs[0]) ; ++i)
 		{
-			// VMime initialization
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+			vmime::datetime d;
+			d.parse(pairs[i].parseBuffer);
 
-			add("Parse", testcase(this, "Parse", &datetimeTest::testParse));
-			add("Generate", testcase(this, "Generate", &datetimeTest::testGenerate));
-			add("Compare", testcase(this, "Compare", &datetimeTest::testCompare));
+			std::ostringstream oss;
+			oss << (i + 1);
 
-			suite::main().add("vmime::datetime", this);
+			VASSERT_EQ(oss.str(), pairs[i].result, d);
 		}
+	}
+
+	void testGenerate()
+	{
+		vmime::datetime d1(2005, 7, 8, 4, 5, 6, 1 * 60 + 23);
+
+		VASSERT_EQ("1", "Fri, 8 Jul 2005 04:05:06 +0123", d1.generate());
+	}
 
-	};
+	void testCompare()
+	{
+		// Date1 = Date2
+		vmime::datetime d1(2005, 4, 22, 14, 6, 0, vmime::datetime::GMT2);
+		vmime::datetime d2(2005, 4, 22, 10, 6, 0, vmime::datetime::GMT_2);
+
+		VASSERT_EQ("1.1", true,  d1 == d2);
+		VASSERT_EQ("1.2", false, d1 != d2);
+		VASSERT_EQ("1.3", true,  d1 <= d2);
+		VASSERT_EQ("1.4", false, d1 <  d2);
+		VASSERT_EQ("1.5", true,  d1 >= d2);
+		VASSERT_EQ("1.6", false, d1 >  d2);
+
+		// Date1 < Date2
+		vmime::datetime d3(2005, 4, 22, 14, 6, 0);
+		vmime::datetime d4(2005, 4, 22, 15, 6, 0);
+
+		VASSERT_EQ("2.1", false, d3 == d4);
+		VASSERT_EQ("2.2", true,  d3 != d4);
+		VASSERT_EQ("2.3", true,  d3 <= d4);
+		VASSERT_EQ("2.4", true,  d3 <  d4);
+		VASSERT_EQ("2.5", false, d3 >= d4);
+		VASSERT_EQ("2.6", false, d3 >  d4);
+
+		// Date1 > Date2
+		vmime::datetime d5(2005, 4, 22, 15, 6, 0);
+		vmime::datetime d6(2005, 4, 22, 14, 6, 0);
+
+		VASSERT_EQ("3.1", false, d5 == d6);
+		VASSERT_EQ("3.2", true,  d5 != d6);
+		VASSERT_EQ("3.3", false, d5 <= d6);
+		VASSERT_EQ("3.4", false, d5 <  d6);
+		VASSERT_EQ("3.5", true,  d5 >= d6);
+		VASSERT_EQ("3.6", true,  d5 >  d6);
+	}
+
+VMIME_TEST_SUITE_END
 
-	datetimeTest* theTest = new datetimeTest();
-}