aboutsummaryrefslogtreecommitdiffstats
path: root/tests/parser
diff options
context:
space:
mode:
authorVincent Richard <[email protected]>2013-12-10 08:52:51 +0100
committerVincent Richard <[email protected]>2013-12-10 08:52:51 +0100
commit7e265b05f440ed81b80f2de496c9d13221a69fe0 (patch)
treed4dad210715ea9d60b2136bd416647d4bc02166a /tests/parser
parentEnforce strict aliasing rule and avoid alignment issues. (diff)
downloadvmime-7e265b05f440ed81b80f2de496c9d13221a69fe0.tar.gz
vmime-7e265b05f440ed81b80f2de496c9d13221a69fe0.zip
Simplified types for better readability. Use appropriate types (size_t, byte_t...). Minor warning fixes.
Diffstat (limited to 'tests/parser')
-rw-r--r--tests/parser/charsetFilteredOutputStreamTest.cpp6
-rw-r--r--tests/parser/charsetTestSuites.hpp2
-rw-r--r--tests/parser/messageTest.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/parser/charsetFilteredOutputStreamTest.cpp b/tests/parser/charsetFilteredOutputStreamTest.cpp
index 4c91a71c..9b8397a8 100644
--- a/tests/parser/charsetFilteredOutputStreamTest.cpp
+++ b/tests/parser/charsetFilteredOutputStreamTest.cpp
@@ -85,7 +85,7 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest)
vmime::utility::inputStreamStringAdapter is(in);
- vmime::utility::stream::value_type buffer[16];
+ vmime::byte_t buffer[16];
for (int i = 0 ; !is.eof() ; ++i)
os->write(buffer, is.read(buffer, 1));
@@ -161,7 +161,7 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest)
vmime::utility::inputStreamStringAdapter is(in);
- vmime::utility::stream::value_type buffer[16];
+ vmime::byte_t buffer[16];
for (int i = 0 ; !is.eof() ; ++i)
os->write(buffer, is.read(buffer, 1));
@@ -201,7 +201,7 @@ VMIME_TEST_SUITE_BEGIN(charsetFilteredOutputStreamTest)
vmime::utility::inputStreamStringAdapter is(in);
- vmime::utility::stream::value_type buffer[16];
+ vmime::byte_t buffer[16];
for (int i = 0 ; !is.eof() ; ++i)
os->write(buffer, is.read(buffer, (i % 5) + 1));
diff --git a/tests/parser/charsetTestSuites.hpp b/tests/parser/charsetTestSuites.hpp
index b12b3e37..cb10e29e 100644
--- a/tests/parser/charsetTestSuites.hpp
+++ b/tests/parser/charsetTestSuites.hpp
@@ -100,4 +100,4 @@ static const charsetTestSuiteStruct charsetTestSuites[] =
};
-static const unsigned int charsetTestSuitesCount = sizeof(charsetTestSuites) / sizeof(charsetTestSuites[0]);
+static const vmime::size_t charsetTestSuitesCount = sizeof(charsetTestSuites) / sizeof(charsetTestSuites[0]);
diff --git a/tests/parser/messageTest.cpp b/tests/parser/messageTest.cpp
index a7a16813..3891b47e 100644
--- a/tests/parser/messageTest.cpp
+++ b/tests/parser/messageTest.cpp
@@ -44,8 +44,8 @@ VMIME_TEST_SUITE_BEGIN(messageTest)
textPart.generateIn(msg, msg);
// Estimated/computed generated size must be greater than the actual generated size
- const unsigned long genSize = msg->getGeneratedSize(ctx);
- const unsigned long actualSize = msg->generate().length();
+ const vmime::size_t genSize = msg->getGeneratedSize(ctx);
+ const vmime::size_t actualSize = msg->generate().length();
std::ostringstream oss;
oss << "estimated size (" << genSize << ") >= actual size (" << actualSize << ")";