diff options
Diffstat (limited to 'tests/FrontBufferedStreamTest.cpp')
| -rw-r--r-- | tests/FrontBufferedStreamTest.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp index 5452730ea4..aa2dc89a11 100644 --- a/tests/FrontBufferedStreamTest.cpp +++ b/tests/FrontBufferedStreamTest.cpp @@ -54,10 +54,9 @@ static void test_incremental_buffering(skiatest::Reporter* reporter, size_t buff // NOTE: For this and other tests in this file, we cheat and continue to refer to the // wrapped stream, but that's okay because we know the wrapping stream has not been // deleted yet (and we only call const methods in it). - SkMemoryStream* memStream = SkMemoryStream::MakeDirect(gAbcs, strlen(gAbcs)).release(); + SkMemoryStream* memStream = new SkMemoryStream(gAbcs, strlen(gAbcs), false); - auto bufferedStream = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(memStream), - bufferSize); + std::unique_ptr<SkStream> bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); test_hasLength(reporter, *bufferedStream, *memStream); // First, test reading less than the max buffer size. @@ -83,9 +82,8 @@ static void test_incremental_buffering(skiatest::Reporter* reporter, size_t buff } static void test_perfectly_sized_buffer(skiatest::Reporter* reporter, size_t bufferSize) { - SkMemoryStream* memStream = SkMemoryStream::MakeDirect(gAbcs, strlen(gAbcs)).release(); - auto bufferedStream = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(memStream), - bufferSize); + SkMemoryStream* memStream = new SkMemoryStream(gAbcs, strlen(gAbcs), false); + std::unique_ptr<SkStream> bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); test_hasLength(reporter, *bufferedStream, *memStream); // Read exactly the amount that fits in the buffer. @@ -103,9 +101,8 @@ static void test_perfectly_sized_buffer(skiatest::Reporter* reporter, size_t buf } static void test_skipping(skiatest::Reporter* reporter, size_t bufferSize) { - SkMemoryStream* memStream = SkMemoryStream::MakeDirect(gAbcs, strlen(gAbcs)).release(); - auto bufferedStream = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(memStream), - bufferSize); + SkMemoryStream* memStream = new SkMemoryStream(gAbcs, strlen(gAbcs), false); + std::unique_ptr<SkStream> bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); test_hasLength(reporter, *bufferedStream, *memStream); // Skip half the buffer. @@ -159,8 +156,7 @@ static void test_read_beyond_buffer(skiatest::Reporter* reporter, size_t bufferS new AndroidLikeMemoryStream((void*)gAbcs, bufferSize, false); // Create a buffer that matches the length of the stream. - auto bufferedStream = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(memStream), - bufferSize); + std::unique_ptr<SkStream> bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); test_hasLength(reporter, *bufferedStream.get(), *memStream); // Attempt to read one more than the bufferSize @@ -207,8 +203,7 @@ static void test_length_combos(skiatest::Reporter* reporter, size_t bufferSize) for (int hasPos = 0; hasPos <= 1; hasPos++) { LengthOptionalStream* stream = new LengthOptionalStream(SkToBool(hasLen), SkToBool(hasPos)); - auto buffered = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(stream), - bufferSize); + std::unique_ptr<SkStream> buffered(SkFrontBufferedStream::Create(stream, bufferSize)); test_hasLength(reporter, *buffered.get(), *stream); } } @@ -222,8 +217,7 @@ static void test_initial_offset(skiatest::Reporter* reporter, size_t bufferSize) // the stream it wraps. const size_t arbitraryOffset = 17; memStream->skip(arbitraryOffset); - auto bufferedStream = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(memStream), - bufferSize); + std::unique_ptr<SkStream> bufferedStream(SkFrontBufferedStream::Create(memStream, bufferSize)); // Since SkMemoryStream has a length, bufferedStream must also. REPORTER_ASSERT(reporter, bufferedStream->hasLength()); @@ -287,7 +281,7 @@ private: DEF_TEST(ShortFrontBufferedStream, reporter) { FailingStream* failingStream = new FailingStream; - auto stream = SkFrontBufferedStream::Make(std::unique_ptr<SkStream>(failingStream), 64); + std::unique_ptr<SkStreamRewindable> stream(SkFrontBufferedStream::Create(failingStream, 64)); // This will fail to create a codec. However, what we really want to test is that we // won't read past the end of the stream. |