From f9913fa28a27f23fde2d4956c62cbb2fb2bc2ee8 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 21 Nov 2013 22:16:57 +0100 Subject: Boost/C++11 shared pointers. --- .../seekableInputStreamRegionAdapterTest.cpp | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'tests/utility/seekableInputStreamRegionAdapterTest.cpp') diff --git a/tests/utility/seekableInputStreamRegionAdapterTest.cpp b/tests/utility/seekableInputStreamRegionAdapterTest.cpp index 3ed024e8..1c33c056 100644 --- a/tests/utility/seekableInputStreamRegionAdapterTest.cpp +++ b/tests/utility/seekableInputStreamRegionAdapterTest.cpp @@ -42,16 +42,16 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) VMIME_TEST_LIST_END - vmime::ref createStream - (vmime::ref * underlyingStream = NULL) + vmime::shared_ptr createStream + (vmime::shared_ptr * underlyingStream = NULL) { vmime::string buffer("THIS IS A TEST BUFFER"); - vmime::ref strStream = - vmime::create (buffer); + vmime::shared_ptr strStream = + vmime::make_shared (buffer); - vmime::ref rgnStream = - vmime::create (strStream, 10, 11); + vmime::shared_ptr rgnStream = + vmime::make_shared (strStream, 10, 11); if (underlyingStream) *underlyingStream = strStream; @@ -61,7 +61,7 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) void testInitialPosition() { - vmime::ref stream = createStream(); + vmime::shared_ptr stream = createStream(); VASSERT_EQ("Pos", 0, stream->getPosition()); VASSERT_FALSE("EOF", stream->eof()); @@ -69,7 +69,7 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) void testSeekAndGetPosition() { - vmime::ref stream = createStream(); + vmime::shared_ptr stream = createStream(); stream->seek(5); @@ -84,11 +84,12 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) void testRead() { - vmime::ref stream = createStream(); + vmime::shared_ptr stream = createStream(); stream->seek(5); stream::value_type buffer[100]; + std::fill(vmime::begin(buffer), vmime::end(buffer), 0); stream::size_type read = stream->read(buffer, 6); VASSERT_EQ("Pos", 11, stream->getPosition()); @@ -99,7 +100,7 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) void testSkip() { - vmime::ref stream = createStream(); + vmime::shared_ptr stream = createStream(); stream->skip(5); @@ -107,6 +108,7 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) VASSERT_FALSE("EOF 1", stream->eof()); stream::value_type buffer[100]; + std::fill(vmime::begin(buffer), vmime::end(buffer), 0); stream::size_type read = stream->read(buffer, 3); VASSERT_EQ("Pos 2", 8, stream->getPosition()); @@ -122,7 +124,7 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) void testReset() { - vmime::ref stream = createStream(); + vmime::shared_ptr stream = createStream(); stream->skip(100); stream->reset(); @@ -136,15 +138,17 @@ VMIME_TEST_SUITE_BEGIN(seekableInputStreamRegionAdapterTest) // seekableInputStreamRegionAdapter should keep track of its own position // in the underlying stream, and not be affected by possible seek/read // operations on it... - vmime::ref ustream; - vmime::ref stream = createStream(&ustream); + vmime::shared_ptr ustream; + vmime::shared_ptr stream = createStream(&ustream); stream->seek(5); stream::value_type buffer1[100]; + std::fill(vmime::begin(buffer1), vmime::end(buffer1), 0); stream::size_type read = ustream->read(buffer1, 7); stream::value_type buffer2[100]; + std::fill(vmime::begin(buffer2), vmime::end(buffer2), 0); stream::size_type read2 = stream->read(buffer2, 6); VASSERT_EQ("Buffer 1", "THIS IS", vmime::string(buffer1, 0, 7)); -- cgit v1.2.3