Moved to CppUnit for unit tests framework.

1 files changed, 56 insertions, 72 deletions

diff --git a/tests/parser/pathTest.cpp b/tests/parser/pathTest.cpp
index a2fc76b8..aca18489 100644
--- a/tests/parser/pathTest.cpp
+++ b/tests/parser/pathTest.cpp
@@ -17,103 +17,87 @@
 // 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         pathTest
+#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(testParse2)
+		VMIME_TEST(testGenerate)
+	VMIME_TEST_LIST_END
 
-namespace
-{
-	class pathTest : public suite
-	{
-		void testParse()
-		{
-			vmime::path p1;
-			p1.parse("<>");
-
-			assert_eq("1.1", "", p1.getLocalPart());
-			assert_eq("1.2", "", p1.getDomain());
-
-			vmime::path p2;
-			p2.parse("<domain>");
-
-			assert_eq("2.1", "", p2.getLocalPart());
-			assert_eq("2.2", "domain", p2.getDomain());
 
-			vmime::path p3;
-			p3.parse("<local@domain>");
+	void testParse()
+	{
+		vmime::path p1;
+		p1.parse("<>");
 
-			assert_eq("3.1", "local", p3.getLocalPart());
-			assert_eq("3.2", "domain", p3.getDomain());
-		}
+		VASSERT_EQ("1.1", "", p1.getLocalPart());
+		VASSERT_EQ("1.2", "", p1.getDomain());
 
-		void testParse2()
-		{
-			// Test some invalid paths (no '<>')
-			vmime::path p1;
-			p1.parse("");
+		vmime::path p2;
+		p2.parse("<domain>");
 
-			assert_eq("1.1", "", p1.getLocalPart());
-			assert_eq("1.2", "", p1.getDomain());
+		VASSERT_EQ("2.1", "", p2.getLocalPart());
+		VASSERT_EQ("2.2", "domain", p2.getDomain());
 
-			vmime::path p2;
-			p2.parse("domain");
+		vmime::path p3;
+		p3.parse("<local@domain>");
 
-			assert_eq("2.1", "", p2.getLocalPart());
-			assert_eq("2.2", "domain", p2.getDomain());
+		VASSERT_EQ("3.1", "local", p3.getLocalPart());
+		VASSERT_EQ("3.2", "domain", p3.getDomain());
+	}
 
-			vmime::path p3;
-			p3.parse("local@domain");
+	void testParse2()
+	{
+		// Test some invalid paths (no '<>')
+		vmime::path p1;
+		p1.parse("");
 
-			assert_eq("3.1", "local", p3.getLocalPart());
-			assert_eq("3.2", "domain", p3.getDomain());
-		}
+		VASSERT_EQ("1.1", "", p1.getLocalPart());
+		VASSERT_EQ("1.2", "", p1.getDomain());
 
-		void testGenerate()
-		{
-			vmime::path p1;
+		vmime::path p2;
+		p2.parse("domain");
 
-			assert_eq("1", "<>", p1.generate());
+		VASSERT_EQ("2.1", "", p2.getLocalPart());
+		VASSERT_EQ("2.2", "domain", p2.getDomain());
 
-			vmime::path p2;
-			p2.setLocalPart("local");
+		vmime::path p3;
+		p3.parse("local@domain");
 
-			assert_eq("2", "<local@>", p2.generate());
+		VASSERT_EQ("3.1", "local", p3.getLocalPart());
+		VASSERT_EQ("3.2", "domain", p3.getDomain());
+	}
 
-			vmime::path p3;
-			p3.setDomain("domain");
+	void testGenerate()
+	{
+		vmime::path p1;
 
-			assert_eq("3", "<@domain>", p3.generate());
+		VASSERT_EQ("1", "<>", p1.generate());
 
-			vmime::path p4;
-			p4.setLocalPart("local");
-			p4.setDomain("domain");
+		vmime::path p2;
+		p2.setLocalPart("local");
 
-			assert_eq("4", "<local@domain>", p4.generate());
-		}
+		VASSERT_EQ("2", "<local@>", p2.generate());
 
-	public:
+		vmime::path p3;
+		p3.setDomain("domain");
 
-		pathTest() : suite("vmime::path")
-		{
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+		VASSERT_EQ("3", "<@domain>", p3.generate());
 
-			add("Parse", testcase(this, "Parse", &pathTest::testParse));
-			add("Parse2", testcase(this, "Parse2", &pathTest::testParse2));
-			add("Generate", testcase(this, "Generate", &pathTest::testGenerate));
+		vmime::path p4;
+		p4.setLocalPart("local");
+		p4.setDomain("domain");
 
-			suite::main().add("vmime::path", this);
-		}
+		VASSERT_EQ("4", "<local@domain>", p4.generate());
+	}
 
-	};
+VMIME_TEST_SUITE_END
 
-	pathTest* theTest = new pathTest();
-}