summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_array_unittest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array_unittest.cpp')
-rw-r--r--core/fpdfapi/parser/cpdf_array_unittest.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/core/fpdfapi/parser/cpdf_array_unittest.cpp b/core/fpdfapi/parser/cpdf_array_unittest.cpp
index 4ce66dcadb..a70f9910ed 100644
--- a/core/fpdfapi/parser/cpdf_array_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_array_unittest.cpp
@@ -21,13 +21,13 @@ TEST(cpdf_array, RemoveAt) {
for (size_t i = 0; i < 3; ++i)
arr->RemoveAt(3);
const int expected[] = {1, 2, 3, 7, 8, 9, 10};
- ASSERT_EQ(FX_ArraySize(expected), arr->GetCount());
+ ASSERT_EQ(FX_ArraySize(expected), arr->size());
for (size_t i = 0; i < FX_ArraySize(expected); ++i)
EXPECT_EQ(expected[i], arr->GetIntegerAt(i));
arr->RemoveAt(4);
arr->RemoveAt(4);
const int expected2[] = {1, 2, 3, 7, 10};
- ASSERT_EQ(FX_ArraySize(expected2), arr->GetCount());
+ ASSERT_EQ(FX_ArraySize(expected2), arr->size());
for (size_t i = 0; i < FX_ArraySize(expected2); ++i)
EXPECT_EQ(expected2[i], arr->GetIntegerAt(i));
}
@@ -38,19 +38,19 @@ TEST(cpdf_array, RemoveAt) {
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
arr->AddNew<CPDF_Number>(elems[i]);
arr->RemoveAt(11);
- EXPECT_EQ(FX_ArraySize(elems), arr->GetCount());
+ EXPECT_EQ(FX_ArraySize(elems), arr->size());
}
}
TEST(cpdf_array, Clear) {
const int elems[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
auto arr = pdfium::MakeUnique<CPDF_Array>();
- EXPECT_EQ(0U, arr->GetCount());
+ EXPECT_EQ(0U, arr->size());
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
arr->AddNew<CPDF_Number>(elems[i]);
- EXPECT_EQ(FX_ArraySize(elems), arr->GetCount());
+ EXPECT_EQ(FX_ArraySize(elems), arr->size());
arr->Clear();
- EXPECT_EQ(0U, arr->GetCount());
+ EXPECT_EQ(0U, arr->size());
}
TEST(cpdf_array, InsertAt) {
@@ -59,14 +59,14 @@ TEST(cpdf_array, InsertAt) {
auto arr = pdfium::MakeUnique<CPDF_Array>();
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
arr->InsertNewAt<CPDF_Number>(i, elems[i]);
- ASSERT_EQ(FX_ArraySize(elems), arr->GetCount());
+ ASSERT_EQ(FX_ArraySize(elems), arr->size());
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
EXPECT_EQ(elems[i], arr->GetIntegerAt(i));
arr->InsertNewAt<CPDF_Number>(3, 33);
arr->InsertNewAt<CPDF_Number>(6, 55);
arr->InsertNewAt<CPDF_Number>(12, 12);
const int expected[] = {1, 2, 3, 33, 4, 5, 55, 6, 7, 8, 9, 10, 12};
- ASSERT_EQ(FX_ArraySize(expected), arr->GetCount());
+ ASSERT_EQ(FX_ArraySize(expected), arr->size());
for (size_t i = 0; i < FX_ArraySize(expected); ++i)
EXPECT_EQ(expected[i], arr->GetIntegerAt(i));
}
@@ -79,7 +79,7 @@ TEST(cpdf_array, InsertAt) {
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
arr->InsertNewAt<CPDF_Number>(i, elems[i]);
arr->InsertNewAt<CPDF_Number>(10, 10);
- ASSERT_EQ(11u, arr->GetCount());
+ ASSERT_EQ(11u, arr->size());
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
EXPECT_EQ(elems[i], arr->GetIntegerAt(i));
for (size_t i = FX_ArraySize(elems); i < 10; ++i)
@@ -96,7 +96,7 @@ TEST(cpdf_array, Clone) {
for (size_t i = 0; i < FX_ArraySize(elems); ++i)
arr->InsertNewAt<CPDF_Number>(i, elems[i]);
std::unique_ptr<CPDF_Array> arr2 = ToArray(arr->Clone());
- ASSERT_EQ(arr->GetCount(), arr2->GetCount());
+ ASSERT_EQ(arr->size(), arr2->size());
for (size_t i = 0; i < FX_ArraySize(elems); ++i) {
// Clone() always create new objects.
EXPECT_NE(arr->GetObjectAt(i), arr2->GetObjectAt(i));
@@ -124,14 +124,14 @@ TEST(cpdf_array, Clone) {
}
arr->InsertAt(i, std::move(arr_elem));
}
- ASSERT_EQ(kNumOfRows, arr->GetCount());
+ ASSERT_EQ(kNumOfRows, arr->size());
// Not dereferencing reference objects means just creating new references
// instead of new copies of direct objects.
std::unique_ptr<CPDF_Array> arr1 = ToArray(arr->Clone());
- ASSERT_EQ(arr->GetCount(), arr1->GetCount());
+ ASSERT_EQ(arr->size(), arr1->size());
// Dereferencing reference objects creates new copies of direct objects.
std::unique_ptr<CPDF_Array> arr2 = ToArray(arr->CloneDirectObject());
- ASSERT_EQ(arr->GetCount(), arr2->GetCount());
+ ASSERT_EQ(arr->size(), arr2->size());
for (size_t i = 0; i < kNumOfRows; ++i) {
CPDF_Array* arr_elem = arr->GetObjectAt(i)->AsArray();
CPDF_Array* arr1_elem = arr1->GetObjectAt(i)->AsArray();
@@ -156,7 +156,7 @@ TEST(cpdf_array, Clone) {
}
}
arr.reset();
- ASSERT_EQ(kNumOfRows, arr1->GetCount());
+ ASSERT_EQ(kNumOfRows, arr1->size());
for (size_t i = 0; i < kNumOfRows; ++i) {
for (size_t j = 0; j < kNumOfRowElems; ++j) {
// Results from not deferencing reference objects.