diff options
| author | Vincent Richard <[email protected]> | 2013-12-10 07:52:51 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2013-12-10 07:52:51 +0000 |
| commit | 7e265b05f440ed81b80f2de496c9d13221a69fe0 (patch) | |
| tree | d4dad210715ea9d60b2136bd416647d4bc02166a /tests/utility/stringProxyTest.cpp | |
| parent | Enforce strict aliasing rule and avoid alignment issues. (diff) | |
| download | vmime-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/utility/stringProxyTest.cpp')
| -rw-r--r-- | tests/utility/stringProxyTest.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/utility/stringProxyTest.cpp b/tests/utility/stringProxyTest.cpp index 0d888f6a..d6513681 100644 --- a/tests/utility/stringProxyTest.cpp +++ b/tests/utility/stringProxyTest.cpp @@ -45,9 +45,9 @@ VMIME_TEST_SUITE_BEGIN(stringProxyTest) { vmime::utility::stringProxy s; - VASSERT_EQ("1", static_cast <vmime::utility::stringProxy::size_type>(0), s.length()); - VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s.start()); - VASSERT_EQ("3", static_cast <vmime::utility::stringProxy::size_type>(0), s.end()); + VASSERT_EQ("1", static_cast <vmime::size_t>(0), s.length()); + VASSERT_EQ("2", static_cast <vmime::size_t>(0), s.start()); + VASSERT_EQ("3", static_cast <vmime::size_t>(0), s.end()); } void testConstruct2() @@ -57,20 +57,20 @@ VMIME_TEST_SUITE_BEGIN(stringProxyTest) vmime::utility::stringProxy s1(str); VASSERT_EQ("1", str.length(), s1.length()); - VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s1.start()); + VASSERT_EQ("2", static_cast <vmime::size_t>(0), s1.start()); VASSERT_EQ("3", str.length(), s1.end()); vmime::utility::stringProxy s2(str, 10); VASSERT_EQ("4", str.length() - 10, s2.length()); - VASSERT_EQ("5", static_cast <vmime::utility::stringProxy::size_type>(10), s2.start()); + VASSERT_EQ("5", static_cast <vmime::size_t>(10), s2.start()); VASSERT_EQ("6", str.length(), s2.end()); vmime::utility::stringProxy s3(str, 10, 14); - VASSERT_EQ("7", static_cast <vmime::utility::stringProxy::size_type>(4), s3.length()); - VASSERT_EQ("8", static_cast <vmime::utility::stringProxy::size_type>(10), s3.start()); - VASSERT_EQ("9", static_cast <vmime::utility::stringProxy::size_type>(14), s3.end()); + VASSERT_EQ("7", static_cast <vmime::size_t>(4), s3.length()); + VASSERT_EQ("8", static_cast <vmime::size_t>(10), s3.start()); + VASSERT_EQ("9", static_cast <vmime::size_t>(14), s3.end()); VASSERT_EQ("10", 't', *s3.it_begin()); VASSERT_EQ("11", 'e', *(s3.it_begin() + 1)); @@ -85,9 +85,9 @@ VMIME_TEST_SUITE_BEGIN(stringProxyTest) s.detach(); - VASSERT_EQ("1", static_cast <vmime::utility::stringProxy::size_type>(0), s.length()); - VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s.start()); - VASSERT_EQ("3", static_cast <vmime::utility::stringProxy::size_type>(0), s.end()); + VASSERT_EQ("1", static_cast <vmime::size_t>(0), s.length()); + VASSERT_EQ("2", static_cast <vmime::size_t>(0), s.start()); + VASSERT_EQ("3", static_cast <vmime::size_t>(0), s.end()); } void testSet() @@ -98,22 +98,22 @@ VMIME_TEST_SUITE_BEGIN(stringProxyTest) s1.set(str); VASSERT_EQ("1", str.length(), s1.length()); - VASSERT_EQ("2", static_cast <vmime::utility::stringProxy::size_type>(0), s1.start()); + VASSERT_EQ("2", static_cast <vmime::size_t>(0), s1.start()); VASSERT_EQ("3", str.length(), s1.end()); vmime::utility::stringProxy s2; s2.set(str, 10); VASSERT_EQ("4", str.length() - 10, s2.length()); - VASSERT_EQ("5", static_cast <vmime::utility::stringProxy::size_type>(10), s2.start()); + VASSERT_EQ("5", static_cast <vmime::size_t>(10), s2.start()); VASSERT_EQ("6", str.length(), s2.end()); vmime::utility::stringProxy s3; s3.set(str, 10, 14); - VASSERT_EQ("7", static_cast <vmime::utility::stringProxy::size_type>(4), s3.length()); - VASSERT_EQ("8", static_cast <vmime::utility::stringProxy::size_type>(10), s3.start()); - VASSERT_EQ("9", static_cast <vmime::utility::stringProxy::size_type>(14), s3.end()); + VASSERT_EQ("7", static_cast <vmime::size_t>(4), s3.length()); + VASSERT_EQ("8", static_cast <vmime::size_t>(10), s3.start()); + VASSERT_EQ("9", static_cast <vmime::size_t>(14), s3.end()); VASSERT_EQ("10", 't', *s3.it_begin()); VASSERT_EQ("11", 'e', *(s3.it_begin() + 1)); |