Moved to CppUnit for unit tests framework.

1 files changed, 102 insertions, 119 deletions

diff --git a/tests/parser/dispositionTest.cpp b/tests/parser/dispositionTest.cpp
index e0c269f7..bad63a63 100644
--- a/tests/parser/dispositionTest.cpp
+++ b/tests/parser/dispositionTest.cpp
@@ -17,152 +17,135 @@
 // 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         dispositionTest
+#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(testModifiers)
+	VMIME_TEST_LIST_END
 
-namespace
-{
-	class dispositionTest : public suite
-	{
-		void testParse()
-		{
-			// disposition-mode ";" disposition-type
-			//      [ "/" disposition-modifier *( "," disposition-modifier ) ]
-			//
-			// disposition-mode = action-mode "/" sending-mode
-
-			vmime::disposition disp1;
-			disp1.parse("mode");
-
-			assert_eq("1.1", "mode", disp1.getActionMode());
-			assert_eq("1.2", "", disp1.getSendingMode());
-			assert_eq("1.3", "", disp1.getType());
-			assert_eq("1.4", 0, static_cast <int>(disp1.getModifierList().size()));
-
-			vmime::disposition disp2;
-			disp2.parse("amode/smode");
-
-			assert_eq("2.1", "amode", disp2.getActionMode());
-			assert_eq("2.2", "smode", disp2.getSendingMode());
-			assert_eq("2.3", "", disp2.getType());
-			assert_eq("2.4", 0, static_cast <int>(disp2.getModifierList().size()));
-
-			vmime::disposition disp3;
-			disp3.parse("amode/smode;type");
-
-			assert_eq("3.1", "amode", disp3.getActionMode());
-			assert_eq("3.2", "smode", disp3.getSendingMode());
-			assert_eq("3.3", "type", disp3.getType());
-			assert_eq("3.4", 0, static_cast <int>(disp3.getModifierList().size()));
-
-			vmime::disposition disp4;
-			disp4.parse("amode/smode;type/modif");
-
-			assert_eq("4.1", "amode", disp4.getActionMode());
-			assert_eq("4.2", "smode", disp4.getSendingMode());
-			assert_eq("4.3", "type", disp4.getType());
-			assert_eq("4.4", 1, static_cast <int>(disp4.getModifierList().size()));
-			assert_eq("4.5", "modif", disp4.getModifierList()[0]);
-
-			vmime::disposition disp5;
-			disp5.parse("amode/smode;type/modif1,modif2");
 
-			assert_eq("5.1", "amode", disp5.getActionMode());
-			assert_eq("5.2", "smode", disp5.getSendingMode());
-			assert_eq("5.3", "type", disp5.getType());
-			assert_eq("5.4", 2, static_cast <int>(disp5.getModifierList().size()));
-			assert_eq("5.5", "modif1", disp5.getModifierList()[0]);
-			assert_eq("5.6", "modif2", disp5.getModifierList()[1]);
-		}
-
-		void testGenerate()
-		{
-			vmime::disposition disp;
-
-			assert_eq("1", "automatic-action/MDN-sent-automatically;displayed", disp.generate());
-
-			disp.setActionMode("amode");
-
-			assert_eq("2", "amode/MDN-sent-automatically;displayed", disp.generate());
-
-			disp.setActionMode("amode");
-			disp.setSendingMode("smode");
-
-			assert_eq("3", "amode/smode;displayed", disp.generate());
+	void testParse()
+	{
+		// disposition-mode ";" disposition-type
+		//      [ "/" disposition-modifier *( "," disposition-modifier ) ]
+		//
+		// disposition-mode = action-mode "/" sending-mode
+
+		vmime::disposition disp1;
+		disp1.parse("mode");
+
+		VASSERT_EQ("1.1", "mode", disp1.getActionMode());
+		VASSERT_EQ("1.2", "", disp1.getSendingMode());
+		VASSERT_EQ("1.3", "", disp1.getType());
+		VASSERT_EQ("1.4", 0, static_cast <int>(disp1.getModifierList().size()));
+
+		vmime::disposition disp2;
+		disp2.parse("amode/smode");
+
+		VASSERT_EQ("2.1", "amode", disp2.getActionMode());
+		VASSERT_EQ("2.2", "smode", disp2.getSendingMode());
+		VASSERT_EQ("2.3", "", disp2.getType());
+		VASSERT_EQ("2.4", 0, static_cast <int>(disp2.getModifierList().size()));
+
+		vmime::disposition disp3;
+		disp3.parse("amode/smode;type");
+
+		VASSERT_EQ("3.1", "amode", disp3.getActionMode());
+		VASSERT_EQ("3.2", "smode", disp3.getSendingMode());
+		VASSERT_EQ("3.3", "type", disp3.getType());
+		VASSERT_EQ("3.4", 0, static_cast <int>(disp3.getModifierList().size()));
+
+		vmime::disposition disp4;
+		disp4.parse("amode/smode;type/modif");
+
+		VASSERT_EQ("4.1", "amode", disp4.getActionMode());
+		VASSERT_EQ("4.2", "smode", disp4.getSendingMode());
+		VASSERT_EQ("4.3", "type", disp4.getType());
+		VASSERT_EQ("4.4", 1, static_cast <int>(disp4.getModifierList().size()));
+		VASSERT_EQ("4.5", "modif", disp4.getModifierList()[0]);
+
+		vmime::disposition disp5;
+		disp5.parse("amode/smode;type/modif1,modif2");
+
+		VASSERT_EQ("5.1", "amode", disp5.getActionMode());
+		VASSERT_EQ("5.2", "smode", disp5.getSendingMode());
+		VASSERT_EQ("5.3", "type", disp5.getType());
+		VASSERT_EQ("5.4", 2, static_cast <int>(disp5.getModifierList().size()));
+		VASSERT_EQ("5.5", "modif1", disp5.getModifierList()[0]);
+		VASSERT_EQ("5.6", "modif2", disp5.getModifierList()[1]);
+	}
+
+	void testGenerate()
+	{
+		vmime::disposition disp;
 
-			disp.setType("type");
+		VASSERT_EQ("1", "automatic-action/MDN-sent-automatically;displayed", disp.generate());
 
-			assert_eq("4", "amode/smode;type", disp.generate());
+		disp.setActionMode("amode");
 
-			disp.addModifier("modif1");
+		VASSERT_EQ("2", "amode/MDN-sent-automatically;displayed", disp.generate());
 
-			assert_eq("5", "amode/smode;type/modif1", disp.generate());
+		disp.setActionMode("amode");
+		disp.setSendingMode("smode");
 
-			disp.addModifier("modif2");
+		VASSERT_EQ("3", "amode/smode;displayed", disp.generate());
 
-			assert_eq("6", "amode/smode;type/modif1,modif2", disp.generate());
-		}
+		disp.setType("type");
 
-		void testModifiers()
-		{
-			vmime::disposition disp1;
+		VASSERT_EQ("4", "amode/smode;type", disp.generate());
 
-			assert_eq("1", false, disp1.hasModifier("foo"));
-			assert_eq("2", 0, static_cast <int>(disp1.getModifierList().size()));
+		disp.addModifier("modif1");
 
-			disp1.addModifier("bar");
+		VASSERT_EQ("5", "amode/smode;type/modif1", disp.generate());
 
-			assert_eq("3", false, disp1.hasModifier("foo"));
-			assert_eq("4", true, disp1.hasModifier("bar"));
-			assert_eq("5", 1, static_cast <int>(disp1.getModifierList().size()));
+		disp.addModifier("modif2");
 
-			disp1.addModifier("plop");
+		VASSERT_EQ("6", "amode/smode;type/modif1,modif2", disp.generate());
+	}
 
-			assert_eq("6", false, disp1.hasModifier("foo"));
-			assert_eq("7", true, disp1.hasModifier("bar"));
-			assert_eq("8", true, disp1.hasModifier("plop"));
-			assert_eq("9", 2, static_cast <int>(disp1.getModifierList().size()));
+	void testModifiers()
+	{
+		vmime::disposition disp1;
 
-			disp1.removeModifier("bar");
+		VASSERT_EQ("1", false, disp1.hasModifier("foo"));
+		VASSERT_EQ("2", 0, static_cast <int>(disp1.getModifierList().size()));
 
-			assert_eq("10", false, disp1.hasModifier("foo"));
-			assert_eq("11", false, disp1.hasModifier("bar"));
-			assert_eq("12", true, disp1.hasModifier("plop"));
-			assert_eq("13", 1, static_cast <int>(disp1.getModifierList().size()));
+		disp1.addModifier("bar");
 
-			disp1.removeModifier("PlOp");
+		VASSERT_EQ("3", false, disp1.hasModifier("foo"));
+		VASSERT_EQ("4", true, disp1.hasModifier("bar"));
+		VASSERT_EQ("5", 1, static_cast <int>(disp1.getModifierList().size()));
 
-			assert_eq("14", false, disp1.hasModifier("foo"));
-			assert_eq("15", false, disp1.hasModifier("bar"));
-			assert_eq("16", false, disp1.hasModifier("plop"));
-			assert_eq("17", 0, static_cast <int>(disp1.getModifierList().size()));
-		}
+		disp1.addModifier("plop");
 
-	public:
+		VASSERT_EQ("6", false, disp1.hasModifier("foo"));
+		VASSERT_EQ("7", true, disp1.hasModifier("bar"));
+		VASSERT_EQ("8", true, disp1.hasModifier("plop"));
+		VASSERT_EQ("9", 2, static_cast <int>(disp1.getModifierList().size()));
 
-		dispositionTest() : suite("vmime::disposition")
-		{
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+		disp1.removeModifier("bar");
 
-			add("Parse", testcase(this, "Parse", &dispositionTest::testParse));
-			add("Generate", testcase(this, "Generate", &dispositionTest::testGenerate));
+		VASSERT_EQ("10", false, disp1.hasModifier("foo"));
+		VASSERT_EQ("11", false, disp1.hasModifier("bar"));
+		VASSERT_EQ("12", true, disp1.hasModifier("plop"));
+		VASSERT_EQ("13", 1, static_cast <int>(disp1.getModifierList().size()));
 
-			add("Modifiers", testcase(this, "Modifiers", &dispositionTest::testModifiers));
+		disp1.removeModifier("PlOp");
 
-			suite::main().add("vmime::disposition", this);
-		}
+		VASSERT_EQ("14", false, disp1.hasModifier("foo"));
+		VASSERT_EQ("15", false, disp1.hasModifier("bar"));
+		VASSERT_EQ("16", false, disp1.hasModifier("plop"));
+		VASSERT_EQ("17", 0, static_cast <int>(disp1.getModifierList().size()));
+	}
 
-	};
+VMIME_TEST_SUITE_END
 
-	dispositionTest* theTest = new dispositionTest();
-}