From 1cfdb58521aa96f6c0cc39a8e8fa31f2ee6ad4a9 Mon Sep 17 00:00:00 2001 From: Artem Strygin Date: Mon, 2 Oct 2017 19:23:28 +0300 Subject: Move CPDF_Parser::ObjectType into protected section Change-Id: I2a26647359a7d14d7d1269fe2835e0b3184f2ca8 Reviewed-on: https://pdfium-review.googlesource.com/13732 Commit-Queue: Art Snake Reviewed-by: dsinclair --- core/fpdfapi/parser/cpdf_parser_unittest.cpp | 86 ++++++++++++++-------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_parser_unittest.cpp') diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp index 53e1434141..555c35c7cb 100644 --- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp @@ -94,13 +94,13 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, false)); const FX_FILESIZE offsets[] = {0, 17, 81, 0, 331, 409}; - const CPDF_Parser::ObjectType types[] = { - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kNotCompressed}; + const CPDF_TestParser::ObjectType types[] = { + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kFree, + 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); @@ -126,20 +126,20 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, false)); const FX_FILESIZE offsets[] = {0, 0, 0, 25325, 0, 0, 0, 0, 25518, 25635, 0, 0, 25777}; - const CPDF_Parser::ObjectType types[] = { - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed}; + const CPDF_TestParser::ObjectType types[] = { + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kFree, + 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); @@ -165,20 +165,20 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, false)); const FX_FILESIZE offsets[] = {0, 0, 0, 25325, 0, 0, 0, 0, 0, 25635, 0, 0, 25777}; - const CPDF_Parser::ObjectType types[] = { - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed}; + const CPDF_TestParser::ObjectType types[] = { + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kFree, + 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); @@ -202,14 +202,14 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, false)); const FX_FILESIZE offsets[] = {0, 23, 0, 0, 0, 45, 179}; - const CPDF_Parser::ObjectType types[] = { - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kFree, - CPDF_Parser::ObjectType::kNotCompressed, - CPDF_Parser::ObjectType::kNotCompressed}; + const CPDF_TestParser::ObjectType types[] = { + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kNotCompressed, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + CPDF_TestParser::ObjectType::kFree, + 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); -- cgit v1.2.3