Migrate WTF::LinkedHashSet/ListHashSet::add() to ::insert()

third_party/WebKit/Source/wtf/ListHashSetTest.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 30 matching lines @@
 template <typename Set>
 class ListOrLinkedHashSetTest : public ::testing::Test {};
 
 using SetTypes =
     ::testing::Types<ListHashSet<int>, ListHashSet<int, 1>, LinkedHashSet<int>>;
 TYPED_TEST_CASE(ListOrLinkedHashSetTest, SetTypes);
 
 TYPED_TEST(ListOrLinkedHashSetTest, RemoveFirst) {
   using Set = TypeParam;
   Set list;
-  list.add(-1);
-  list.add(0);
-  list.add(1);
-  list.add(2);
-  list.add(3);
+  list.insert(-1);
+  list.insert(0);
+  list.insert(1);
+  list.insert(2);
+  list.insert(3);
 
   EXPECT_EQ(-1, list.first());
   EXPECT_EQ(3, list.last());
 
   list.removeFirst();
   EXPECT_EQ(0, list.first());
 
   list.removeLast();
   EXPECT_EQ(2, list.last());
 
   list.removeFirst();
   EXPECT_EQ(1, list.first());
 
   list.removeFirst();
   EXPECT_EQ(2, list.first());
 
   list.removeFirst();
   EXPECT_TRUE(list.isEmpty());
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, AppendOrMoveToLastNewItems) {
   using Set = TypeParam;
   Set list;
   typename Set::AddResult result = list.appendOrMoveToLast(1);
   EXPECT_TRUE(result.isNewEntry);
-  result = list.add(2);
+  result = list.insert(2);
   EXPECT_TRUE(result.isNewEntry);
   result = list.appendOrMoveToLast(3);
   EXPECT_TRUE(result.isNewEntry);
 
   EXPECT_EQ(list.size(), 3UL);
 
   // The list should be in order 1, 2, 3.
   typename Set::iterator iterator = list.begin();
   EXPECT_EQ(1, *iterator);
   ++iterator;
   EXPECT_EQ(2, *iterator);
   ++iterator;
   EXPECT_EQ(3, *iterator);
   ++iterator;
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, AppendOrMoveToLastWithDuplicates) {
   using Set = TypeParam;
   Set list;
 
   // Add a single element twice.
-  typename Set::AddResult result = list.add(1);
+  typename Set::AddResult result = list.insert(1);
   EXPECT_TRUE(result.isNewEntry);
   result = list.appendOrMoveToLast(1);
   EXPECT_FALSE(result.isNewEntry);
   EXPECT_EQ(1UL, list.size());
 
-  list.add(2);
-  list.add(3);
+  list.insert(2);
+  list.insert(3);
   EXPECT_EQ(3UL, list.size());
 
   // Appending 2 move it to the end.
   EXPECT_EQ(3, list.last());
   result = list.appendOrMoveToLast(2);
   EXPECT_FALSE(result.isNewEntry);
   EXPECT_EQ(2, list.last());
 
   // Inverse the list by moving each element to end end.
   result = list.appendOrMoveToLast(3);
@@ skipping 11 matching lines @@
   ++iterator;
   EXPECT_EQ(1, *iterator);
   ++iterator;
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, PrependOrMoveToFirstNewItems) {
   using Set = TypeParam;
   Set list;
   typename Set::AddResult result = list.prependOrMoveToFirst(1);
   EXPECT_TRUE(result.isNewEntry);
-  result = list.add(2);
+  result = list.insert(2);
   EXPECT_TRUE(result.isNewEntry);
   result = list.prependOrMoveToFirst(3);
   EXPECT_TRUE(result.isNewEntry);
 
   EXPECT_EQ(list.size(), 3UL);
 
   // The list should be in order 3, 1, 2.
   typename Set::iterator iterator = list.begin();
   EXPECT_EQ(3, *iterator);
   ++iterator;
   EXPECT_EQ(1, *iterator);
   ++iterator;
   EXPECT_EQ(2, *iterator);
   ++iterator;
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, PrependOrMoveToLastWithDuplicates) {
   using Set = TypeParam;
   Set list;
 
   // Add a single element twice.
-  typename Set::AddResult result = list.add(1);
+  typename Set::AddResult result = list.insert(1);
   EXPECT_TRUE(result.isNewEntry);
   result = list.prependOrMoveToFirst(1);
   EXPECT_FALSE(result.isNewEntry);
   EXPECT_EQ(1UL, list.size());
 
-  list.add(2);
-  list.add(3);
+  list.insert(2);
+  list.insert(3);
   EXPECT_EQ(3UL, list.size());
 
   // Prepending 2 move it to the beginning.
   EXPECT_EQ(1, list.first());
   result = list.prependOrMoveToFirst(2);
   EXPECT_FALSE(result.isNewEntry);
   EXPECT_EQ(2, list.first());
 
   // Inverse the list by moving each element to the first position.
   result = list.prependOrMoveToFirst(1);
   EXPECT_FALSE(result.isNewEntry);
   result = list.prependOrMoveToFirst(2);
   EXPECT_FALSE(result.isNewEntry);
   result = list.prependOrMoveToFirst(3);
   EXPECT_FALSE(result.isNewEntry);
   EXPECT_EQ(3UL, list.size());
 
   typename Set::iterator iterator = list.begin();
   EXPECT_EQ(3, *iterator);
   ++iterator;
   EXPECT_EQ(2, *iterator);
   ++iterator;
   EXPECT_EQ(1, *iterator);
   ++iterator;
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, Find) {
   using Set = TypeParam;
   Set set;
-  set.add(-1);
-  set.add(0);
-  set.add(1);
-  set.add(2);
-  set.add(3);
+  set.insert(-1);
+  set.insert(0);
+  set.insert(1);
+  set.insert(2);
+  set.insert(3);
 
   {
     const Set& ref = set;
     typename Set::const_iterator it = ref.find(2);
     EXPECT_EQ(2, *it);
     ++it;
     EXPECT_EQ(3, *it);
     --it;
     --it;
     EXPECT_EQ(1, *it);
   }
   {
     Set& ref = set;
     typename Set::iterator it = ref.find(2);
     EXPECT_EQ(2, *it);
     ++it;
     EXPECT_EQ(3, *it);
     --it;
     --it;
     EXPECT_EQ(1, *it);
   }
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, InsertBefore) {
   using Set = TypeParam;
   bool canModifyWhileIterating = !std::is_same<Set, LinkedHashSet<int>>::value;
   Set set;
-  set.add(-1);
-  set.add(0);
-  set.add(2);
-  set.add(3);
+  set.insert(-1);
+  set.insert(0);
+  set.insert(2);
+  set.insert(3);
 
   typename Set::iterator it = set.find(2);
   EXPECT_EQ(2, *it);
   set.insertBefore(it, 1);
   if (!canModifyWhileIterating)
     it = set.find(2);
   ++it;
   EXPECT_EQ(3, *it);
   EXPECT_EQ(5u, set.size());
   --it;
   --it;
   EXPECT_EQ(1, *it);
   if (canModifyWhileIterating) {
     set.remove(-1);
     set.remove(0);
     set.remove(2);
     set.remove(3);
     EXPECT_EQ(1u, set.size());
     EXPECT_EQ(1, *it);
     ++it;
     EXPECT_EQ(it, set.end());
     --it;
     EXPECT_EQ(1, *it);
     set.insertBefore(it, -1);
     set.insertBefore(it, 0);
-    set.add(2);
-    set.add(3);
+    set.insert(2);
+    set.insert(3);
   }
   set.insertBefore(2, 42);
   set.insertBefore(-1, 103);
   EXPECT_EQ(103, set.first());
   if (!canModifyWhileIterating)
     it = set.find(1);
   ++it;
   EXPECT_EQ(42, *it);
   EXPECT_EQ(7u, set.size());
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, AddReturnIterator) {
   using Set = TypeParam;
   bool canModifyWhileIterating = !std::is_same<Set, LinkedHashSet<int>>::value;
   Set set;
-  set.add(-1);
-  set.add(0);
-  set.add(1);
-  set.add(2);
+  set.insert(-1);
+  set.insert(0);
+  set.insert(1);
+  set.insert(2);
 
   typename Set::iterator it = set.addReturnIterator(3);
   EXPECT_EQ(3, *it);
   --it;
   EXPECT_EQ(2, *it);
   EXPECT_EQ(5u, set.size());
   --it;
   EXPECT_EQ(1, *it);
   --it;
   EXPECT_EQ(0, *it);
@@ skipping 26 matching lines @@
   EXPECT_EQ(4, set.last());
 }
 
 TYPED_TEST(ListOrLinkedHashSetTest, Swap) {
   using Set = TypeParam;
   int num = 10;
   Set set0;
   Set set1;
   Set set2;
   for (int i = 0; i < num; ++i) {
-    set1.add(i + 1);
-    set2.add(num - i);
+    set1.insert(i + 1);
+    set2.insert(num - i);
   }
 
   typename Set::iterator it1 = set1.begin();
   typename Set::iterator it2 = set2.begin();
   for (int i = 0; i < num; ++i, ++it1, ++it2) {
     EXPECT_EQ(*it1, i + 1);
     EXPECT_EQ(*it2, num - i);
   }
   EXPECT_EQ(set0.begin(), set0.end());
   EXPECT_EQ(it1, set1.end());
@@ skipping 57 matching lines @@
 TYPED_TEST_CASE(ListOrLinkedHashSetRefPtrTest, RefPtrSetTypes);
 
 TYPED_TEST(ListOrLinkedHashSetRefPtrTest, WithRefPtr) {
   using Set = TypeParam;
   bool isDeleted = false;
   DummyRefCounted::m_refInvokesCount = 0;
   RefPtr<DummyRefCounted> ptr = adoptRef(new DummyRefCounted(isDeleted));
   EXPECT_EQ(0, DummyRefCounted::m_refInvokesCount);
 
   Set set;
-  set.add(ptr);
+  set.insert(ptr);
   // Referenced only once (to store a copy in the container).
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
   EXPECT_EQ(ptr, set.first());
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
 
   DummyRefCounted* rawPtr = ptr.get();
 
   EXPECT_TRUE(set.contains(ptr));
   EXPECT_TRUE(set.contains(rawPtr));
   EXPECT_EQ(1, DummyRefCounted::m_refInvokesCount);
@@ skipping 10 matching lines @@
 
 TYPED_TEST(ListOrLinkedHashSetRefPtrTest, ExerciseValuePeekInType) {
   using Set = TypeParam;
   Set set;
   bool isDeleted = false;
   bool isDeleted2 = false;
 
   RefPtr<DummyRefCounted> ptr = adoptRef(new DummyRefCounted(isDeleted));
   RefPtr<DummyRefCounted> ptr2 = adoptRef(new DummyRefCounted(isDeleted2));
 
-  typename Set::AddResult addResult = set.add(ptr);
+  typename Set::AddResult addResult = set.insert(ptr);
   EXPECT_TRUE(addResult.isNewEntry);
   set.find(ptr);
   const Set& constSet(set);
   constSet.find(ptr);
   EXPECT_TRUE(set.contains(ptr));
   typename Set::iterator it = set.addReturnIterator(ptr);
   set.appendOrMoveToLast(ptr);
   set.prependOrMoveToFirst(ptr);
   set.insertBefore(ptr, ptr);
   set.insertBefore(it, ptr);
   EXPECT_EQ(1u, set.size());
-  set.add(ptr2);
+  set.insert(ptr2);
   ptr2.clear();
   set.remove(ptr);
 
   EXPECT_FALSE(isDeleted);
   ptr.clear();
   EXPECT_TRUE(isDeleted);
 
   EXPECT_FALSE(isDeleted2);
   set.removeFirst();
   EXPECT_TRUE(isDeleted2);
@@ skipping 40 matching lines @@
 
 using TranslatorSetTypes =
     ::testing::Types<ListHashSet<Complicated, 256, ComplicatedHashFunctions>,
                      ListHashSet<Complicated, 1, ComplicatedHashFunctions>,
                      LinkedHashSet<Complicated, ComplicatedHashFunctions>>;
 TYPED_TEST_CASE(ListOrLinkedHashSetTranslatorTest, TranslatorSetTypes);
 
 TYPED_TEST(ListOrLinkedHashSetTranslatorTest, ComplexityTranslator) {
   using Set = TypeParam;
   Set set;
-  set.add(Complicated(42));
+  set.insert(Complicated(42));
   int baseLine = Complicated::s_objectsConstructed;
 
   typename Set::iterator it =
       set.template find<ComplexityTranslator>(Simple(42));
   EXPECT_NE(it, set.end());
   EXPECT_EQ(baseLine, Complicated::s_objectsConstructed);
 
   it = set.template find<ComplexityTranslator>(Simple(103));
   EXPECT_EQ(it, set.end());
   EXPECT_EQ(baseLine, Complicated::s_objectsConstructed);
@@ skipping 21 matching lines @@
 TEST(ListHashSetTest, WithOwnPtr) {
   bool deleted1 = false, deleted2 = false;
 
   typedef ListHashSet<std::unique_ptr<Dummy>> OwnPtrSet;
   OwnPtrSet set;
 
   Dummy* ptr1 = new Dummy(deleted1);
   {
     // AddResult in a separate scope to avoid assertion hit,
     // since we modify the container further.
-    OwnPtrSet::AddResult res1 = set.add(WTF::wrapUnique(ptr1));
+    OwnPtrSet::AddResult res1 = set.insert(WTF::wrapUnique(ptr1));
     EXPECT_EQ(res1.storedValue->get(), ptr1);
   }
 
   EXPECT_FALSE(deleted1);
   EXPECT_EQ(1UL, set.size());
   OwnPtrSet::iterator it1 = set.find(ptr1);
   EXPECT_NE(set.end(), it1);
   EXPECT_EQ(ptr1, (*it1).get());
 
   Dummy* ptr2 = new Dummy(deleted2);
   {
-    OwnPtrSet::AddResult res2 = set.add(WTF::wrapUnique(ptr2));
+    OwnPtrSet::AddResult res2 = set.insert(WTF::wrapUnique(ptr2));
     EXPECT_EQ(res2.storedValue->get(), ptr2);
   }
 
   EXPECT_FALSE(deleted2);
   EXPECT_EQ(2UL, set.size());
   OwnPtrSet::iterator it2 = set.find(ptr2);
   EXPECT_NE(set.end(), it2);
   EXPECT_EQ(ptr2, (*it2).get());
 
   set.remove(ptr1);
   EXPECT_TRUE(deleted1);
 
   set.clear();
   EXPECT_TRUE(deleted2);
   EXPECT_TRUE(set.isEmpty());
 
   deleted1 = false;
   deleted2 = false;
   {
     OwnPtrSet set;
-    set.add(WTF::makeUnique<Dummy>(deleted1));
-    set.add(WTF::makeUnique<Dummy>(deleted2));
+    set.insert(WTF::makeUnique<Dummy>(deleted1));
+    set.insert(WTF::makeUnique<Dummy>(deleted2));
   }
   EXPECT_TRUE(deleted1);
   EXPECT_TRUE(deleted2);
 
   deleted1 = false;
   deleted2 = false;
   std::unique_ptr<Dummy> ownPtr1;
   std::unique_ptr<Dummy> ownPtr2;
   ptr1 = new Dummy(deleted1);
   ptr2 = new Dummy(deleted2);
   {
     OwnPtrSet set;
-    set.add(WTF::wrapUnique(ptr1));
-    set.add(WTF::wrapUnique(ptr2));
+    set.insert(WTF::wrapUnique(ptr1));
+    set.insert(WTF::wrapUnique(ptr2));
     ownPtr1 = set.takeFirst();
     EXPECT_EQ(1UL, set.size());
     ownPtr2 = set.take(ptr2);
     EXPECT_TRUE(set.isEmpty());
   }
   EXPECT_FALSE(deleted1);
   EXPECT_FALSE(deleted2);
 
   EXPECT_EQ(ptr1, ownPtr1.get());
   EXPECT_EQ(ptr2, ownPtr2.get());
@@ skipping 54 matching lines @@
 using CountCopySetTypes = ::testing::Types<ListHashSet<CountCopy>,
                                            ListHashSet<CountCopy, 1>,
                                            LinkedHashSet<CountCopy>>;
 TYPED_TEST_CASE(ListOrLinkedHashSetCountCopyTest, CountCopySetTypes);
 
 TYPED_TEST(ListOrLinkedHashSetCountCopyTest,
            MoveConstructionShouldNotMakeCopy) {
   using Set = TypeParam;
   Set set;
   int counter = 0;
-  set.add(CountCopy(&counter));
+  set.insert(CountCopy(&counter));
 
   counter = 0;
   Set other(std::move(set));
   EXPECT_EQ(0, counter);
 }
 
 TYPED_TEST(ListOrLinkedHashSetCountCopyTest, MoveAssignmentShouldNotMakeACopy) {
   using Set = TypeParam;
   Set set;
   int counter = 0;
-  set.add(CountCopy(&counter));
+  set.insert(CountCopy(&counter));
 
   Set other(set);
   counter = 0;
   set = std::move(other);
   EXPECT_EQ(0, counter);
 }
 
 class MoveOnly {
  public:
   // kEmpty and kDeleted have special meanings when MoveOnly is used as the key
@@ skipping 50 matching lines @@
 using MoveOnlySetTypes = ::testing::Types<ListHashSet<MoveOnly>,
                                           ListHashSet<MoveOnly, 1>,
                                           LinkedHashSet<MoveOnly>>;
 TYPED_TEST_CASE(ListOrLinkedHashSetMoveOnlyTest, MoveOnlySetTypes);
 
 TYPED_TEST(ListOrLinkedHashSetMoveOnlyTest, MoveOnlyValue) {
   using Set = TypeParam;
   using AddResult = typename Set::AddResult;
   Set set;
   {
-    AddResult addResult = set.add(MoveOnly(1, 1));
+    AddResult addResult = set.insert(MoveOnly(1, 1));
     EXPECT_TRUE(addResult.isNewEntry);
     EXPECT_EQ(1, addResult.storedValue->value());
     EXPECT_EQ(1, addResult.storedValue->id());
   }
   {
-    AddResult addResult = set.add(MoveOnly(1, 111));
+    AddResult addResult = set.insert(MoveOnly(1, 111));
     EXPECT_FALSE(addResult.isNewEntry);
     EXPECT_EQ(1, addResult.storedValue->value());
     EXPECT_EQ(1, addResult.storedValue->id());
   }
   auto iter = set.find(MoveOnly(1));
   ASSERT_TRUE(iter != set.end());
   EXPECT_EQ(1, iter->value());
   EXPECT_EQ(1, iter->id());
 
   iter = set.find(MoveOnly(2));
@@ skipping 37 matching lines @@
 
   // ... but they don't have any pass-out (like take()) methods.
 
   set.remove(MoveOnly(3));
   set.clear();
 }
 
 }  // anonymous namespace
 
 }  // namespace WTF