Migrate WTF::HashSet::add() to ::insert() [part 2 of N]

third_party/WebKit/Source/wtf/HashSetTest.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 36 matching lines @@
 
   testSet.reserveCapacityForSize(size);
   const unsigned initialCapacity = testSet.capacity();
   const unsigned minimumTableSize = HashTraits<int>::minimumTableSize;
 
   // reserveCapacityForSize should respect minimumTableSize.
   EXPECT_GE(initialCapacity, minimumTableSize);
 
   // Adding items up to size should never change the capacity.
   for (size_t i = 0; i < size; ++i) {
-    testSet.add(i + 1);  // Avoid adding '0'.
+    testSet.insert(i + 1);  // Avoid adding '0'.
     EXPECT_EQ(initialCapacity, testSet.capacity());
   }
 
   // Adding items up to less than half the capacity should not change the
   // capacity.
   unsigned capacityLimit = initialCapacity / 2 - 1;
   for (size_t i = size; i < capacityLimit; ++i) {
-    testSet.add(i + 1);
+    testSet.insert(i + 1);
     EXPECT_EQ(initialCapacity, testSet.capacity());
   }
 
   // Adding one more item increases the capacity.
-  testSet.add(capacityLimit + 1);
+  testSet.insert(capacityLimit + 1);
   EXPECT_GT(testSet.capacity(), initialCapacity);
 
   testReserveCapacity<size - 1>();
 }
 
 TEST(HashSetTest, ReserveCapacity) {
   testReserveCapacity<128>();
 }
 
 struct Dummy {
   Dummy(bool& deleted) : deleted(deleted) {}
 
   ~Dummy() { deleted = true; }
 
   bool& deleted;
 };
 
 TEST(HashSetTest, HashSetOwnPtr) {
   bool deleted1 = false, deleted2 = false;
 
   typedef HashSet<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.
     HashSet<std::unique_ptr<Dummy>>::AddResult res1 =
-        set.add(WTF::wrapUnique(ptr1));
+        set.insert(WTF::wrapUnique(ptr1));
     EXPECT_EQ(ptr1, res1.storedValue->get());
   }
 
   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);
   {
     HashSet<std::unique_ptr<Dummy>>::AddResult res2 =
-        set.add(WTF::wrapUnique(ptr2));
+        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.take(ptr1);
     EXPECT_EQ(1UL, set.size());
     ownPtr2 = set.takeAny();
     EXPECT_TRUE(set.isEmpty());
   }
   EXPECT_FALSE(deleted1);
   EXPECT_FALSE(deleted2);
 
   EXPECT_EQ(ptr1, ownPtr1.get());
   EXPECT_EQ(ptr2, ownPtr2.get());
@@ skipping 17 matching lines @@
   bool& m_isDeleted;
 };
 
 int DummyRefCounted::s_refInvokesCount = 0;
 
 TEST(HashSetTest, HashSetRefPtr) {
   bool isDeleted = false;
   RefPtr<DummyRefCounted> ptr = adoptRef(new DummyRefCounted(isDeleted));
   EXPECT_EQ(0, DummyRefCounted::s_refInvokesCount);
   HashSet<RefPtr<DummyRefCounted>> set;
-  set.add(ptr);
+  set.insert(ptr);
   // Referenced only once (to store a copy in the container).
   EXPECT_EQ(1, DummyRefCounted::s_refInvokesCount);
 
   DummyRefCounted* rawPtr = ptr.get();
 
   EXPECT_TRUE(set.contains(rawPtr));
   EXPECT_NE(set.end(), set.find(rawPtr));
   EXPECT_TRUE(set.contains(ptr));
   EXPECT_NE(set.end(), set.find(ptr));
 
@@ skipping 60 matching lines @@
 template <>
 struct DefaultHash<CountCopy> {
   using Hash = CountCopyHash;
 };
 
 namespace {
 
 TEST(HashSetTest, MoveShouldNotMakeCopy) {
   HashSet<CountCopy> set;
   int counter = 0;
-  set.add(CountCopy(&counter));
+  set.insert(CountCopy(&counter));
 
   HashSet<CountCopy> other(set);
   counter = 0;
   set = std::move(other);
   EXPECT_EQ(0, counter);
 
   counter = 0;
   HashSet<CountCopy> yetAnother(std::move(set));
   EXPECT_EQ(0, counter);
 }
@@ skipping 66 matching lines @@
 struct DefaultHash<MoveOnly> {
   using Hash = MoveOnlyHash;
 };
 
 namespace {
 
 TEST(HashSetTest, MoveOnlyValue) {
   using TheSet = HashSet<MoveOnly>;
   TheSet set;
   {
-    TheSet::AddResult addResult = set.add(MoveOnly(1, 1));
+    TheSet::AddResult addResult = set.insert(MoveOnly(1, 1));
     EXPECT_TRUE(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());
 
   iter = set.find(MoveOnly(2));
   EXPECT_TRUE(iter == set.end());
 
   for (int i = 2; i < 32; ++i) {
-    TheSet::AddResult addResult = set.add(MoveOnly(i, i));
+    TheSet::AddResult addResult = set.insert(MoveOnly(i, i));
     EXPECT_TRUE(addResult.isNewEntry);
     EXPECT_EQ(i, addResult.storedValue->value());
     EXPECT_EQ(i, addResult.storedValue->id());
   }
 
   iter = set.find(MoveOnly(1));
   ASSERT_TRUE(iter != set.end());
   EXPECT_EQ(1, iter->value());
   EXPECT_EQ(1, iter->id());
 
   iter = set.find(MoveOnly(7));
   ASSERT_TRUE(iter != set.end());
   EXPECT_EQ(7, iter->value());
   EXPECT_EQ(7, iter->id());
 
   {
     TheSet::AddResult addResult =
-        set.add(MoveOnly(7, 777));  // With different ID for identification.
+        set.insert(MoveOnly(7, 777));  // With different ID for identification.
     EXPECT_FALSE(addResult.isNewEntry);
     EXPECT_EQ(7, addResult.storedValue->value());
     EXPECT_EQ(7, addResult.storedValue->id());
   }
 
   set.remove(MoveOnly(11));
   iter = set.find(MoveOnly(11));
   EXPECT_TRUE(iter == set.end());
 
   MoveOnly thirteen(set.take(MoveOnly(13)));
   EXPECT_EQ(13, thirteen.value());
   EXPECT_EQ(13, thirteen.id());
   iter = set.find(MoveOnly(13));
   EXPECT_TRUE(iter == set.end());
 
   set.clear();
 }
 
 TEST(HashSetTest, UniquePtr) {
   using Pointer = std::unique_ptr<int>;
   using Set = HashSet<Pointer>;
   Set set;
   int* onePointer = new int(1);
   {
-    Set::AddResult addResult = set.add(Pointer(onePointer));
+    Set::AddResult addResult = set.insert(Pointer(onePointer));
     EXPECT_TRUE(addResult.isNewEntry);
     EXPECT_EQ(onePointer, addResult.storedValue->get());
     EXPECT_EQ(1, **addResult.storedValue);
   }
   auto iter = set.find(onePointer);
   ASSERT_TRUE(iter != set.end());
   EXPECT_EQ(onePointer, iter->get());
 
   Pointer nonexistent(new int(42));
   iter = set.find(nonexistent.get());
   EXPECT_TRUE(iter == set.end());
 
   // Insert more to cause a rehash.
   for (int i = 2; i < 32; ++i) {
-    Set::AddResult addResult = set.add(Pointer(new int(i)));
+    Set::AddResult addResult = set.insert(Pointer(new int(i)));
     EXPECT_TRUE(addResult.isNewEntry);
     EXPECT_EQ(i, **addResult.storedValue);
   }
 
   iter = set.find(onePointer);
   ASSERT_TRUE(iter != set.end());
   EXPECT_EQ(onePointer, iter->get());
 
   Pointer one(set.take(onePointer));
   ASSERT_TRUE(one);
   EXPECT_EQ(onePointer, one.get());
 
   Pointer empty(set.take(nonexistent.get()));
   EXPECT_TRUE(!empty);
 
   iter = set.find(onePointer);
   EXPECT_TRUE(iter == set.end());
 
   // Re-insert to the deleted slot.
   {
-    Set::AddResult addResult = set.add(std::move(one));
+    Set::AddResult addResult = set.insert(std::move(one));
     EXPECT_TRUE(addResult.isNewEntry);
     EXPECT_EQ(onePointer, addResult.storedValue->get());
     EXPECT_EQ(1, **addResult.storedValue);
   }
 }
 
 bool isOneTwoThree(const HashSet<int>& set) {
   return set.size() == 3 && set.contains(1) && set.contains(2) &&
          set.contains(3);
 }
@@ skipping 10 matching lines @@
   EXPECT_EQ(1u, one.size());
   EXPECT_TRUE(one.contains(1));
 
   HashSet<int> oneTwoThree({1, 2, 3});
   EXPECT_EQ(3u, oneTwoThree.size());
   EXPECT_TRUE(oneTwoThree.contains(1));
   EXPECT_TRUE(oneTwoThree.contains(2));
   EXPECT_TRUE(oneTwoThree.contains(3));
 
   // Put some jank so we can check if the assignments later can clear them.
-  empty.add(9999);
-  one.add(9999);
-  oneTwoThree.add(9999);
+  empty.insert(9999);
+  one.insert(9999);
+  oneTwoThree.insert(9999);
 
   empty = {};
   EXPECT_TRUE(empty.isEmpty());
 
   one = {1};
   EXPECT_EQ(1u, one.size());
   EXPECT_TRUE(one.contains(1));
 
   oneTwoThree = {1, 2, 3};
   EXPECT_EQ(3u, oneTwoThree.size());
   EXPECT_TRUE(oneTwoThree.contains(1));
   EXPECT_TRUE(oneTwoThree.contains(2));
   EXPECT_TRUE(oneTwoThree.contains(3));
 
   oneTwoThree = {3, 1, 1, 2, 1, 1, 3};
   EXPECT_EQ(3u, oneTwoThree.size());
   EXPECT_TRUE(oneTwoThree.contains(1));
   EXPECT_TRUE(oneTwoThree.contains(2));
   EXPECT_TRUE(oneTwoThree.contains(3));
 
   // Other ways of construction: as a function parameter and in a return
   // statement.
   EXPECT_TRUE(isOneTwoThree({1, 2, 3}));
   EXPECT_TRUE(isOneTwoThree(returnOneTwoThree()));
 }
 
 }  // anonymous namespace
 
 }  // namespace WTF