aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVincent Richard <[email protected]>2014-03-16 21:52:40 +0000
committerVincent Richard <[email protected]>2014-03-16 21:52:40 +0000
commit84e570bbbb1188d2bcd3f03ff519fbc9217e624a (patch)
tree392b7e600433ee3fecd0c13e4020754477b42241 /tests
parentModified IMAP parser constructor to make testing easier. (diff)
downloadvmime-84e570bbbb1188d2bcd3f03ff519fbc9217e624a.tar.gz
vmime-84e570bbbb1188d2bcd3f03ff519fbc9217e624a.zip
Connection trace facility.
Diffstat (limited to 'tests')
-rw-r--r--tests/net/smtp/SMTPCommandSetTest.cpp26
-rw-r--r--tests/net/smtp/SMTPCommandTest.cpp4
-rw-r--r--tests/net/smtp/SMTPResponseTest.cpp27
3 files changed, 37 insertions, 20 deletions
diff --git a/tests/net/smtp/SMTPCommandSetTest.cpp b/tests/net/smtp/SMTPCommandSetTest.cpp
index af250078..f419eb40 100644
--- a/tests/net/smtp/SMTPCommandSetTest.cpp
+++ b/tests/net/smtp/SMTPCommandSetTest.cpp
@@ -69,15 +69,16 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
VASSERT_NO_THROW("No throw 2", cset->addCommand(SMTPCommand::createCommand("MY_COMMAND2")));
VASSERT_EQ("Text", "MY_COMMAND1\r\nMY_COMMAND2\r\n", cset->getText());
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_FALSE("Finished", cset->isFinished());
// Can't add commands when writing to socket has started
VASSERT_THROW("Throw", cset->addCommand(SMTPCommand::createCommand("MY_COMMAND3")), std::runtime_error);
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_TRUE("Finished", cset->isFinished());
}
@@ -90,10 +91,11 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
VASSERT_NO_THROW("No throw 2", cset->addCommand(SMTPCommand::createCommand("MY_COMMAND2")));
VASSERT_EQ("Text", "MY_COMMAND1\r\nMY_COMMAND2\r\n", cset->getText());
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
vmime::string response;
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_TRUE("Finished", cset->isFinished());
sok->localReceive(response);
@@ -110,15 +112,16 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND1"));
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND2"));
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
vmime::string response;
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
sok->localReceive(response);
VASSERT_EQ("Receive cmd 1", "MY_COMMAND1\r\n", response);
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
sok->localReceive(response);
VASSERT_EQ("Receive cmd 2", "MY_COMMAND2\r\n", response);
@@ -131,10 +134,11 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND1"));
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND2"));
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
vmime::string response;
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
sok->localReceive(response);
VASSERT_EQ("Receive cmds", "MY_COMMAND1\r\nMY_COMMAND2\r\n", response);
@@ -147,12 +151,13 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND1"));
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND2"));
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_EQ("Cmd 1", "MY_COMMAND1", cset->getLastCommandSent()->getText());
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_EQ("Cmd 2", "MY_COMMAND2", cset->getLastCommandSent()->getText());
}
@@ -163,12 +168,13 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND1"));
cset->addCommand(SMTPCommand::createCommand("MY_COMMAND2"));
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_EQ("Cmd 1", "MY_COMMAND1", cset->getLastCommandSent()->getText());
- cset->writeToSocket(sok);
+ cset->writeToSocket(sok, tracer);
VASSERT_EQ("Cmd 2", "MY_COMMAND2", cset->getLastCommandSent()->getText());
}
diff --git a/tests/net/smtp/SMTPCommandTest.cpp b/tests/net/smtp/SMTPCommandTest.cpp
index 9480948c..9b3daa73 100644
--- a/tests/net/smtp/SMTPCommandTest.cpp
+++ b/tests/net/smtp/SMTPCommandTest.cpp
@@ -231,8 +231,10 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandTest)
{
vmime::shared_ptr <SMTPCommand> cmd = SMTPCommand::createCommand("MY_COMMAND param1 param2");
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> sok = vmime::make_shared <testSocket>();
- cmd->writeToSocket(sok);
+
+ cmd->writeToSocket(sok, tracer);
vmime::string response;
sok->localReceive(response);
diff --git a/tests/net/smtp/SMTPResponseTest.cpp b/tests/net/smtp/SMTPResponseTest.cpp
index 352f46c2..d47e31e9 100644
--- a/tests/net/smtp/SMTPResponseTest.cpp
+++ b/tests/net/smtp/SMTPResponseTest.cpp
@@ -43,6 +43,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testSingleLineResponse()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -52,7 +53,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 123, resp->getCode());
VASSERT_EQ("Lines", 1, resp->getLineCount());
@@ -61,6 +62,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testSingleLineResponseLF()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -70,7 +72,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 123, resp->getCode());
VASSERT_EQ("Lines", 1, resp->getLineCount());
@@ -79,6 +81,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testMultiLineResponse()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -92,7 +95,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 123, resp->getCode());
VASSERT_EQ("Lines", 2, resp->getLineCount());
@@ -107,6 +110,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testMultiLineResponseDifferentCode()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -120,7 +124,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 0, resp->getCode());
VASSERT_EQ("Lines", 2, resp->getLineCount());
@@ -135,6 +139,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testIncompleteMultiLineResponse()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>(1);
@@ -149,12 +154,13 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
VASSERT_THROW("Incomplete response",
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState),
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState),
vmime::exceptions::operation_timed_out);
}
void testNoResponseText()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>(1);
@@ -167,7 +173,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 250, resp->getCode());
VASSERT_EQ("Lines", 1, resp->getLineCount());
@@ -176,6 +182,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testEnhancedStatusCode()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -185,7 +192,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 250, resp->getCode());
VASSERT_EQ("Lines", 1, resp->getLineCount());
@@ -197,6 +204,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testNoEnhancedStatusCode()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -206,7 +214,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 354, resp->getCode());
VASSERT_EQ("Lines", 1, resp->getLineCount());
@@ -218,6 +226,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
void testInvalidEnhancedStatusCode()
{
+ vmime::shared_ptr <vmime::net::tracer> tracer;
vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>();
vmime::shared_ptr <vmime::net::timeoutHandler> toh =
vmime::make_shared <testTimeoutHandler>();
@@ -227,7 +236,7 @@ VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
vmime::net::smtp::SMTPResponse::state responseState;
vmime::shared_ptr <vmime::net::smtp::SMTPResponse> resp =
- vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState);
+ vmime::net::smtp::SMTPResponse::readResponse(tracer, socket, toh, responseState);
VASSERT_EQ("Code", 250, resp->getCode());
VASSERT_EQ("Lines", 1, resp->getLineCount());