diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-02-01 13:45:31 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-02-01 13:45:31 -0800 |
| commit | cb3a0557e7cbb205d1415969033ce3874a2bd3d8 (patch) | |
| tree | 947812bb6af16fdafa9be5fb427e043bba946617 /core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp | |
| parent | b9cc7a0d0ece261db2cd2a1486b05e3338bca322 (diff) | |
| download | pdfium-cb3a0557e7cbb205d1415969033ce3874a2bd3d8.tar.xz | |
Merge to XFA: Remove the m_V5Type member variable from CPDF_Parser.chromium/2641chromium/2640chromium/2639chromium/2638
Use the type field in the m_ObjectInfo map instead.
BUG=pdfium:111
TBR=weili@chromium.org
Review URL: https://codereview.chromium.org/1650793002 .
(cherry picked from commit 93c196d868535f684007a7d3ed1f7146851a0ab9)
Review URL: https://codereview.chromium.org/1652083004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp index e091f14cbe..b39eb96785 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp @@ -290,9 +290,10 @@ TEST(fpdf_parser_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}; - for (size_t i = 0; i < FX_ArraySize(offsets); ++i) + for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types))); + EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + } } { const unsigned char xref_table[] = @@ -315,9 +316,10 @@ TEST(fpdf_parser_parser, LoadCrossRefV4) { 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}; - for (size_t i = 0; i < FX_ArraySize(offsets); ++i) + for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types))); + EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + } } { const unsigned char xref_table[] = @@ -340,9 +342,10 @@ TEST(fpdf_parser_parser, LoadCrossRefV4) { 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}; - for (size_t i = 0; i < FX_ArraySize(offsets); ++i) + for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types))); + EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + } } { const unsigned char xref_table[] = @@ -363,8 +366,9 @@ TEST(fpdf_parser_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}; - for (size_t i = 0; i < FX_ArraySize(offsets); ++i) + for (size_t i = 0; i < FX_ArraySize(offsets); ++i) { EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos); - ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types))); + EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type); + } } } |