aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/FrontBufferedStreamTest.cpp
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-03-01 13:29:15 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-01 13:29:15 -0800
commitb9e56c1ee6c4c8ae0a2e9247e504d92de4a6bfaa (patch)
treee9797e150e7f91e4e15e8ee46af903ee483ddd93 /tests/FrontBufferedStreamTest.cpp
parent3d5d9ac426ea926f37eaa47e13acf7492068667b (diff)
Fix FrontBufferedStreamTest
Diffstat (limited to 'tests/FrontBufferedStreamTest.cpp')
-rw-r--r--tests/FrontBufferedStreamTest.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index e3df466fd3..d2bb43ab3c 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -263,14 +263,11 @@ class FailingStream : public SkStream {
public:
FailingStream()
: fAtEnd(false)
- , fReadAfterEnd(false)
{}
+
size_t read(void* buffer, size_t size) override {
- if (fAtEnd) {
- fReadAfterEnd = true;
- } else {
- fAtEnd = true;
- }
+ SkASSERT(!fAtEnd);
+ fAtEnd = true;
return 0;
}
@@ -278,12 +275,8 @@ public:
return fAtEnd;
}
- bool readAfterEnd() const {
- return fReadAfterEnd;
- }
private:
bool fAtEnd;
- bool fReadAfterEnd;
};
DEF_TEST(ShortFrontBufferedStream, reporter) {
@@ -293,5 +286,4 @@ DEF_TEST(ShortFrontBufferedStream, reporter) {
// 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.
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
- REPORTER_ASSERT(reporter, !failingStream->readAfterEnd());
}