From 8a3aa459fc5284f51bcd7e98e95bf6214f47bb67 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 16 Nov 2016 12:26:06 -0800 Subject: Make CPDF_Array take unique_ptrs BUG= Review-Url: https://codereview.chromium.org/2498223005 --- core/fpdfdoc/cpdf_dest_unittest.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'core/fpdfdoc/cpdf_dest_unittest.cpp') diff --git a/core/fpdfdoc/cpdf_dest_unittest.cpp b/core/fpdfdoc/cpdf_dest_unittest.cpp index d427ab66a0..bc83ecacfc 100644 --- a/core/fpdfdoc/cpdf_dest_unittest.cpp +++ b/core/fpdfdoc/cpdf_dest_unittest.cpp @@ -4,6 +4,7 @@ #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_null.h" +#include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfdoc/cpdf_dest.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,16 +23,16 @@ TEST(cpdf_dest, GetXYZ) { EXPECT_FALSE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom)); auto array = pdfium::MakeUnique(); - array->AddInteger(0); // Page Index. - array->AddName("XYZ"); - array->AddNumber(4); // X + array->AddNew(0); // Page Index. + array->AddNew("XYZ"); + array->AddNew(4); // X // Not enough entries. dest = pdfium::MakeUnique(array.get()); EXPECT_FALSE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom)); - array->AddNumber(5); // Y - array->AddNumber(6); // Zoom. + array->AddNew(5); // Y + array->AddNew(6); // Zoom. dest = pdfium::MakeUnique(array.get()); EXPECT_TRUE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom)); @@ -43,15 +44,15 @@ TEST(cpdf_dest, GetXYZ) { EXPECT_EQ(6, zoom); // Set zoom to 0. - array->SetAt(4, new CPDF_Number(0)); + array->SetNewAt(4, 0); dest = pdfium::MakeUnique(array.get()); EXPECT_TRUE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom)); EXPECT_FALSE(hasZoom); // Set values to null. - array->SetAt(2, new CPDF_Null); - array->SetAt(3, new CPDF_Null); - array->SetAt(4, new CPDF_Null); + array->SetNewAt(2); + array->SetNewAt(3); + array->SetNewAt(4); dest = pdfium::MakeUnique(array.get()); EXPECT_TRUE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom)); EXPECT_FALSE(hasX); -- cgit v1.2.3