aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/testRunner.cpp2
-rw-r--r--tests/testUtils.cpp10
-rw-r--r--tests/testUtils.hpp10
-rw-r--r--tests/utility/filteredStreamTest.cpp6
-rw-r--r--tests/utility/smartPtrTest.cpp4
-rw-r--r--tests/utility/urlTest.cpp2
6 files changed, 17 insertions, 17 deletions
diff --git a/tests/testRunner.cpp b/tests/testRunner.cpp
index e2930372..e286a10d 100644
--- a/tests/testRunner.cpp
+++ b/tests/testRunner.cpp
@@ -56,7 +56,7 @@ public:
gettimeofday(&m_start, &tz);
}
- const double getDuration() const
+ double getDuration() const
{
struct timeval tv;
struct timezone tz;
diff --git a/tests/testUtils.cpp b/tests/testUtils.cpp
index a774068d..0fa816c9 100644
--- a/tests/testUtils.cpp
+++ b/tests/testUtils.cpp
@@ -45,7 +45,7 @@ void testSocket::disconnect()
}
-const bool testSocket::isConnected() const
+bool testSocket::isConnected() const
{
return m_connected;
}
@@ -66,7 +66,7 @@ void testSocket::send(const vmime::string& buffer)
}
-const int testSocket::receiveRaw(char* buffer, const int count)
+int testSocket::receiveRaw(char* buffer, const int count)
{
const int n = std::min(count, static_cast <int>(m_inBuffer.size()));
@@ -142,7 +142,7 @@ const vmime::string lineBasedTestSocket::getNextLine()
return line;
}
-const bool lineBasedTestSocket::haveMoreLines() const
+bool lineBasedTestSocket::haveMoreLines() const
{
return !m_lines.empty();
}
@@ -156,7 +156,7 @@ testTimeoutHandler::testTimeoutHandler(const unsigned int delay)
}
-const bool testTimeoutHandler::isTimeOut()
+bool testTimeoutHandler::isTimeOut()
{
return (vmime::platform::getHandler()->getUnixTime() - m_start) >= m_delay;
}
@@ -168,7 +168,7 @@ void testTimeoutHandler::resetTimeOut()
}
-const bool testTimeoutHandler::handleTimeOut()
+bool testTimeoutHandler::handleTimeOut()
{
return false;
}
diff --git a/tests/testUtils.hpp b/tests/testUtils.hpp
index c2185a08..42e88795 100644
--- a/tests/testUtils.hpp
+++ b/tests/testUtils.hpp
@@ -208,12 +208,12 @@ public:
void connect(const vmime::string& address, const vmime::port_t port);
void disconnect();
- const bool isConnected() const;
+ bool isConnected() const;
void receive(vmime::string& buffer);
void send(const vmime::string& buffer);
- const int receiveRaw(char* buffer, const int count);
+ int receiveRaw(char* buffer, const int count);
void sendRaw(const char* buffer, const int count);
/** Send data to client.
@@ -268,7 +268,7 @@ public:
void onDataReceived();
const vmime::string getNextLine();
- const bool haveMoreLines() const;
+ bool haveMoreLines() const;
virtual void processCommand() = 0;
@@ -285,9 +285,9 @@ public:
testTimeoutHandler(const unsigned int delay = 3);
- const bool isTimeOut();
+ bool isTimeOut();
void resetTimeOut();
- const bool handleTimeOut();
+ bool handleTimeOut();
private:
diff --git a/tests/utility/filteredStreamTest.cpp b/tests/utility/filteredStreamTest.cpp
index 1926d9bb..bcc785e3 100644
--- a/tests/utility/filteredStreamTest.cpp
+++ b/tests/utility/filteredStreamTest.cpp
@@ -55,10 +55,10 @@ VMIME_TEST_SUITE_BEGIN
void addChunk(const std::string& chunk) { m_chunks.push_back(chunk); }
- const bool eof() const { return (m_index >= m_chunks.size()); }
+ bool eof() const { return (m_index >= m_chunks.size()); }
void reset() { m_index = 0; }
- const size_type read(value_type* const data, const size_type /* count */)
+ size_type read(value_type* const data, const size_type /* count */)
{
if (eof())
return 0;
@@ -74,7 +74,7 @@ VMIME_TEST_SUITE_BEGIN
return chunk.length();
}
- const size_type skip(const size_type /* count */)
+ size_type skip(const size_type /* count */)
{
// Not supported
return 0;
diff --git a/tests/utility/smartPtrTest.cpp b/tests/utility/smartPtrTest.cpp
index 68e5ff04..ce0b941f 100644
--- a/tests/utility/smartPtrTest.cpp
+++ b/tests/utility/smartPtrTest.cpp
@@ -44,8 +44,8 @@ VMIME_TEST_SUITE_BEGIN
struct A : public vmime::object
{
- const int strongCount() const { return getRefManager()->getStrongRefCount(); }
- const int weakCount() const { return getRefManager()->getWeakRefCount(); }
+ int strongCount() const { return getRefManager()->getStrongRefCount(); }
+ int weakCount() const { return getRefManager()->getWeakRefCount(); }
};
struct B : public virtual A { };
diff --git a/tests/utility/urlTest.cpp b/tests/utility/urlTest.cpp
index b5a38a95..245657a1 100644
--- a/tests/utility/urlTest.cpp
+++ b/tests/utility/urlTest.cpp
@@ -48,7 +48,7 @@ VMIME_TEST_SUITE_BEGIN
VMIME_TEST_LIST_END
- static const bool parseHelper(vmime::utility::url& u, const vmime::string& str)
+ static bool parseHelper(vmime::utility::url& u, const vmime::string& str)
{
try
{