Moved to CppUnit for unit tests framework.

1 files changed, 175 insertions, 191 deletions

diff --git a/tests/parser/parameterTest.cpp b/tests/parser/parameterTest.cpp
index 9b3bd66a..5f838fe1 100644
--- a/tests/parser/parameterTest.cpp
+++ b/tests/parser/parameterTest.cpp
@@ -17,21 +17,21 @@
 // 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         parameterTest
+#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
-{
 	// HACK: parameterizedHeaderField constructor is private
 	class parameterizedHeaderField : public vmime::parameterizedHeaderField
 	{
@@ -65,193 +65,177 @@ namespace
 	(p.getParameterAt(n).staticCast <vmime::defaultParameter>())->getValue().getBuffer())
 
 
-	class parameterTest : public suite
+	void testParse()
 	{
-		void testParse()
-		{
-			// Simple parameter
-			parameterizedHeaderField p1;
-			p1.parse("X; param1=value1;\r\n");
-
-			assert_eq("1.1", 1, p1.getParameterCount());
-			assert_eq("1.2", "param1", PARAM_NAME(p1, 0));
-			assert_eq("1.3", "value1", PARAM_VALUE(p1, 0));
-
-			// Multi-section parameters (1/2)
-			parameterizedHeaderField p2a;
-			p2a.parse("X; param1=value1;\r\n"
-			          "  param2*0=\"val\";\r\n"
-			          "  param2*1=\"ue2\";");
-
-			assert_eq("2a.1", 2, p2a.getParameterCount());
-			assert_eq("2a.2", "param1", PARAM_NAME(p2a, 0));
-			assert_eq("2a.3", "value1", PARAM_VALUE(p2a, 0));
-			assert_eq("2a.4", "param2", PARAM_NAME(p2a, 1));
-			assert_eq("2a.5", "value2", PARAM_VALUE(p2a, 1));
-
-			// Multi-section parameters (2/2)
-			parameterizedHeaderField p2b;
-			p2b.parse("X; param1=value1;\r\n"
-			          "  param2=\"should be ignored\";\r\n"
-			          "  param2*0=\"val\";\r\n"
-			          "  param2*1=\"ue2\";");
-
-			assert_eq("2b.1", 2, p2b.getParameterCount());
-			assert_eq("2b.2", "param1", PARAM_NAME(p2b, 0));
-			assert_eq("2b.3", "value1", PARAM_VALUE(p2b, 0));
-			assert_eq("2b.4", "param2", PARAM_NAME(p2b, 1));
-			assert_eq("2b.5", "value2", PARAM_VALUE(p2b, 1));
-
-			// Extended parameter (charset and language information)
-			parameterizedHeaderField p3;
-			p3.parse("X; param1*=charset'language'value1;\r\n");
-
-			assert_eq("3.1", 1, p3.getParameterCount());
-			assert_eq("3.2", "param1", PARAM_NAME(p3, 0));
-			assert_eq("3.3", "charset", PARAM_CHARSET(p3, 0));
-			assert_eq("3.4", "value1", PARAM_BUFFER(p3, 0));
-
-			// Encoded characters in extended parameter values
-			parameterizedHeaderField p4;
-			p4.parse("X; param1*=a%20value%20with%20multiple%20word%73");  // 0x73 = 's'
-
-			assert_eq("4.1", 1, p4.getParameterCount());
-			assert_eq("4.2", "param1", PARAM_NAME(p4, 0));
-			assert_eq("4.3", "a value with multiple words", PARAM_VALUE(p4, 0));
-
-			// Invalid encoded character
-			parameterizedHeaderField p5;
-			p5.parse("X; param1*=test%20value%");
-
-			assert_eq("5.1", 1, p5.getParameterCount());
-			assert_eq("5.2", "param1", PARAM_NAME(p5, 0));
-			assert_eq("5.3", "test value%", PARAM_VALUE(p5, 0));
-
-			// Spaces before and after '='
-			parameterizedHeaderField p6;
-			p6.parse("X; param1\t=  \"value1\"");
-
-			assert_eq("6.1", 1, p6.getParameterCount());
-			assert_eq("6.2", "param1", PARAM_NAME(p6, 0));
-			assert_eq("6.3", "value1", PARAM_VALUE(p6, 0));
-
-			// Quoted strings and escaped chars
-			parameterizedHeaderField p7;
-			p7.parse("X; param1=\"this is a slash: \\\"\\\\\\\"\"");  // \"\\\"
-
-			assert_eq("7.1", 1, p7.getParameterCount());
-			assert_eq("7.2", "param1", PARAM_NAME(p7, 0));
-			assert_eq("7.3", "this is a slash: \"\\\"", PARAM_VALUE(p7, 0));
-
-			// Extended parameter with charset specified in more than one
-			// section (this is forbidden by RFC, but is should not fail)
-			parameterizedHeaderField p8;
-			p8.parse("X; param1*0*=charset1'language1'value1;\r\n"
-			         "   param1*1*=charset2'language2'value2;");
-
-			assert_eq("8.1", 1, p8.getParameterCount());
-			assert_eq("8.2", "param1", PARAM_NAME(p8, 0));
-			assert_eq("8.3", "charset1", PARAM_CHARSET(p8, 0));
-			assert_eq("8.4", "value1charset2'language2'value2", PARAM_BUFFER(p8, 0));
-
-			// Charset not specified in the first section (that is not encoded),
-			// but specified in the second one (legal)
-			parameterizedHeaderField p9;
-			p9.parse("X; param1*0=value1;\r\n"
-			         "   param1*1*=charset'language'value2;");
-
-			assert_eq("9.1", 1, p9.getParameterCount());
-			assert_eq("9.2", "param1", PARAM_NAME(p9, 0));
-			assert_eq("9.3", "charset", PARAM_CHARSET(p9, 0));
-			assert_eq("9.4", "value1value2", PARAM_BUFFER(p9, 0));
-
-			// Characters prefixed with '%' in a simple (not extended) section
-			// should not be decoded
-			parameterizedHeaderField p10;
-			p10.parse("X; param1=val%20ue1");
-
-			assert_eq("10.1", 1, p10.getParameterCount());
-			assert_eq("10.2", "param1", PARAM_NAME(p10, 0));
-			assert_eq("10.3", "val%20ue1", PARAM_VALUE(p10, 0));
-
-			// Multiple sections + charset specified and encoding
-			parameterizedHeaderField p11;
-			p11.parse("X; param1*0*=charset'language'value1a%20;"
-			          "   param1*1*=value1b%20;"
-			          "   param1*2=value1c");
-
-			assert_eq("11.1", 1, p11.getParameterCount());
-			assert_eq("11.2", "param1", PARAM_NAME(p11, 0));
-			assert_eq("11.3", "charset", PARAM_CHARSET(p11, 0));
-			assert_eq("11.4", "value1a value1b value1c", PARAM_BUFFER(p11, 0));
-
-			// No charset specified: defaults to US-ASCII
-			parameterizedHeaderField p12;
-			p12.parse("X; param1*='language'value1");
-
-			assert_eq("12.1", 1, p12.getParameterCount());
-			assert_eq("12.2", "param1", PARAM_NAME(p12, 0));
-			assert_eq("12.3", "us-ascii", PARAM_CHARSET(p12, 0));
-			assert_eq("12.4", "value1", PARAM_BUFFER(p12, 0));
-		}
+		// Simple parameter
+		parameterizedHeaderField p1;
+		p1.parse("X; param1=value1;\r\n");
+
+		VASSERT_EQ("1.1", 1, p1.getParameterCount());
+		VASSERT_EQ("1.2", "param1", PARAM_NAME(p1, 0));
+		VASSERT_EQ("1.3", "value1", PARAM_VALUE(p1, 0));
+
+		// Multi-section parameters (1/2)
+		parameterizedHeaderField p2a;
+		p2a.parse("X; param1=value1;\r\n"
+			  "  param2*0=\"val\";\r\n"
+			  "  param2*1=\"ue2\";");
+
+		VASSERT_EQ("2a.1", 2, p2a.getParameterCount());
+		VASSERT_EQ("2a.2", "param1", PARAM_NAME(p2a, 0));
+		VASSERT_EQ("2a.3", "value1", PARAM_VALUE(p2a, 0));
+		VASSERT_EQ("2a.4", "param2", PARAM_NAME(p2a, 1));
+		VASSERT_EQ("2a.5", "value2", PARAM_VALUE(p2a, 1));
+
+		// Multi-section parameters (2/2)
+		parameterizedHeaderField p2b;
+		p2b.parse("X; param1=value1;\r\n"
+			  "  param2=\"should be ignored\";\r\n"
+			  "  param2*0=\"val\";\r\n"
+			  "  param2*1=\"ue2\";");
+
+		VASSERT_EQ("2b.1", 2, p2b.getParameterCount());
+		VASSERT_EQ("2b.2", "param1", PARAM_NAME(p2b, 0));
+		VASSERT_EQ("2b.3", "value1", PARAM_VALUE(p2b, 0));
+		VASSERT_EQ("2b.4", "param2", PARAM_NAME(p2b, 1));
+		VASSERT_EQ("2b.5", "value2", PARAM_VALUE(p2b, 1));
+
+		// Extended parameter (charset and language information)
+		parameterizedHeaderField p3;
+		p3.parse("X; param1*=charset'language'value1;\r\n");
+
+		VASSERT_EQ("3.1", 1, p3.getParameterCount());
+		VASSERT_EQ("3.2", "param1", PARAM_NAME(p3, 0));
+		VASSERT_EQ("3.3", "charset", PARAM_CHARSET(p3, 0));
+		VASSERT_EQ("3.4", "value1", PARAM_BUFFER(p3, 0));
+
+		// Encoded characters in extended parameter values
+		parameterizedHeaderField p4;
+		p4.parse("X; param1*=a%20value%20with%20multiple%20word%73");  // 0x73 = 's'
+
+		VASSERT_EQ("4.1", 1, p4.getParameterCount());
+		VASSERT_EQ("4.2", "param1", PARAM_NAME(p4, 0));
+		VASSERT_EQ("4.3", "a value with multiple words", PARAM_VALUE(p4, 0));
+
+		// Invalid encoded character
+		parameterizedHeaderField p5;
+		p5.parse("X; param1*=test%20value%");
+
+		VASSERT_EQ("5.1", 1, p5.getParameterCount());
+		VASSERT_EQ("5.2", "param1", PARAM_NAME(p5, 0));
+		VASSERT_EQ("5.3", "test value%", PARAM_VALUE(p5, 0));
+
+		// Spaces before and after '='
+		parameterizedHeaderField p6;
+		p6.parse("X; param1\t=  \"value1\"");
+
+		VASSERT_EQ("6.1", 1, p6.getParameterCount());
+		VASSERT_EQ("6.2", "param1", PARAM_NAME(p6, 0));
+		VASSERT_EQ("6.3", "value1", PARAM_VALUE(p6, 0));
+
+		// Quoted strings and escaped chars
+		parameterizedHeaderField p7;
+		p7.parse("X; param1=\"this is a slash: \\\"\\\\\\\"\"");  // \"\\\"
+
+		VASSERT_EQ("7.1", 1, p7.getParameterCount());
+		VASSERT_EQ("7.2", "param1", PARAM_NAME(p7, 0));
+		VASSERT_EQ("7.3", "this is a slash: \"\\\"", PARAM_VALUE(p7, 0));
+
+		// Extended parameter with charset specified in more than one
+		// section (this is forbidden by RFC, but is should not fail)
+		parameterizedHeaderField p8;
+		p8.parse("X; param1*0*=charset1'language1'value1;\r\n"
+			 "   param1*1*=charset2'language2'value2;");
+
+		VASSERT_EQ("8.1", 1, p8.getParameterCount());
+		VASSERT_EQ("8.2", "param1", PARAM_NAME(p8, 0));
+		VASSERT_EQ("8.3", "charset1", PARAM_CHARSET(p8, 0));
+		VASSERT_EQ("8.4", "value1charset2'language2'value2", PARAM_BUFFER(p8, 0));
+
+		// Charset not specified in the first section (that is not encoded),
+		// but specified in the second one (legal)
+		parameterizedHeaderField p9;
+		p9.parse("X; param1*0=value1;\r\n"
+			 "   param1*1*=charset'language'value2;");
+
+		VASSERT_EQ("9.1", 1, p9.getParameterCount());
+		VASSERT_EQ("9.2", "param1", PARAM_NAME(p9, 0));
+		VASSERT_EQ("9.3", "charset", PARAM_CHARSET(p9, 0));
+		VASSERT_EQ("9.4", "value1value2", PARAM_BUFFER(p9, 0));
+
+		// Characters prefixed with '%' in a simple (not extended) section
+		// should not be decoded
+		parameterizedHeaderField p10;
+		p10.parse("X; param1=val%20ue1");
+
+		VASSERT_EQ("10.1", 1, p10.getParameterCount());
+		VASSERT_EQ("10.2", "param1", PARAM_NAME(p10, 0));
+		VASSERT_EQ("10.3", "val%20ue1", PARAM_VALUE(p10, 0));
+
+		// Multiple sections + charset specified and encoding
+		parameterizedHeaderField p11;
+		p11.parse("X; param1*0*=charset'language'value1a%20;"
+			  "   param1*1*=value1b%20;"
+			  "   param1*2=value1c");
+
+		VASSERT_EQ("11.1", 1, p11.getParameterCount());
+		VASSERT_EQ("11.2", "param1", PARAM_NAME(p11, 0));
+		VASSERT_EQ("11.3", "charset", PARAM_CHARSET(p11, 0));
+		VASSERT_EQ("11.4", "value1a value1b value1c", PARAM_BUFFER(p11, 0));
+
+		// No charset specified: defaults to US-ASCII
+		parameterizedHeaderField p12;
+		p12.parse("X; param1*='language'value1");
+
+		VASSERT_EQ("12.1", 1, p12.getParameterCount());
+		VASSERT_EQ("12.2", "param1", PARAM_NAME(p12, 0));
+		VASSERT_EQ("12.3", "us-ascii", PARAM_CHARSET(p12, 0));
+		VASSERT_EQ("12.4", "value1", PARAM_BUFFER(p12, 0));
+	}
+
+	void testGenerate()
+	{
+		// Simple parameter/value
+		parameterizedHeaderField p1;
+		p1.appendParameter(vmime::parameterFactory::getInstance()->create("param1", "value1"));
 
-		void testGenerate()
-		{
-			// Simple parameter/value
-			parameterizedHeaderField p1;
-			p1.appendParameter(vmime::parameterFactory::getInstance()->create("param1", "value1"));
-
-			assert_eq("1", "F: X; param1=value1", p1.generate());
-
-			// Value that needs quoting (1/2)
-			parameterizedHeaderField p2a;
-			p2a.appendParameter(vmime::parameterFactory::getInstance()->create("param1", "value1a;value1b"));
-
-			assert_eq("2a", "F: X; param1=\"value1a;value1b\"", p2a.generate());
-
-			// Value that needs quoting (2/2)
-			parameterizedHeaderField p2b;
-			p2b.appendParameter(vmime::parameterFactory::getInstance()->create("param1", "va\\lue\"1"));
-
-			assert_eq("2b", "F: X; param1=\"va\\\\lue\\\"1\"", p2b.generate());
-
-			// Extended parameter with charset specifier
-			parameterizedHeaderField p3;
-			p3.appendParameter(vmime::parameterFactory::getInstance()->create("param1",
-				vmime::word("value 1\xe9", vmime::charset("charset"))));
-
-			assert_eq("3", "F: X; param1=\"value 1\";param1*=charset''value%201%E9", p3.generate());
-
-			// Value that spans on multiple lines
-			parameterizedHeaderField p4;
-			p4.appendParameter(vmime::parameterFactory::getInstance()->create("param1",
-				vmime::word("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
-				            vmime::charset("charset"))));
-
-			assert_eq("4", "F: X; \r\n "
-				"param1=abcdefghijklm;\r\n "
-				"param1*0*=charset''abc;\r\n "
-				"param1*1*=defghijkl;\r\n "
-				"param1*2*=mnopqrstu;\r\n "
-				"param1*3*=vwxyzABCD;\r\n "
-				"param1*4*=EFGHIJKLM;\r\n "
-				"param1*5*=NOPQRSTUV;\r\n "
-				"param1*6*=WXYZ", p4.generate(25));  // max line length = 25
-		}
+		VASSERT_EQ("1", "F: X; param1=value1", p1.generate());
 
-	public:
+		// Value that needs quoting (1/2)
+		parameterizedHeaderField p2a;
+		p2a.appendParameter(vmime::parameterFactory::getInstance()->create("param1", "value1a;value1b"));
 
-		parameterTest() : suite("vmime::path")
-		{
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+		VASSERT_EQ("2a", "F: X; param1=\"value1a;value1b\"", p2a.generate());
 
-			add("Parse", testcase(this, "Parse", &parameterTest::testParse));
-			add("Generate", testcase(this, "Generate", &parameterTest::testGenerate));
+		// Value that needs quoting (2/2)
+		parameterizedHeaderField p2b;
+		p2b.appendParameter(vmime::parameterFactory::getInstance()->create("param1", "va\\lue\"1"));
 
-			suite::main().add("vmime::parameter", this);
-		}
+		VASSERT_EQ("2b", "F: X; param1=\"va\\\\lue\\\"1\"", p2b.generate());
 
-	};
+		// Extended parameter with charset specifier
+		parameterizedHeaderField p3;
+		p3.appendParameter(vmime::parameterFactory::getInstance()->create("param1",
+			vmime::word("value 1\xe9", vmime::charset("charset"))));
+
+		VASSERT_EQ("3", "F: X; param1=\"value 1\";param1*=charset''value%201%E9", p3.generate());
+
+		// Value that spans on multiple lines
+		parameterizedHeaderField p4;
+		p4.appendParameter(vmime::parameterFactory::getInstance()->create("param1",
+			vmime::word("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+				    vmime::charset("charset"))));
+
+		VASSERT_EQ("4", "F: X; \r\n "
+			"param1=abcdefghijklm;\r\n "
+			"param1*0*=charset''abc;\r\n "
+			"param1*1*=defghijkl;\r\n "
+			"param1*2*=mnopqrstu;\r\n "
+			"param1*3*=vwxyzABCD;\r\n "
+			"param1*4*=EFGHIJKLM;\r\n "
+			"param1*5*=NOPQRSTUV;\r\n "
+			"param1*6*=WXYZ", p4.generate(25));  // max line length = 25
+	}
+
+VMIME_TEST_SUITE_END
 
-	parameterTest* theTest = new parameterTest();
-}