summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/parser/cpdf_read_validator_unittest.cpp14
-rw-r--r--core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp91
2 files changed, 49 insertions, 56 deletions
diff --git a/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp b/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp
index 247abaa9f4..ccfb451dd8 100644
--- a/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp
@@ -8,8 +8,6 @@
#include <utility>
#include <vector>
-#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"
@@ -67,8 +65,7 @@ class MockDownloadHints : public CPDF_DataAvail::DownloadHints {
TEST(CPDF_ReadValidatorTest, UnavailableData) {
std::vector<uint8_t> test_data(kTestDataSize);
- auto file = pdfium::MakeRetain<CFX_MemoryStream>(test_data.data(),
- test_data.size(), false);
+ auto file = pdfium::MakeRetain<CFX_BufferSeekableReadStream>(test_data);
MockFileAvail file_avail;
auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, &file_avail);
@@ -91,8 +88,7 @@ TEST(CPDF_ReadValidatorTest, UnavailableData) {
TEST(CPDF_ReadValidatorTest, UnavailableDataWithHints) {
std::vector<uint8_t> test_data(kTestDataSize);
- auto file = pdfium::MakeRetain<CFX_MemoryStream>(test_data.data(),
- test_data.size(), false);
+ auto file = pdfium::MakeRetain<CFX_BufferSeekableReadStream>(test_data);
MockFileAvail file_avail;
auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, &file_avail);
@@ -147,8 +143,7 @@ TEST(CPDF_ReadValidatorTest, ReadError) {
TEST(CPDF_ReadValidatorTest, IntOverflow) {
std::vector<uint8_t> test_data(kTestDataSize);
- auto file = pdfium::MakeRetain<CFX_MemoryStream>(test_data.data(),
- test_data.size(), false);
+ auto file = pdfium::MakeRetain<CFX_BufferSeekableReadStream>(test_data);
MockFileAvail file_avail;
auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, &file_avail);
@@ -246,8 +241,7 @@ TEST(CPDF_ReadValidatorTest, SessionReset) {
TEST(CPDF_ReadValidatorTest, CheckDataRangeAndRequestIfUnavailable) {
std::vector<uint8_t> test_data(kTestDataSize);
- auto file = pdfium::MakeRetain<CFX_MemoryStream>(test_data.data(),
- test_data.size(), false);
+ auto file = pdfium::MakeRetain<CFX_BufferSeekableReadStream>(test_data);
MockFileAvail file_avail;
auto validator = pdfium::MakeRetain<CPDF_ReadValidator>(file, &file_avail);
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp
index 57d26b1ed1..498eddf12b 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp
@@ -8,81 +8,80 @@
#include "core/fpdfapi/parser/cpdf_object.h"
#include "core/fpdfapi/parser/cpdf_parser.h"
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
-#include "core/fxcrt/cfx_memorystream.h"
#include "core/fxcrt/fx_extension.h"
-#include "core/fxcrt/fx_stream.h"
+#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
TEST(cpdf_syntax_parser, ReadHexString) {
{
// Empty string.
- uint8_t data[] = "";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 0, false));
+ static const uint8_t data[] = "";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 0)));
EXPECT_EQ("", parser.ReadHexString());
EXPECT_EQ(0, parser.GetPos());
}
{
// Blank string.
- uint8_t data[] = " ";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 2, false));
+ static const uint8_t data[] = " ";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 2)));
EXPECT_EQ("", parser.ReadHexString());
EXPECT_EQ(2, parser.GetPos());
}
{
// Skips unknown characters.
- uint8_t data[] = "z12b";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false));
+ static const uint8_t data[] = "z12b";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 4)));
EXPECT_EQ("\x12\xb0", parser.ReadHexString());
EXPECT_EQ(4, parser.GetPos());
}
{
// Skips unknown characters.
- uint8_t data[] = "*<&*#$^&@1";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 10, false));
+ static const uint8_t data[] = "*<&*#$^&@1";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 10)));
EXPECT_EQ("\x10", parser.ReadHexString());
EXPECT_EQ(10, parser.GetPos());
}
{
// Skips unknown characters.
- uint8_t data[] = "\x80zab";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false));
+ static const uint8_t data[] = "\x80zab";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 4)));
EXPECT_EQ("\xab", parser.ReadHexString());
EXPECT_EQ(4, parser.GetPos());
}
{
// Skips unknown characters.
- uint8_t data[] = "\xffzab";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false));
+ static const uint8_t data[] = "\xffzab";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 4)));
EXPECT_EQ("\xab", parser.ReadHexString());
EXPECT_EQ(4, parser.GetPos());
}
{
// Regular conversion.
- uint8_t data[] = "1A2b>abcd";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 9, false));
+ static const uint8_t data[] = "1A2b>abcd";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 9)));
EXPECT_EQ("\x1a\x2b", parser.ReadHexString());
EXPECT_EQ(5, parser.GetPos());
}
{
// Position out of bounds.
- uint8_t data[] = "12ab>";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 5, false));
+ static const uint8_t data[] = "12ab>";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 5)));
parser.SetPos(5);
EXPECT_EQ("", parser.ReadHexString());
@@ -102,45 +101,45 @@ TEST(cpdf_syntax_parser, ReadHexString) {
{
// Missing ending >.
- uint8_t data[] = "1A2b";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false));
+ static const uint8_t data[] = "1A2b";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 4)));
EXPECT_EQ("\x1a\x2b", parser.ReadHexString());
EXPECT_EQ(4, parser.GetPos());
}
{
// Missing ending >.
- uint8_t data[] = "12abz";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 5, false));
+ static const uint8_t data[] = "12abz";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 5)));
EXPECT_EQ("\x12\xab", parser.ReadHexString());
EXPECT_EQ(5, parser.GetPos());
}
{
// Uneven number of bytes.
- uint8_t data[] = "1A2>asdf";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 8, false));
+ static const uint8_t data[] = "1A2>asdf";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 8)));
EXPECT_EQ("\x1a\x20", parser.ReadHexString());
EXPECT_EQ(4, parser.GetPos());
}
{
// Uneven number of bytes.
- uint8_t data[] = "1A2zasdf";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 8, false));
+ static const uint8_t data[] = "1A2zasdf";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 8)));
EXPECT_EQ("\x1a\x2a\xdf", parser.ReadHexString());
EXPECT_EQ(8, parser.GetPos());
}
{
// Just ending character.
- uint8_t data[] = ">";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 1, false));
+ static const uint8_t data[] = ">";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 1)));
EXPECT_EQ("", parser.ReadHexString());
EXPECT_EQ(1, parser.GetPos());
}
@@ -148,17 +147,17 @@ TEST(cpdf_syntax_parser, ReadHexString) {
TEST(cpdf_syntax_parser, GetInvalidReference) {
// Data with a reference with number CPDF_Object::kInvalidObjNum
- uint8_t data[] = "4294967295 0 R";
- CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, 14, false));
+ static const uint8_t data[] = "4294967295 0 R";
+ CPDF_SyntaxParser parser(pdfium::MakeRetain<CFX_BufferSeekableReadStream>(
+ pdfium::make_span(data, 14)));
std::unique_ptr<CPDF_Object> ref = parser.GetObjectBody(nullptr);
EXPECT_FALSE(ref);
}
TEST(cpdf_syntax_parser, PeekNextWord) {
- uint8_t data[] = " WORD ";
+ static const uint8_t data[] = " WORD ";
CPDF_SyntaxParser parser(
- pdfium::MakeRetain<CFX_MemoryStream>(data, sizeof(data), false));
+ pdfium::MakeRetain<CFX_BufferSeekableReadStream>(data));
EXPECT_EQ("WORD", parser.PeekNextWord(nullptr));
EXPECT_EQ("WORD", parser.GetNextWord(nullptr));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 07:58:01 +0000