Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: third_party/WebKit/Source/wtf/HashSetTest.cpp

Issue 1611343002: wtf reformat test Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pydent Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/wtf/HashSet.h ('k') | third_party/WebKit/Source/wtf/HashTable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/wtf/HashSetTest.cpp
diff --git a/third_party/WebKit/Source/wtf/HashSetTest.cpp b/third_party/WebKit/Source/wtf/HashSetTest.cpp
index c5d364ff30ef6a73d6203f336ad85db0d5e44586..37c21ed8d55c21373330a4e4f00df0c6d2ad8980 100644
--- a/third_party/WebKit/Source/wtf/HashSetTest.cpp
+++ b/third_party/WebKit/Source/wtf/HashSetTest.cpp
@@ -34,175 +34,172 @@ namespace WTF {
namespace {
-template<unsigned size> void testReserveCapacity();
-template<> void testReserveCapacity<0>() {}
-template<unsigned size> void testReserveCapacity()
-{
- HashSet<int> testSet;
-
- // Initial capacity is zero.
- EXPECT_EQ(0UL, testSet.capacity());
-
- 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'.
- 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);
- EXPECT_EQ(initialCapacity, testSet.capacity());
- }
-
- // Adding one more item increases the capacity.
- testSet.add(capacityLimit + 1);
- EXPECT_GT(testSet.capacity(), initialCapacity);
-
- testReserveCapacity<size-1>();
+template <unsigned size>
+void testReserveCapacity();
+template <>
+void testReserveCapacity<0>() {}
+template <unsigned size>
+void testReserveCapacity() {
+ HashSet<int> testSet;
+
+ // Initial capacity is zero.
+ EXPECT_EQ(0UL, testSet.capacity());
+
+ 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'.
+ 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);
+ EXPECT_EQ(initialCapacity, testSet.capacity());
+ }
+
+ // Adding one more item increases the capacity.
+ testSet.add(capacityLimit + 1);
+ EXPECT_GT(testSet.capacity(), initialCapacity);
+
+ testReserveCapacity<size - 1>();
}
-TEST(HashSetTest, ReserveCapacity)
-{
- testReserveCapacity<128>();
+TEST(HashSetTest, ReserveCapacity) {
+ testReserveCapacity<128>();
}
struct Dummy {
- Dummy(bool& deleted) : deleted(deleted) { }
+ Dummy(bool& deleted) : deleted(deleted) {}
- ~Dummy()
- {
- deleted = true;
- }
+ ~Dummy() { deleted = true; }
- bool& deleted;
+ bool& deleted;
};
-TEST(HashSetTest, HashSetOwnPtr)
-{
- bool deleted1 = false, deleted2 = false;
-
- typedef HashSet<OwnPtr<Dummy>> OwnPtrSet;
+TEST(HashSetTest, HashSetOwnPtr) {
+ bool deleted1 = false, deleted2 = false;
+
+ typedef HashSet<OwnPtr<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<OwnPtr<Dummy>>::AddResult res1 = set.add(adoptPtr(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));
+
+ Dummy* ptr2 = new Dummy(deleted2);
+ {
+ HashSet<OwnPtr<Dummy>>::AddResult res2 = set.add(adoptPtr(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));
+
+ set.remove(ptr1);
+ EXPECT_TRUE(deleted1);
+
+ set.clear();
+ EXPECT_TRUE(deleted2);
+ EXPECT_TRUE(set.isEmpty());
+
+ deleted1 = false;
+ deleted2 = false;
+ {
OwnPtrSet set;
-
- Dummy* ptr1 = new Dummy(deleted1);
- {
- // AddResult in a separate scope to avoid assertion hit,
- // since we modify the container further.
- HashSet<OwnPtr<Dummy>>::AddResult res1 = set.add(adoptPtr(ptr1));
- EXPECT_EQ(ptr1, res1.storedValue->get());
- }
-
- EXPECT_FALSE(deleted1);
+ set.add(adoptPtr(new Dummy(deleted1)));
+ set.add(adoptPtr(new Dummy(deleted2)));
+ }
+ EXPECT_TRUE(deleted1);
+ EXPECT_TRUE(deleted2);
+
+ deleted1 = false;
+ deleted2 = false;
+ OwnPtr<Dummy> ownPtr1;
+ OwnPtr<Dummy> ownPtr2;
+ ptr1 = new Dummy(deleted1);
+ ptr2 = new Dummy(deleted2);
+ {
+ OwnPtrSet set;
+ set.add(adoptPtr(ptr1));
+ set.add(adoptPtr(ptr2));
+ ownPtr1 = set.take(ptr1);
EXPECT_EQ(1UL, set.size());
- OwnPtrSet::iterator it1 = set.find(ptr1);
- EXPECT_NE(set.end(), it1);
- EXPECT_EQ(ptr1, (*it1));
-
- Dummy* ptr2 = new Dummy(deleted2);
- {
- HashSet<OwnPtr<Dummy>>::AddResult res2 = set.add(adoptPtr(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));
-
- set.remove(ptr1);
- EXPECT_TRUE(deleted1);
-
- set.clear();
- EXPECT_TRUE(deleted2);
+ ownPtr2 = set.takeAny();
EXPECT_TRUE(set.isEmpty());
+ }
+ EXPECT_FALSE(deleted1);
+ EXPECT_FALSE(deleted2);
- deleted1 = false;
- deleted2 = false;
- {
- OwnPtrSet set;
- set.add(adoptPtr(new Dummy(deleted1)));
- set.add(adoptPtr(new Dummy(deleted2)));
- }
- EXPECT_TRUE(deleted1);
- EXPECT_TRUE(deleted2);
-
- deleted1 = false;
- deleted2 = false;
- OwnPtr<Dummy> ownPtr1;
- OwnPtr<Dummy> ownPtr2;
- ptr1 = new Dummy(deleted1);
- ptr2 = new Dummy(deleted2);
- {
- OwnPtrSet set;
- set.add(adoptPtr(ptr1));
- set.add(adoptPtr(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);
- EXPECT_EQ(ptr2, ownPtr2);
+ EXPECT_EQ(ptr1, ownPtr1);
+ EXPECT_EQ(ptr2, ownPtr2);
}
class DummyRefCounted : public RefCounted<DummyRefCounted> {
-public:
- DummyRefCounted(bool& isDeleted) : m_isDeleted(isDeleted) { m_isDeleted = false; }
- ~DummyRefCounted() { m_isDeleted = true; }
+ public:
+ DummyRefCounted(bool& isDeleted) : m_isDeleted(isDeleted) {
+ m_isDeleted = false;
+ }
+ ~DummyRefCounted() { m_isDeleted = true; }
- void ref()
- {
- WTF::RefCounted<DummyRefCounted>::ref();
- ++s_refInvokesCount;
- }
+ void ref() {
+ WTF::RefCounted<DummyRefCounted>::ref();
+ ++s_refInvokesCount;
+ }
- static int s_refInvokesCount;
+ static int s_refInvokesCount;
-private:
- bool& m_isDeleted;
+ private:
+ 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);
- // 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));
-
- ptr.clear();
- EXPECT_FALSE(isDeleted);
-
- set.remove(rawPtr);
- EXPECT_TRUE(isDeleted);
- EXPECT_TRUE(set.isEmpty());
- EXPECT_EQ(1, DummyRefCounted::s_refInvokesCount);
+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);
+ // 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));
+
+ ptr.clear();
+ EXPECT_FALSE(isDeleted);
+
+ set.remove(rawPtr);
+ EXPECT_TRUE(isDeleted);
+ EXPECT_TRUE(set.isEmpty());
+ EXPECT_EQ(1, DummyRefCounted::s_refInvokesCount);
}
-} // anonymous namespace
+} // anonymous namespace
-} // namespace WTF
+} // namespace WTF
« no previous file with comments | « third_party/WebKit/Source/wtf/HashSet.h ('k') | third_party/WebKit/Source/wtf/HashTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698