Moved to CppUnit for unit tests framework.

1 files changed, 113 insertions, 128 deletions

diff --git a/tests/utility/stringProxyTest.cpp b/tests/utility/stringProxyTest.cpp
index 8c719920..b4803e82 100644
--- a/tests/utility/stringProxyTest.cpp
+++ b/tests/utility/stringProxyTest.cpp
@@ -17,189 +17,174 @@
 // 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         stringProxyTest
+#define VMIME_TEST_SUITE_MODULE  "Utility"
 
-using namespace unitpp;
 
+VMIME_TEST_SUITE_BEGIN
 
-namespace
-{
-	class stringProxyTest : public suite
-	{
-		void testConstruct()
-		{
-			vmime::utility::stringProxy s;
-
-			assert_eq("1", static_cast <vmime::utility::stringProxy::size_type>(0), s.length());
-			assert_eq("2", static_cast <vmime::utility::stringProxy::size_type>(0), s.start());
-			assert_eq("3", static_cast <vmime::utility::stringProxy::size_type>(0), s.end());
-		}
-
-		void testConstruct2()
-		{
-			vmime::string str("This is a test string.");
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testConstruct)
+		VMIME_TEST(testConstruct2)
 
-			vmime::utility::stringProxy s1(str);
+		VMIME_TEST(testDetach)
 
-			assert_eq("1", str.length(), s1.length());
-			assert_eq("2", static_cast <vmime::utility::stringProxy::size_type>(0), s1.start());
-			assert_eq("3", str.length(), s1.end());
+		VMIME_TEST(testSet)
 
-			vmime::utility::stringProxy s2(str, 10);
+		VMIME_TEST(testExtract)
 
-			assert_eq("4", str.length() - 10, s2.length());
-			assert_eq("5", static_cast <vmime::utility::stringProxy::size_type>(10), s2.start());
-			assert_eq("6", str.length(), s2.end());
+		VMIME_TEST(testOperatorLTLT1)
+		VMIME_TEST(testOperatorLTLT2)
+	VMIME_TEST_LIST_END
 
-			vmime::utility::stringProxy s3(str, 10, 14);
 
-			assert_eq("7", static_cast <vmime::utility::stringProxy::size_type>(4), s3.length());
-			assert_eq("8", static_cast <vmime::utility::stringProxy::size_type>(10), s3.start());
-			assert_eq("9", static_cast <vmime::utility::stringProxy::size_type>(14), s3.end());
+	void testConstruct()
+	{
+		vmime::utility::stringProxy s;
 
-			assert_eq("10", 't', *s3.it_begin());
-			assert_eq("11", 'e', *(s3.it_begin() + 1));
-			assert_eq("12", 's', *(s3.it_begin() + 2));
-			assert_eq("13", 't', *(s3.it_begin() + 3));
-		}
+		VASSERT_EQ("1", static_cast <vmime::utility::stringProxy::size_type>(0), s.length());
+		VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s.start());
+		VASSERT_EQ("3", static_cast <vmime::utility::stringProxy::size_type>(0), s.end());
+	}
 
-		void testDetach()
-		{
-			vmime::utility::stringProxy s;
-			s = "foo";
+	void testConstruct2()
+	{
+		vmime::string str("This is a test string.");
 
-			s.detach();
+		vmime::utility::stringProxy s1(str);
 
-			assert_eq("1", static_cast <vmime::utility::stringProxy::size_type>(0), s.length());
-			assert_eq("2", static_cast <vmime::utility::stringProxy::size_type>(0), s.start());
-			assert_eq("3", static_cast <vmime::utility::stringProxy::size_type>(0), s.end());
-		}
+		VASSERT_EQ("1", str.length(), s1.length());
+		VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s1.start());
+		VASSERT_EQ("3", str.length(), s1.end());
 
-		void testSet()
-		{
-			vmime::string str("This is a test string.");
+		vmime::utility::stringProxy s2(str, 10);
 
-			vmime::utility::stringProxy s1;
-			s1.set(str);
+		VASSERT_EQ("4", str.length() - 10, s2.length());
+		VASSERT_EQ("5", static_cast <vmime::utility::stringProxy::size_type>(10), s2.start());
+		VASSERT_EQ("6", str.length(), s2.end());
 
-			assert_eq("1", str.length(), s1.length());
-			assert_eq("2", static_cast <vmime::utility::stringProxy::size_type>(0), s1.start());
-			assert_eq("3", str.length(), s1.end());
+		vmime::utility::stringProxy s3(str, 10, 14);
 
-			vmime::utility::stringProxy s2;
-			s2.set(str, 10);
+		VASSERT_EQ("7", static_cast <vmime::utility::stringProxy::size_type>(4), s3.length());
+		VASSERT_EQ("8", static_cast <vmime::utility::stringProxy::size_type>(10), s3.start());
+		VASSERT_EQ("9", static_cast <vmime::utility::stringProxy::size_type>(14), s3.end());
 
-			assert_eq("4", str.length() - 10, s2.length());
-			assert_eq("5", static_cast <vmime::utility::stringProxy::size_type>(10), s2.start());
-			assert_eq("6", str.length(), s2.end());
+		VASSERT_EQ("10", 't', *s3.it_begin());
+		VASSERT_EQ("11", 'e', *(s3.it_begin() + 1));
+		VASSERT_EQ("12", 's', *(s3.it_begin() + 2));
+		VASSERT_EQ("13", 't', *(s3.it_begin() + 3));
+	}
 
-			vmime::utility::stringProxy s3;
-			s3.set(str, 10, 14);
+	void testDetach()
+	{
+		vmime::utility::stringProxy s;
+		s = "foo";
 
-			assert_eq("7", static_cast <vmime::utility::stringProxy::size_type>(4), s3.length());
-			assert_eq("8", static_cast <vmime::utility::stringProxy::size_type>(10), s3.start());
-			assert_eq("9", static_cast <vmime::utility::stringProxy::size_type>(14), s3.end());
+		s.detach();
 
-			assert_eq("10", 't', *s3.it_begin());
-			assert_eq("11", 'e', *(s3.it_begin() + 1));
-			assert_eq("12", 's', *(s3.it_begin() + 2));
-			assert_eq("13", 't', *(s3.it_begin() + 3));
-		}
+		VASSERT_EQ("1", static_cast <vmime::utility::stringProxy::size_type>(0), s.length());
+		VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s.start());
+		VASSERT_EQ("3", static_cast <vmime::utility::stringProxy::size_type>(0), s.end());
+	}
 
-		void testExtract()
-		{
-			vmime::string str("This is a test string.");
+	void testSet()
+	{
+		vmime::string str("This is a test string.");
 
-			vmime::utility::stringProxy s1(str, 10, 14);
+		vmime::utility::stringProxy s1;
+		s1.set(str);
 
-			std::ostringstream oss1;
-			vmime::utility::outputStreamAdapter osa1(oss1);
+		VASSERT_EQ("1", str.length(), s1.length());
+		VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s1.start());
+		VASSERT_EQ("3", str.length(), s1.end());
 
-			s1.extract(osa1);
+		vmime::utility::stringProxy s2;
+		s2.set(str, 10);
 
-			assert_eq("1", "test", oss1.str());
+		VASSERT_EQ("4", str.length() - 10, s2.length());
+		VASSERT_EQ("5", static_cast <vmime::utility::stringProxy::size_type>(10), s2.start());
+		VASSERT_EQ("6", str.length(), s2.end());
 
-			vmime::utility::stringProxy s2(str);
+		vmime::utility::stringProxy s3;
+		s3.set(str, 10, 14);
 
-			std::ostringstream oss2;
-			vmime::utility::outputStreamAdapter osa2(oss2);
+		VASSERT_EQ("7", static_cast <vmime::utility::stringProxy::size_type>(4), s3.length());
+		VASSERT_EQ("8", static_cast <vmime::utility::stringProxy::size_type>(10), s3.start());
+		VASSERT_EQ("9", static_cast <vmime::utility::stringProxy::size_type>(14), s3.end());
 
-			s2.extract(osa2);
+		VASSERT_EQ("10", 't', *s3.it_begin());
+		VASSERT_EQ("11", 'e', *(s3.it_begin() + 1));
+		VASSERT_EQ("12", 's', *(s3.it_begin() + 2));
+		VASSERT_EQ("13", 't', *(s3.it_begin() + 3));
+	}
 
-			assert_eq("2", str, oss2.str());
-		}
+	void testExtract()
+	{
+		vmime::string str("This is a test string.");
 
-		void testOperatorLTLT1()
-		{
-			vmime::string str("This is a test string.");
+		vmime::utility::stringProxy s1(str, 10, 14);
 
-			vmime::utility::stringProxy s1(str, 10, 14);
+		std::ostringstream oss1;
+		vmime::utility::outputStreamAdapter osa1(oss1);
 
-			std::ostringstream oss1;
-			oss1 << s1;
+		s1.extract(osa1);
 
-			assert_eq("1", "test", oss1.str());
+		VASSERT_EQ("1", "test", oss1.str());
 
-			vmime::utility::stringProxy s2(str);
+		vmime::utility::stringProxy s2(str);
 
-			std::ostringstream oss2;
-			oss2 << s2;
+		std::ostringstream oss2;
+		vmime::utility::outputStreamAdapter osa2(oss2);
 
-			assert_eq("2", str, oss2.str());
-		}
+		s2.extract(osa2);
 
-		void testOperatorLTLT2()
-		{
-			vmime::string str("This is a test string.");
+		VASSERT_EQ("2", str, oss2.str());
+	}
 
-			vmime::utility::stringProxy s1(str, 10, 14);
+	void testOperatorLTLT1()
+	{
+		vmime::string str("This is a test string.");
 
-			std::ostringstream oss1;
-			vmime::utility::outputStreamAdapter osa1(oss1);
+		vmime::utility::stringProxy s1(str, 10, 14);
 
-			osa1 << s1;
+		std::ostringstream oss1;
+		oss1 << s1;
 
-			assert_eq("1", "test", oss1.str());
+		VASSERT_EQ("1", "test", oss1.str());
 
-			vmime::utility::stringProxy s2(str);
+		vmime::utility::stringProxy s2(str);
 
-			std::ostringstream oss2;
-			vmime::utility::outputStreamAdapter osa2(oss2);
+		std::ostringstream oss2;
+		oss2 << s2;
 
-			osa2 << s2;
+		VASSERT_EQ("2", str, oss2.str());
+	}
 
-			assert_eq("2", str, oss2.str());
-		}
+	void testOperatorLTLT2()
+	{
+		vmime::string str("This is a test string.");
 
-	public:
+		vmime::utility::stringProxy s1(str, 10, 14);
 
-		stringProxyTest() : suite("vmime::utility::stringProxy")
-		{
-			// VMime initialization
-			vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>();
+		std::ostringstream oss1;
+		vmime::utility::outputStreamAdapter osa1(oss1);
 
-			add("Construct", testcase(this, "Construct", &stringProxyTest::testConstruct));
-			add("Construct2", testcase(this, "Construct2", &stringProxyTest::testConstruct2));
+		osa1 << s1;
 
-			add("Detach", testcase(this, "Detach", &stringProxyTest::testDetach));
+		VASSERT_EQ("1", "test", oss1.str());
 
-			add("Set", testcase(this, "Set", &stringProxyTest::testSet));
+		vmime::utility::stringProxy s2(str);
 
-			add("Extract", testcase(this, "Extract", &stringProxyTest::testExtract));
+		std::ostringstream oss2;
+		vmime::utility::outputStreamAdapter osa2(oss2);
 
-			add("Operator<<(1)", testcase(this, "Operator<<(1)", &stringProxyTest::testOperatorLTLT1));
-			add("Operator<<(2)", testcase(this, "Operator<<(2)", &stringProxyTest::testOperatorLTLT2));
+		osa2 << s2;
 
-			suite::main().add("vmime::utility::stringProxy", this);
-		}
+		VASSERT_EQ("2", str, oss2.str());
+	}
 
-	};
+VMIME_TEST_SUITE_END
 
-	stringProxyTest* theTest = new stringProxyTest();
-}