diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-20 14:11:21 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-20 18:38:55 +0000 |
commit | 283a0433b081f88275b2f7e8c04d3c41b9187ca6 (patch) | |
tree | 4f6ff921e8a7de9b7922369c97731e54f647ea33 /core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp | |
parent | 03f5bab415cda066855e2672154358056649c584 (diff) | |
download | pdfium-283a0433b081f88275b2f7e8c04d3c41b9187ca6.tar.xz |
Convert IFX_MemoryStream to CFX_MemoryStream
The CFX_MemoryStream is the only implementation of IFX_MemoryStream.
This CL removes the interfaces and uses CFX_MemoryStream directly.
Change-Id: I2f43fa39e82dafa7673517d214ae15fd2d0df331
Reviewed-on: https://pdfium-review.googlesource.com/4391
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp index 5c7aa6054b..249276f29a 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp @@ -8,6 +8,7 @@ #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/gtest/include/gtest/gtest.h" @@ -18,7 +19,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Empty string. uint8_t data[] = ""; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 0, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 0, false), 0); EXPECT_EQ("", parser.ReadHexString()); EXPECT_EQ(0, parser.SavePos()); } @@ -27,7 +28,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Blank string. uint8_t data[] = " "; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 2, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 2, false), 0); EXPECT_EQ("", parser.ReadHexString()); EXPECT_EQ(2, parser.SavePos()); } @@ -36,7 +37,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Skips unknown characters. uint8_t data[] = "z12b"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 4, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0); EXPECT_EQ("\x12\xb0", parser.ReadHexString()); EXPECT_EQ(4, parser.SavePos()); } @@ -45,7 +46,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Skips unknown characters. uint8_t data[] = "*<&*#$^&@1"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 10, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 10, false), 0); EXPECT_EQ("\x10", parser.ReadHexString()); EXPECT_EQ(10, parser.SavePos()); } @@ -54,7 +55,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Skips unknown characters. uint8_t data[] = "\x80zab"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 4, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0); EXPECT_EQ("\xab", parser.ReadHexString()); EXPECT_EQ(4, parser.SavePos()); } @@ -63,7 +64,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Skips unknown characters. uint8_t data[] = "\xffzab"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 4, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0); EXPECT_EQ("\xab", parser.ReadHexString()); EXPECT_EQ(4, parser.SavePos()); } @@ -72,7 +73,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Regular conversion. uint8_t data[] = "1A2b>abcd"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 9, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 9, false), 0); EXPECT_EQ("\x1a\x2b", parser.ReadHexString()); EXPECT_EQ(5, parser.SavePos()); } @@ -81,7 +82,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Position out of bounds. uint8_t data[] = "12ab>"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 5, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 5, false), 0); parser.RestorePos(5); EXPECT_EQ("", parser.ReadHexString()); @@ -103,7 +104,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Missing ending >. uint8_t data[] = "1A2b"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 4, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0); EXPECT_EQ("\x1a\x2b", parser.ReadHexString()); EXPECT_EQ(4, parser.SavePos()); } @@ -112,7 +113,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Missing ending >. uint8_t data[] = "12abz"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 5, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 5, false), 0); EXPECT_EQ("\x12\xab", parser.ReadHexString()); EXPECT_EQ(5, parser.SavePos()); } @@ -121,7 +122,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Uneven number of bytes. uint8_t data[] = "1A2>asdf"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 8, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 8, false), 0); EXPECT_EQ("\x1a\x20", parser.ReadHexString()); EXPECT_EQ(4, parser.SavePos()); } @@ -130,7 +131,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Uneven number of bytes. uint8_t data[] = "1A2zasdf"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 8, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 8, false), 0); EXPECT_EQ("\x1a\x2a\xdf", parser.ReadHexString()); EXPECT_EQ(8, parser.SavePos()); } @@ -139,7 +140,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { // Just ending character. uint8_t data[] = ">"; CPDF_SyntaxParser parser; - parser.InitParser(IFX_MemoryStream::Create(data, 1, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 1, false), 0); EXPECT_EQ("", parser.ReadHexString()); EXPECT_EQ(1, parser.SavePos()); } @@ -149,7 +150,7 @@ TEST(cpdf_syntax_parser, GetInvalidReference) { CPDF_SyntaxParser parser; // Data with a reference with number CPDF_Object::kInvalidObjNum uint8_t data[] = "4294967295 0 R"; - parser.InitParser(IFX_MemoryStream::Create(data, 14, false), 0); + parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 14, false), 0); std::unique_ptr<CPDF_Object> ref = parser.GetObject(nullptr, CPDF_Object::kInvalidObjNum, 0, false); EXPECT_FALSE(ref); |