From bba6b77b6b35da6b5884248d768f12615f62a003 Mon Sep 17 00:00:00 2001 From: Artem Strygin Date: Thu, 20 Jul 2017 21:38:39 +0300 Subject: Use enum for pdf object type Replace uint8_t type to enum for ObjectType variables Change-Id: Ie33c8c9413c5082397a2c6fbf73e03f08b7d8658 Reviewed-on: https://pdfium-review.googlesource.com/8470 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfapi/parser/cpdf_parser_unittest.cpp | 47 +++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 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 f988f8248b..25c22c701b 100644 --- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp @@ -118,7 +118,13 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, false)); const FX_FILESIZE offsets[] = {0, 17, 81, 0, 331, 409}; - const uint8_t types[] = {0, 1, 1, 0, 1, 1}; + 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}; 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); @@ -144,7 +150,20 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, false)); const FX_FILESIZE offsets[] = {0, 0, 0, 25325, 0, 0, 0, 0, 25518, 25635, 0, 0, 25777}; - const uint8_t types[] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1}; + 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}; 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); @@ -170,7 +189,20 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, false)); const FX_FILESIZE offsets[] = {0, 0, 0, 25325, 0, 0, 0, 0, 0, 25635, 0, 0, 25777}; - const uint8_t types[] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1}; + 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}; 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); @@ -194,7 +226,14 @@ TEST(cpdf_parser, LoadCrossRefV4) { ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, false)); const FX_FILESIZE offsets[] = {0, 23, 0, 0, 0, 45, 179}; - const uint8_t types[] = {0, 1, 0, 0, 0, 1, 1}; + 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}; 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