From 7fdcc31ab38dc623303edd6c7ddef5ffc17ef86a Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 11 Dec 2012 22:02:47 +0100 Subject: [PATCH] Fixed compilation issues in unit tests. --- tests/net/smtp/SMTPResponseTest.cpp | 28 ++++++++++++++++++++------- tests/testUtils.cpp | 30 ++++++++++++++++++++++++++--- tests/testUtils.hpp | 10 ++++++++-- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/tests/net/smtp/SMTPResponseTest.cpp b/tests/net/smtp/SMTPResponseTest.cpp index 4ad284fd..a0641480 100644 --- a/tests/net/smtp/SMTPResponseTest.cpp +++ b/tests/net/smtp/SMTPResponseTest.cpp @@ -51,8 +51,10 @@ VMIME_TEST_SUITE_BEGIN socket->localSend("123 Response Text\r\n"); + vmime::net::smtp::SMTPResponse::state responseState; + vmime::ref resp = - vmime::net::smtp::SMTPResponse::readResponse(socket, toh); + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState); VASSERT_EQ("Code", 123, resp->getCode()); VASSERT_EQ("Lines", 1, resp->getLineCount()); @@ -67,8 +69,10 @@ VMIME_TEST_SUITE_BEGIN socket->localSend("123 Response Text\n"); + vmime::net::smtp::SMTPResponse::state responseState; + vmime::ref resp = - vmime::net::smtp::SMTPResponse::readResponse(socket, toh); + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState); VASSERT_EQ("Code", 123, resp->getCode()); VASSERT_EQ("Lines", 1, resp->getLineCount()); @@ -87,8 +91,10 @@ VMIME_TEST_SUITE_BEGIN "123 Text\r\n" ); + vmime::net::smtp::SMTPResponse::state responseState; + vmime::ref resp = - vmime::net::smtp::SMTPResponse::readResponse(socket, toh); + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState); VASSERT_EQ("Code", 123, resp->getCode()); VASSERT_EQ("Lines", 2, resp->getLineCount()); @@ -113,8 +119,10 @@ VMIME_TEST_SUITE_BEGIN "456 Text\r\n" ); + vmime::net::smtp::SMTPResponse::state responseState; + vmime::ref resp = - vmime::net::smtp::SMTPResponse::readResponse(socket, toh); + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState); VASSERT_EQ("Code", 0, resp->getCode()); VASSERT_EQ("Lines", 2, resp->getLineCount()); @@ -140,8 +148,10 @@ VMIME_TEST_SUITE_BEGIN // Missing data ); + vmime::net::smtp::SMTPResponse::state responseState; + VASSERT_THROW("Incomplete response", - vmime::net::smtp::SMTPResponse::readResponse(socket, toh), + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState), vmime::exceptions::operation_timed_out); } @@ -157,8 +167,10 @@ VMIME_TEST_SUITE_BEGIN "More information\r\n" ); + vmime::net::smtp::SMTPResponse::state responseState; + vmime::ref resp = - vmime::net::smtp::SMTPResponse::readResponse(socket, toh); + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState); VASSERT_EQ("Code", 334, resp->getCode()); VASSERT_EQ("Lines", 1, resp->getLineCount()); @@ -176,8 +188,10 @@ VMIME_TEST_SUITE_BEGIN "250\r\n" ); + vmime::net::smtp::SMTPResponse::state responseState; + vmime::ref resp = - vmime::net::smtp::SMTPResponse::readResponse(socket, toh); + vmime::net::smtp::SMTPResponse::readResponse(socket, toh, responseState); VASSERT_EQ("Code", 250, resp->getCode()); VASSERT_EQ("Lines", 1, resp->getLineCount()); diff --git a/tests/testUtils.cpp b/tests/testUtils.cpp index 36455cff..8b16c4e8 100644 --- a/tests/testUtils.cpp +++ b/tests/testUtils.cpp @@ -57,6 +57,24 @@ testSocket::size_type testSocket::getBlockSize() const } +unsigned int testSocket::getStatus() const +{ + return 0; +} + + +const vmime::string testSocket::getPeerName() const +{ + return "test.vmime.org"; +} + + +const vmime::string testSocket::getPeerAddress() const +{ + return "127.0.0.1"; +} + + void testSocket::receive(vmime::string& buffer) { buffer = m_inBuffer; @@ -72,9 +90,9 @@ void testSocket::send(const vmime::string& buffer) } -int testSocket::receiveRaw(char* buffer, const int count) +testSocket::size_type testSocket::receiveRaw(char* buffer, const size_type count) { - const int n = std::min(count, static_cast (m_inBuffer.size())); + const size_type n = std::min(count, static_cast (m_inBuffer.size())); std::copy(m_inBuffer.begin(), m_inBuffer.begin() + n, buffer); m_inBuffer.erase(m_inBuffer.begin(), m_inBuffer.begin() + n); @@ -83,12 +101,18 @@ int testSocket::receiveRaw(char* buffer, const int count) } -void testSocket::sendRaw(const char* buffer, const int count) +void testSocket::sendRaw(const char* buffer, const size_type count) { send(vmime::string(buffer, count)); } +testSocket::size_type testSocket::sendRawNonBlocking(const char* buffer, const size_type count) +{ + sendRaw(buffer, count); +} + + void testSocket::localSend(const vmime::string& buffer) { m_inBuffer += buffer; diff --git a/tests/testUtils.hpp b/tests/testUtils.hpp index aee50dc7..34271f44 100644 --- a/tests/testUtils.hpp +++ b/tests/testUtils.hpp @@ -213,11 +213,17 @@ public: void receive(vmime::string& buffer); void send(const vmime::string& buffer); - int receiveRaw(char* buffer, const int count); - void sendRaw(const char* buffer, const int count); + size_type receiveRaw(char* buffer, const size_type count); + void sendRaw(const char* buffer, const size_type count); + size_type sendRawNonBlocking(const char* buffer, const size_type count); size_type getBlockSize() const; + unsigned int getStatus() const; + + const vmime::string getPeerName() const; + const vmime::string getPeerAddress() const; + /** Send data to client. * * @buffer data to send