From a5c32a120ae918ecebab4042b3e52278f7a24b51 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Thu, 28 Sep 2017 17:12:31 -0400 Subject: Extract test subclasses of IFX_SeekableReadStream There are multiple instances of subclasses that either act as an invalid stream or one backed by a memory buffer. Merging all of these into two shared stream classes and removing the others. BUG=pdfium:911 Change-Id: I264602808c6dc0e5c878da462a5e00883fe43e51 Reviewed-on: https://pdfium-review.googlesource.com/15093 Commit-Queue: Ryan Harrison Reviewed-by: Henrique Nakashima --- .../parser/cpdf_page_object_avail_unittest.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp') diff --git a/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp index 1e83e80d32..14ba0e3273 100644 --- a/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp @@ -15,26 +15,12 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fxcrt/fx_stream.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/base/ptr_util.h" namespace { -class InvalidReader : public IFX_SeekableReadStream { - public: - template - friend RetainPtr pdfium::MakeRetain(Args&&... args); - - // IFX_SeekableReadStream overrides: - bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override { - return false; - } - FX_FILESIZE GetSize() override { return 100; } - - private: - InvalidReader() {} - ~InvalidReader() override {} -}; class TestReadValidator : public CPDF_ReadValidator { public: @@ -45,7 +31,9 @@ class TestReadValidator : public CPDF_ReadValidator { protected: TestReadValidator() - : CPDF_ReadValidator(pdfium::MakeRetain(), nullptr) {} + : CPDF_ReadValidator( + pdfium::MakeRetain(100), + nullptr) {} ~TestReadValidator() override {} }; -- cgit v1.2.3