diff options
author | Artem Strygin <art-snake@yandex-team.ru> | 2018-07-18 04:32:08 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-18 04:32:08 +0000 |
commit | 084c31d93439d5166c60dbfb0ccee6db1406d09c (patch) | |
tree | b5a420219ca6fbd14b05395df8d9f2eac53b2202 /core/fpdfapi/parser/cpdf_parser_unittest.cpp | |
parent | a18536af5b32b63f795d8b5812a4303c7ee6ea97 (diff) | |
download | pdfium-084c31d93439d5166c60dbfb0ccee6db1406d09c.tar.xz |
Use CPDF_CrossRefTable within CPDF_Parser
Change-Id: I354e8bed12606abdc67427bbc7928e3b1f11e243
Reviewed-on: https://pdfium-review.googlesource.com/35433
Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_parser_unittest.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_parser_unittest.cpp | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp index 555c35c7cb..db48493c2f 100644 --- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp @@ -14,6 +14,16 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" +namespace { + +CPDF_CrossRefTable::ObjectInfo GetObjInfo(const CPDF_Parser& parser, + uint32_t obj_num) { + const auto* info = parser.GetCrossRefTable()->GetObjectInfo(obj_num); + return info ? *info : CPDF_CrossRefTable::ObjectInfo(); +} + +} // namespace + // A wrapper class to help test member functions of CPDF_Parser. class CPDF_TestParser : public CPDF_Parser { public: @@ -61,9 +71,9 @@ TEST(cpdf_parser, RebuildCrossRefCorrectly) { const FX_FILESIZE offsets[] = {0, 15, 61, 154, 296, 374, 450}; const uint16_t versions[] = {0, 0, 2, 4, 6, 8, 0}; for (size_t i = 0; i < FX_ArraySize(offsets); ++i) - EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); + EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos); for (size_t i = 0; i < FX_ArraySize(versions); ++i) - EXPECT_EQ(versions[i], parser.m_ObjectInfo[i].gennum); + EXPECT_EQ(versions[i], GetObjInfo(parser, i).gennum); } TEST(cpdf_parser, RebuildCrossRefFailed) { @@ -102,8 +112,8 @@ TEST(cpdf_parser, LoadCrossRefV4) { CPDF_TestParser::ObjectType::kNotCompressed, CPDF_TestParser::ObjectType::kNotCompressed}; for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { - EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos); + EXPECT_EQ(types[i], GetObjInfo(parser, i).type); } } { @@ -141,8 +151,8 @@ TEST(cpdf_parser, LoadCrossRefV4) { CPDF_TestParser::ObjectType::kFree, CPDF_TestParser::ObjectType::kNotCompressed}; for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { - EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos); + EXPECT_EQ(types[i], GetObjInfo(parser, i).type); } } { @@ -180,8 +190,8 @@ TEST(cpdf_parser, LoadCrossRefV4) { CPDF_TestParser::ObjectType::kFree, CPDF_TestParser::ObjectType::kNotCompressed}; for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { - EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos); + EXPECT_EQ(types[i], GetObjInfo(parser, i).type); } } { @@ -211,8 +221,8 @@ TEST(cpdf_parser, LoadCrossRefV4) { CPDF_TestParser::ObjectType::kNotCompressed, CPDF_TestParser::ObjectType::kNotCompressed}; for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { - EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos); + EXPECT_EQ(types[i], GetObjInfo(parser, i).type); } } } |