cppgc: Cleanups around testing

Bug: chromium:1056170
Change-Id: Ic6e40d5e5e9bcca28a8c344adfab06f4e88701aa
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2737302
Auto-Submit: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Omer Katz <omerkatz@chromium.org>
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73231}

src/heap/cppgc/free-list.cc

@@ -170,7 +170,7 @@ bool FreeList::IsEmpty() const {
                      [](const auto* entry) { return !entry; });
 }
 
-bool FreeList::Contains(Block block) const {
+bool FreeList::ContainsForTesting(Block block) const {
   for (Entry* list : free_list_heads_) {
     for (Entry* entry = list; entry; entry = entry->Next()) {
       if (entry <= block.address &&

src/heap/cppgc/free-list.h

@@ -44,10 +44,10 @@ class V8_EXPORT_PRIVATE FreeList {
   size_t Size() const;
   bool IsEmpty() const;
 
-  bool Contains(Block) const;
-
   void CollectStatistics(HeapStatistics::FreeListStatistics&);
 
+  bool ContainsForTesting(Block) const;
+
  private:
   class Entry;
 

test/unittests/heap/cppgc/concurrent-sweeper-unittest.cc

@@ -132,7 +132,7 @@ class ConcurrentSweeperTest : public testing::TestWithHeap {
       // The corresponding page could be removed.
       if (!backend->Lookup(static_cast<ConstAddress>(object))) continue;
 
-      if (!freelist.Contains({object, 0})) return false;
+      if (!freelist.ContainsForTesting({object, 0})) return false;
     }
 
     return true;

test/unittests/heap/cppgc/free-list-unittest.cc

@@ -151,7 +151,7 @@ TEST(FreeListTest, Contains) {
   FreeList list = CreatePopulatedFreeList(blocks);
 
   for (const auto& block : blocks) {
-    EXPECT_TRUE(list.Contains({block.Address(), block.Size()}));
+    EXPECT_TRUE(list.ContainsForTesting({block.Address(), block.Size()}));
   }
 }
 

test/unittests/heap/cppgc/heap-page-unittest.cc

@@ -195,12 +195,12 @@ TEST_F(PageTest, NormalPageCreationDestruction) {
   EXPECT_NE(space->end(), std::find(space->begin(), space->end(), page));
 
   space->free_list().Add({page->PayloadStart(), page->PayloadSize()});
-  EXPECT_TRUE(
-      space->free_list().Contains({page->PayloadStart(), page->PayloadSize()}));
+  EXPECT_TRUE(space->free_list().ContainsForTesting(
+      {page->PayloadStart(), page->PayloadSize()}));
 
   space->free_list().Clear();
-  EXPECT_FALSE(
-      space->free_list().Contains({page->PayloadStart(), page->PayloadSize()}));
+  EXPECT_FALSE(space->free_list().ContainsForTesting(
+      {page->PayloadStart(), page->PayloadSize()}));
   space->RemovePage(page);
   EXPECT_EQ(space->end(), std::find(space->begin(), space->end(), page));
   NormalPage::Destroy(page);

test/unittests/heap/cppgc/sweeper-unittest.cc

@@ -208,12 +208,12 @@ TEST_F(SweeperTest, CoalesceFreeListEntries) {
       object2_start, static_cast<size_t>(object3_end - object2_start)};
 
   EXPECT_EQ(0u, g_destructor_callcount);
-  EXPECT_FALSE(freelist.Contains(coalesced_block));
+  EXPECT_FALSE(freelist.ContainsForTesting(coalesced_block));
 
   Sweep();
 
   EXPECT_EQ(2u, g_destructor_callcount);
-  EXPECT_TRUE(freelist.Contains(coalesced_block));
+  EXPECT_TRUE(freelist.ContainsForTesting(coalesced_block));
 }
 
 namespace {

test/unittests/heap/cppgc/tests.h

@@ -100,7 +100,7 @@ class TestWithHeap : public TestWithPlatform {
 // Restrictive test fixture that supports allocation but will make sure no
 // garbage collection is triggered. This is useful for writing idiomatic
 // tests where object are allocated on the managed heap while still avoiding
-// far reaching test consquences of full garbage collection calls.
+// far reaching test consequences of full garbage collection calls.
 class TestSupportingAllocationOnly : public TestWithHeap {
  protected:
   TestSupportingAllocationOnly();