Rename GetElementValue() to GetDirectObject{By,At}().

core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_null.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_name.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
@@ skipping 105 matching lines @@
                obj1->GetInteger() == obj2->GetInteger();
       case CPDF_Object::STRING:
       case CPDF_Object::NAME:
         return obj1->GetString() == obj2->GetString();
       case CPDF_Object::ARRAY: {
         const CPDF_Array* array1 = obj1->AsArray();
         const CPDF_Array* array2 = obj2->AsArray();
         if (array1->GetCount() != array2->GetCount())
           return false;
         for (size_t i = 0; i < array1->GetCount(); ++i) {
-          if (!Equal(array1->GetElement(i), array2->GetElement(i)))
+          if (!Equal(array1->GetObjectAt(i), array2->GetObjectAt(i)))
             return false;
         }
         return true;
       }
       case CPDF_Object::DICTIONARY: {
         const CPDF_Dictionary* dict1 = obj1->AsDictionary();
         const CPDF_Dictionary* dict2 = obj2->AsDictionary();
         if (dict1->GetCount() != dict2->GetCount())
           return false;
         for (CPDF_Dictionary::const_iterator it = dict1->begin();
              it != dict1->end(); ++it) {
-          if (!Equal(it->second, dict2->GetElement(it->first)))
+          if (!Equal(it->second, dict2->GetObjectBy(it->first)))
             return false;
         }
         return true;
       }
       case CPDF_Object::NULLOBJ:
         return true;
       case CPDF_Object::STREAM: {
         const CPDF_Stream* stream1 = obj1->AsStream();
         const CPDF_Stream* stream2 = obj2->AsStream();
         if (!stream1->GetDict() && !stream2->GetDict())
@@ skipping 550 matching lines @@
   }
 }
 
 TEST(PDFArrayTest, AddNumber) {
   float vals[] = {1.0f,         -1.0f, 0,    0.456734f,
                   12345.54321f, 0.5f,  1000, 0.000045f};
   ScopedArray arr(new CPDF_Array);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i)
     arr->AddNumber(vals[i]);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
-    EXPECT_EQ(CPDF_Object::NUMBER, arr->GetElement(i)->GetType());
-    EXPECT_EQ(vals[i], arr->GetElement(i)->GetNumber());
+    EXPECT_EQ(CPDF_Object::NUMBER, arr->GetObjectAt(i)->GetType());
+    EXPECT_EQ(vals[i], arr->GetObjectAt(i)->GetNumber());
   }
 }
 
 TEST(PDFArrayTest, AddInteger) {
   int vals[] = {0, 1, 934435456, 876, 10000, -1, -24354656, -100};
   ScopedArray arr(new CPDF_Array);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i)
     arr->AddInteger(vals[i]);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
-    EXPECT_EQ(CPDF_Object::NUMBER, arr->GetElement(i)->GetType());
-    EXPECT_EQ(vals[i], arr->GetElement(i)->GetNumber());
+    EXPECT_EQ(CPDF_Object::NUMBER, arr->GetObjectAt(i)->GetType());
+    EXPECT_EQ(vals[i], arr->GetObjectAt(i)->GetNumber());
   }
 }
 
 TEST(PDFArrayTest, AddStringAndName) {
   const char* vals[] = {"",        "a", "ehjhRIOYTTFdfcdnv",  "122323",
                         "$#%^&**", " ", "This is a test.\r\n"};
   ScopedArray string_array(new CPDF_Array);
   ScopedArray name_array(new CPDF_Array);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
     string_array->AddString(vals[i]);
     name_array->AddName(vals[i]);
   }
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
-    EXPECT_EQ(CPDF_Object::STRING, string_array->GetElement(i)->GetType());
-    EXPECT_STREQ(vals[i], string_array->GetElement(i)->GetString().c_str());
-    EXPECT_EQ(CPDF_Object::NAME, name_array->GetElement(i)->GetType());
-    EXPECT_STREQ(vals[i], name_array->GetElement(i)->GetString().c_str());
+    EXPECT_EQ(CPDF_Object::STRING, string_array->GetObjectAt(i)->GetType());
+    EXPECT_STREQ(vals[i], string_array->GetObjectAt(i)->GetString().c_str());
+    EXPECT_EQ(CPDF_Object::NAME, name_array->GetObjectAt(i)->GetType());
+    EXPECT_STREQ(vals[i], name_array->GetObjectAt(i)->GetString().c_str());
   }
 }
 
-TEST(PDFArrayTest, AddReferenceAndGetElement) {
+TEST(PDFArrayTest, AddReferenceAndGetObjectAt) {
   std::unique_ptr<CPDF_IndirectObjectHolder> holder(
       new CPDF_IndirectObjectHolder(nullptr));
   CPDF_Boolean* boolean_obj = new CPDF_Boolean(true);
   CPDF_Number* int_obj = new CPDF_Number(-1234);
   CPDF_Number* float_obj = new CPDF_Number(2345.089f);
   CPDF_String* str_obj = new CPDF_String("Adsfdsf 343434 %&&*\n", false);
   CPDF_Name* name_obj = new CPDF_Name("Title:");
   CPDF_Null* null_obj = new CPDF_Null();
   CPDF_Object* indirect_objs[] = {boolean_obj, int_obj,  float_obj,
                                   str_obj,     name_obj, null_obj};
   unsigned int obj_nums[] = {2, 4, 7, 2345, 799887, 1};
   ScopedArray arr(new CPDF_Array);
   ScopedArray arr1(new CPDF_Array);
   // Create two arrays of references by different AddReference() APIs.
   for (size_t i = 0; i < FX_ArraySize(indirect_objs); ++i) {
     // All the indirect objects inserted will be owned by holder.
     holder->InsertIndirectObject(obj_nums[i], indirect_objs[i]);
     arr->AddReference(holder.get(), obj_nums[i]);
     arr1->AddReference(holder.get(), indirect_objs[i]);
   }
   // Check indirect objects.
   for (size_t i = 0; i < FX_ArraySize(obj_nums); ++i)
     EXPECT_EQ(indirect_objs[i], holder->GetIndirectObject(obj_nums[i]));
   // Check arrays.
   EXPECT_EQ(arr->GetCount(), arr1->GetCount());
   for (size_t i = 0; i < arr->GetCount(); ++i) {
-    EXPECT_EQ(CPDF_Object::REFERENCE, arr->GetElement(i)->GetType());
-    EXPECT_EQ(indirect_objs[i], arr->GetElement(i)->GetDirect());
-    EXPECT_EQ(indirect_objs[i], arr->GetElementValue(i));
-    EXPECT_EQ(CPDF_Object::REFERENCE, arr1->GetElement(i)->GetType());
-    EXPECT_EQ(indirect_objs[i], arr1->GetElement(i)->GetDirect());
-    EXPECT_EQ(indirect_objs[i], arr1->GetElementValue(i));
+    EXPECT_EQ(CPDF_Object::REFERENCE, arr->GetObjectAt(i)->GetType());
+    EXPECT_EQ(indirect_objs[i], arr->GetObjectAt(i)->GetDirect());
+    EXPECT_EQ(indirect_objs[i], arr->GetDirectObjectAt(i));
+    EXPECT_EQ(CPDF_Object::REFERENCE, arr1->GetObjectAt(i)->GetType());
+    EXPECT_EQ(indirect_objs[i], arr1->GetObjectAt(i)->GetDirect());
+    EXPECT_EQ(indirect_objs[i], arr1->GetDirectObjectAt(i));
   }
 }