initial/final commitHEADmaster

5 files changed, 709 insertions, 0 deletions

diff --git a/vmime-master/tests/net/pop3/POP3CommandTest.cpp b/vmime-master/tests/net/pop3/POP3CommandTest.cpp
new file mode 100644
index 0000000..3ed579e
--- /dev/null
+++ b/vmime-master/tests/net/pop3/POP3CommandTest.cpp
@@ -0,0 +1,241 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002 Vincent Richard <vincent@vmime.org>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "tests/net/pop3/POP3TestUtils.hpp"
+
+#include "vmime/net/pop3/POP3Command.hpp"
+
+
+using namespace vmime::net::pop3;
+
+
+VMIME_TEST_SUITE_BEGIN(POP3CommandTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testCreateCommand)
+		VMIME_TEST(testCreateCommandParams)
+		VMIME_TEST(testCAPA)
+		VMIME_TEST(testNOOP)
+		VMIME_TEST(testAUTH)
+		VMIME_TEST(testAUTH_InitialResponse)
+		VMIME_TEST(testSTLS)
+		VMIME_TEST(testAPOP)
+		VMIME_TEST(testUSER)
+		VMIME_TEST(testPASS)
+		VMIME_TEST(testSTAT)
+		VMIME_TEST(testLIST)
+		VMIME_TEST(testLISTMessage)
+		VMIME_TEST(testUIDL)
+		VMIME_TEST(testUIDLMessage)
+		VMIME_TEST(testDELE)
+		VMIME_TEST(testRETR)
+		VMIME_TEST(testTOP)
+		VMIME_TEST(testRSET)
+		VMIME_TEST(testQUIT)
+		VMIME_TEST(testWriteToSocket)
+	VMIME_TEST_LIST_END
+
+
+	void testCreateCommand() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::createCommand("MY_COMMAND");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "MY_COMMAND", cmd->getText());
+	}
+
+	void testCreateCommandParams() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::createCommand("MY_COMMAND param1 param2");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "MY_COMMAND param1 param2", cmd->getText());
+	}
+
+	void testCAPA() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::CAPA();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "CAPA", cmd->getText());
+	}
+
+	void testNOOP() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::NOOP();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "NOOP", cmd->getText());
+	}
+
+	void testAUTH() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::AUTH("saslmechanism");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "AUTH saslmechanism", cmd->getText());
+	}
+
+	void testAUTH_InitialResponse() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::AUTH("saslmechanism", "initial-response");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "AUTH saslmechanism initial-response", cmd->getText());
+	}
+
+	void testSTLS() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::STLS();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "STLS", cmd->getText());
+	}
+
+	void testAPOP() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::APOP("user", "digest");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "APOP user digest", cmd->getText());
+	}
+
+	void testUSER() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::USER("user");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "USER user", cmd->getText());
+	}
+
+	void testPASS() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::PASS("pass");
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "PASS pass", cmd->getText());
+	}
+
+	void testSTAT() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::STAT();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "STAT", cmd->getText());
+	}
+
+	void testLIST() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::LIST();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "LIST", cmd->getText());
+	}
+
+	void testLISTMessage() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::LIST(42);
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "LIST 42", cmd->getText());
+	}
+
+	void testUIDL() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::UIDL();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "UIDL", cmd->getText());
+	}
+
+	void testUIDLMessage() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::UIDL(42);
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "UIDL 42", cmd->getText());
+	}
+
+	void testDELE() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::DELE(42);
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "DELE 42", cmd->getText());
+	}
+
+	void testRETR() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::RETR(42);
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "RETR 42", cmd->getText());
+	}
+
+	void testTOP() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::TOP(42, 567);
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "TOP 42 567", cmd->getText());
+	}
+
+	void testRSET() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::RSET();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "RSET", cmd->getText());
+	}
+
+	void testQUIT() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::QUIT();
+
+		VASSERT_NOT_NULL("Not null", cmd);
+		VASSERT_EQ("Text", "QUIT", cmd->getText());
+	}
+
+	void testWriteToSocket() {
+
+		vmime::shared_ptr <POP3Command> cmd = POP3Command::createCommand("MY_COMMAND param1 param2");
+
+		vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(sok),
+				vmime::shared_ptr <vmime::net::timeoutHandler>()
+			);
+
+		cmd->send(conn);
+
+		vmime::string response;
+		sok->localReceive(response);
+
+		VASSERT_EQ("Sent buffer", "MY_COMMAND param1 param2\r\n", response);
+	}
+
+VMIME_TEST_SUITE_END
diff --git a/vmime-master/tests/net/pop3/POP3ResponseTest.cpp b/vmime-master/tests/net/pop3/POP3ResponseTest.cpp
new file mode 100644
index 0000000..8fecb74
--- /dev/null
+++ b/vmime-master/tests/net/pop3/POP3ResponseTest.cpp
@@ -0,0 +1,244 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002 Vincent Richard <vincent@vmime.org>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "tests/net/pop3/POP3TestUtils.hpp"
+
+#include "vmime/net/pop3/POP3Response.hpp"
+
+
+using namespace vmime::net::pop3;
+
+
+VMIME_TEST_SUITE_BEGIN(POP3ResponseTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testSingleLineResponseOK)
+		VMIME_TEST(testSingleLineResponseERR)
+		VMIME_TEST(testSingleLineResponseReady)
+		VMIME_TEST(testSingleLineResponseInvalid)
+		VMIME_TEST(testSingleLineResponseLF)
+		VMIME_TEST(testMultiLineResponse)
+		VMIME_TEST(testMultiLineResponseLF)
+		VMIME_TEST(testLargeResponse)
+	VMIME_TEST_LIST_END
+
+
+	void testSingleLineResponseOK() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+OK Response Text\r\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_OK, resp->getCode());
+		VASSERT_TRUE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 0, resp->getLineCount());
+		VASSERT_EQ("Text", "Response Text", resp->getText());
+		VASSERT_EQ("First Line", "+OK Response Text", resp->getFirstLine());
+	}
+
+	void testSingleLineResponseERR() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("-ERR Response Text\r\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_ERR, resp->getCode());
+		VASSERT_FALSE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 0, resp->getLineCount());
+		VASSERT_EQ("Text", "Response Text", resp->getText());
+		VASSERT_EQ("First Line", "-ERR Response Text", resp->getFirstLine());
+	}
+
+	void testSingleLineResponseReady() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+ challenge_string\r\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_READY, resp->getCode());
+		VASSERT_FALSE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 0, resp->getLineCount());
+		VASSERT_EQ("Text", "challenge_string", resp->getText());
+		VASSERT_EQ("First Line", "+ challenge_string", resp->getFirstLine());
+	}
+
+	void testSingleLineResponseInvalid() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn = vmime::make_shared <POP3ConnectionTest>
+			(vmime::dynamicCast <vmime::net::socket>(socket), toh);
+
+		socket->localSend("Invalid Response Text\r\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_ERR, resp->getCode());
+		VASSERT_FALSE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 0, resp->getLineCount());
+		VASSERT_EQ("Text", "Response Text", resp->getText());
+		VASSERT_EQ("First Line", "Invalid Response Text", resp->getFirstLine());
+	}
+
+	void testSingleLineResponseLF() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+OK Response terminated by LF\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_OK, resp->getCode());
+		VASSERT_TRUE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 0, resp->getLineCount());
+		VASSERT_EQ("Text", "Response terminated by LF", resp->getText());
+		VASSERT_EQ("First Line", "+OK Response terminated by LF", resp->getFirstLine());
+	}
+
+	void testMultiLineResponse() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+OK Response Text\r\n");
+		socket->localSend("Line 1\r\n");
+		socket->localSend("Line 2\r\n");
+		socket->localSend(".\r\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readMultilineResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_OK, resp->getCode());
+		VASSERT_TRUE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 2, resp->getLineCount());
+		VASSERT_EQ("Text", "Response Text", resp->getText());
+		VASSERT_EQ("First Line", "+OK Response Text", resp->getFirstLine());
+		VASSERT_EQ("Line 1", "Line 1", resp->getLineAt(0));
+		VASSERT_EQ("Line 2", "Line 2", resp->getLineAt(1));
+	}
+
+	void testMultiLineResponseLF() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+OK Response Text\n");
+		socket->localSend("Line 1\n");
+		socket->localSend("Line 2\n");
+		socket->localSend(".\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readMultilineResponse(conn);
+
+		VASSERT_EQ("Code", POP3Response::CODE_OK, resp->getCode());
+		VASSERT_TRUE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 2, resp->getLineCount());
+		VASSERT_EQ("Text", "Response Text", resp->getText());
+		VASSERT_EQ("First Line", "+OK Response Text", resp->getFirstLine());
+		VASSERT_EQ("Line 1", "Line 1", resp->getLineAt(0));
+		VASSERT_EQ("Line 2", "Line 2", resp->getLineAt(1));
+	}
+
+	void testLargeResponse() {
+
+		std::ostringstream data;
+
+		for (unsigned int i = 0 ; i < 5000 ; ++i) {
+			data << "VMIME.VMIME\nVMIME\r\nVMIME_VMIME";
+		}
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+OK Large Response Follows\n");
+		socket->localSend(data.str());
+		socket->localSend("\r\n.\r\n");
+
+		vmime::string receivedData;
+		vmime::utility::outputStreamStringAdapter receivedDataStream(receivedData);
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readLargeResponse(conn, receivedDataStream, NULL, 0);
+
+		VASSERT_EQ("Code", POP3Response::CODE_OK, resp->getCode());
+		VASSERT_TRUE("Success", resp->isSuccess());
+		VASSERT_EQ("Lines", 0, resp->getLineCount());
+		VASSERT_EQ("Text", "Large Response Follows", resp->getText());
+		VASSERT_EQ("Data Length", data.str().length(), receivedData.length());
+		VASSERT_EQ("Data Bytes", data.str(), receivedData);
+	}
+
+VMIME_TEST_SUITE_END
diff --git a/vmime-master/tests/net/pop3/POP3StoreTest.cpp b/vmime-master/tests/net/pop3/POP3StoreTest.cpp
new file mode 100644
index 0000000..5d9e3c2
--- /dev/null
+++ b/vmime-master/tests/net/pop3/POP3StoreTest.cpp
@@ -0,0 +1,67 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002 Vincent Richard <vincent@vmime.org>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "tests/net/pop3/POP3TestUtils.hpp"
+
+#include "vmime/net/pop3/POP3Store.hpp"
+#include "vmime/net/pop3/POP3SStore.hpp"
+
+
+VMIME_TEST_SUITE_BEGIN(POP3StoreTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testCreateFromURL)
+		VMIME_TEST(testConnectToInvalidServer)
+	VMIME_TEST_LIST_END
+
+
+	void testCreateFromURL() {
+
+		vmime::shared_ptr <vmime::net::session> sess = vmime::net::session::create();
+
+		// POP3
+		vmime::utility::url url("pop3://pop3.vmime.org");
+		vmime::shared_ptr <vmime::net::store> store = sess->getStore(url);
+
+		VASSERT_TRUE("pop3", typeid(*store) == typeid(vmime::net::pop3::POP3Store));
+
+		// POP3S
+		vmime::utility::url url2("pop3s://pop3s.vmime.org");
+		vmime::shared_ptr <vmime::net::store> store2 = sess->getStore(url2);
+
+		VASSERT_TRUE("pop3s", typeid(*store2) == typeid(vmime::net::pop3::POP3SStore));
+	}
+
+	void testConnectToInvalidServer() {
+
+		vmime::shared_ptr <vmime::net::session> sess = vmime::net::session::create();
+
+		vmime::utility::url url("pop3://invalid-pop3-server");
+		vmime::shared_ptr <vmime::net::store> store = sess->getStore(url);
+
+		VASSERT_THROW("connect", store->connect(), vmime::exceptions::connection_error);
+	}
+
+VMIME_TEST_SUITE_END
diff --git a/vmime-master/tests/net/pop3/POP3TestUtils.hpp b/vmime-master/tests/net/pop3/POP3TestUtils.hpp
new file mode 100644
index 0000000..24efb8b
--- /dev/null
+++ b/vmime-master/tests/net/pop3/POP3TestUtils.hpp
@@ -0,0 +1,69 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002 Vincent Richard <vincent@vmime.org>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "vmime/net/pop3/POP3Connection.hpp"
+#include "vmime/net/pop3/POP3Store.hpp"
+
+
+class POP3TestStore : public vmime::net::pop3::POP3Store {
+
+public:
+
+	POP3TestStore()
+		: POP3Store(vmime::net::session::create(),
+		            vmime::shared_ptr <vmime::security::authenticator>()) {
+
+	}
+};
+
+
+class POP3ConnectionTest : public vmime::net::pop3::POP3Connection {
+
+public:
+
+	POP3ConnectionTest(
+		vmime::shared_ptr <vmime::net::socket> socket,
+		vmime::shared_ptr <vmime::net::timeoutHandler> timeoutHandler
+	)
+		: POP3Connection(vmime::make_shared <POP3TestStore>(),
+		                 vmime::shared_ptr <vmime::security::authenticator>()),
+		  m_socket(socket),
+		  m_timeoutHandler(timeoutHandler) {
+
+	}
+
+	vmime::shared_ptr <vmime::net::socket> getSocket() {
+
+		return m_socket;
+	}
+
+	vmime::shared_ptr <vmime::net::timeoutHandler> getTimeoutHandler() {
+
+		return m_timeoutHandler;
+	}
+
+private:
+
+	vmime::shared_ptr <vmime::net::socket> m_socket;
+	vmime::shared_ptr <vmime::net::timeoutHandler> m_timeoutHandler;
+};
diff --git a/vmime-master/tests/net/pop3/POP3UtilsTest.cpp b/vmime-master/tests/net/pop3/POP3UtilsTest.cpp
new file mode 100644
index 0000000..1cded39
--- /dev/null
+++ b/vmime-master/tests/net/pop3/POP3UtilsTest.cpp
@@ -0,0 +1,88 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002 Vincent Richard <vincent@vmime.org>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "tests/net/pop3/POP3TestUtils.hpp"
+
+#include "vmime/net/pop3/POP3Utils.hpp"
+#include "vmime/net/pop3/POP3Response.hpp"
+
+
+using namespace vmime::net::pop3;
+
+
+VMIME_TEST_SUITE_BEGIN(POP3UtilsTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testParseMultiListOrUidlResponse)
+		VMIME_TEST(testMessageSetToNumberList)
+	VMIME_TEST_LIST_END
+
+
+	void testParseMultiListOrUidlResponse() {
+
+		vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
+		vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>();
+
+		vmime::shared_ptr <POP3ConnectionTest> conn =
+			vmime::make_shared <POP3ConnectionTest>(
+				vmime::dynamicCast <vmime::net::socket>(socket), toh
+			);
+
+		socket->localSend("+OK Response Text\r\n");
+		socket->localSend("1 abcdef\r\n");
+		socket->localSend("23    ghijkl\r\n");
+		socket->localSend("4\tmnopqr\r\n");
+		socket->localSend("567xx\tstuvwx\r\n");
+		socket->localSend("8 yz   \r\n");
+		socket->localSend(".\r\n");
+
+		vmime::shared_ptr <POP3Response> resp =
+			POP3Response::readMultilineResponse(conn);
+
+		std::map <vmime::size_t, vmime::string> result;
+		POP3Utils::parseMultiListOrUidlResponse(resp, result);
+
+		VASSERT_EQ("Count", 5, result.size());
+		VASSERT_EQ("1", "abcdef", result[1]);
+		VASSERT_EQ("2 (multiple spaces)", "ghijkl", result[23]);
+		VASSERT_EQ("3 (with tab)", "mnopqr", result[4]);
+		VASSERT_EQ("4 (with invalid digit)", "stuvwx", result[567]);
+		VASSERT_EQ("5 (with extra space)", "yz", result[8]);
+	}
+
+	void testMessageSetToNumberList() {
+
+		const std::vector <size_t> msgNums = POP3Utils::messageSetToNumberList(
+			vmime::net::messageSet::byNumber(5, -1), /* msgCount */ 8
+		);
+
+		VASSERT_EQ("Count", 4, msgNums.size());
+		VASSERT_EQ("1", 5, msgNums[0]);
+		VASSERT_EQ("2", 6, msgNums[1]);
+		VASSERT_EQ("3", 7, msgNums[2]);
+		VASSERT_EQ("4", 8, msgNums[3]);
+	}
+
+VMIME_TEST_SUITE_END