diff options
author | Lei Zhang <thestig@chromium.org> | 2016-02-01 14:52:40 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-02-01 14:52:40 -0800 |
commit | 05797682103f8c724bc21fa197ee6f9f6515081e (patch) | |
tree | 0c2247e684b0945b003335da4b84edb0b7100dc0 /core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp | |
parent | cb3a0557e7cbb205d1415969033ce3874a2bd3d8 (diff) | |
download | pdfium-05797682103f8c724bc21fa197ee6f9f6515081e.tar.xz |
Merge to XFA: Remove the m_ObjVersion member variable from CPDF_Parser.
Use the gennum field in the m_ObjectInfo map instead.
BUG=pdfium:111
R=weili@chromium.org
TBR=weili@chromium.org
Review URL: https://codereview.chromium.org/1654303002 .
(cherry picked from commit a620372c9e1d0ff825bcbe6620fe7e1b63c769c2)
Review URL: https://codereview.chromium.org/1653023004 .
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 | 18 |
1 files changed, 2 insertions, 16 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 b39eb96785..77780b9dcf 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp @@ -7,20 +7,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" -// Functions to help test an array's content against expected results. -template <class TYPE> -bool CompareArray(const CFX_ArrayTemplate<TYPE>& array1, - const TYPE* array2, - size_t size) { - if (array1.GetSize() != size) - return false; - - for (int i = 0; i < size; ++i) - if (array1.GetAt(i) != array2[i]) - return false; - return true; -} - // Provide a way to read test data from a buffer instead of a file. class CFX_TestBufferRead : public IFX_FileRead { public: @@ -257,8 +243,8 @@ TEST(fpdf_parser_parser, RebuildCrossRefCorrectly) { const FX_WORD 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); - ASSERT_TRUE( - CompareArray(parser.m_ObjVersion, versions, FX_ArraySize(versions))); + for (size_t i = 0; i < FX_ArraySize(versions); ++i) + EXPECT_EQ(versions[i], parser.m_ObjectInfo[i].gennum); } TEST(fpdf_parser_parser, RebuildCrossRefFailed) { |