diff options
author | Ryan Harrison <rharrison@chromium.org> | 2017-09-28 17:12:31 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-29 14:26:15 +0000 |
commit | a5c32a120ae918ecebab4042b3e52278f7a24b51 (patch) | |
tree | 3400953772db763e32ade601170a46c00982e49f /core/fpdfapi/parser/cpdf_read_validator_unittest.cpp | |
parent | 10e1f05a9e644cd954792bcd40ef787551cbd209 (diff) | |
download | pdfium-a5c32a120ae918ecebab4042b3e52278f7a24b51.tar.xz |
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 <rharrison@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_read_validator_unittest.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_read_validator_unittest.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp b/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp index c6007a6c31..308704f762 100644 --- a/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp @@ -10,6 +10,7 @@ #include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_stream.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -62,22 +63,6 @@ class MockDownloadHints : public CPDF_DataAvail::DownloadHints { std::pair<FX_FILESIZE, FX_FILESIZE> last_requested_range_; }; -class InvalidReader : public IFX_SeekableReadStream { - public: - template <typename T, typename... Args> - friend RetainPtr<T> 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 kTestDataSize; } - - private: - InvalidReader() {} - ~InvalidReader() override {} -}; - } // namespace TEST(CPDF_ReadValidatorTest, UnavailableData) { @@ -149,7 +134,7 @@ TEST(CPDF_ReadValidatorTest, UnavailableDataWithHints) { } TEST(CPDF_ReadValidatorTest, ReadError) { - auto file = pdfium::MakeRetain<InvalidReader>(); + auto file = pdfium::MakeRetain<CFX_InvalidSeekableReadStream>(kTestDataSize); auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, nullptr); static const uint32_t kBufferSize = 3 * 1000; @@ -182,7 +167,7 @@ TEST(CPDF_ReadValidatorTest, IntOverflow) { TEST(CPDF_ReadValidatorTest, Session) { std::vector<uint8_t> test_data(kTestDataSize); - auto file = pdfium::MakeRetain<InvalidReader>(); + auto file = pdfium::MakeRetain<CFX_InvalidSeekableReadStream>(kTestDataSize); MockFileAvail file_avail; MockDownloadHints hints; auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, &file_avail); @@ -220,7 +205,7 @@ TEST(CPDF_ReadValidatorTest, Session) { TEST(CPDF_ReadValidatorTest, SessionReset) { std::vector<uint8_t> test_data(kTestDataSize); - auto file = pdfium::MakeRetain<InvalidReader>(); + auto file = pdfium::MakeRetain<CFX_InvalidSeekableReadStream>(kTestDataSize); MockFileAvail file_avail; MockDownloadHints hints; auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, &file_avail); |