<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[265768] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/265768">265768</a></dd>
<dt>Author</dt> <dd>Hironori.Fujii@sony.com</dd>
<dt>Date</dt> <dd>2020-08-17 12:54:18 -0700 (Mon, 17 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[TestWebKitAPI] Some WTF_HashMap tests are failing if TestWTF is executed directly
https://bugs.webkit.org/show_bug.cgi?id=215556

Reviewed by Darin Adler.

Some tests using RefLogger were failing if TestWTF is executed
directly without run-api-tests test driver script. Subsequent
tests were failing due to extra "deref(a) " which is a leftover of
the previous tests. Because run-api-tests is spawning a TestWTF
process for each test, it hides this issue.

* TestWebKitAPI/Tests/WTF/HashCountedSet.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/HashMap.cpp:
(TestWebKitAPI::TEST):
Added blocks or calling clear() method to destroy local variables and added more
EXPECT_STREQ("deref(a) ", takeLogStr().c_str()).</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashCountedSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashCountedSet.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashMapcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (265767 => 265768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-08-17 19:29:18 UTC (rev 265767)
+++ trunk/Tools/ChangeLog       2020-08-17 19:54:18 UTC (rev 265768)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-08-17  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TestWebKitAPI] Some WTF_HashMap tests are failing if TestWTF is executed directly
+        https://bugs.webkit.org/show_bug.cgi?id=215556
+
+        Reviewed by Darin Adler.
+
+        Some tests using RefLogger were failing if TestWTF is executed
+        directly without run-api-tests test driver script. Subsequent
+        tests were failing due to extra "deref(a) " which is a leftover of
+        the previous tests. Because run-api-tests is spawning a TestWTF
+        process for each test, it hides this issue.
+
+        * TestWebKitAPI/Tests/WTF/HashCountedSet.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WTF/HashMap.cpp:
+        (TestWebKitAPI::TEST):
+        Added blocks or calling clear() method to destroy local variables and added more
+        EXPECT_STREQ("deref(a) ", takeLogStr().c_str()).
+
</ins><span class="cx"> 2020-08-17  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE] Fix file url in WPEQt api test
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashCountedSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashCountedSet.cpp (265767 => 265768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashCountedSet.cpp   2020-08-17 19:29:18 UTC (rev 265767)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashCountedSet.cpp      2020-08-17 19:54:18 UTC (rev 265768)
</span><span class="lines">@@ -353,120 +353,144 @@
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_Add)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    hashCountedSet.add(ptr);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        hashCountedSet.add(ptr);
</ins><span class="cx"> 
</span><del>-    ASSERT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
-    EXPECT_EQ(1U, hashCountedSet.count(ptr));
-    EXPECT_EQ(1U, hashCountedSet.count(ptr.get()));
</del><ins>+        ASSERT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
+        EXPECT_EQ(1U, hashCountedSet.count(ptr));
+        EXPECT_EQ(1U, hashCountedSet.count(ptr.get()));
+    }
+
+    EXPECT_STREQ("deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_AddUsingRelease)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    hashCountedSet.add(WTFMove(ptr));
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        hashCountedSet.add(WTFMove(ptr));
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_AddUsingMove)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    hashCountedSet.add(WTFMove(ptr));
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        hashCountedSet.add(WTFMove(ptr));
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_AddUsingRaw)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    hashCountedSet.add(ptr.get());
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        hashCountedSet.add(ptr.get());
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
-    EXPECT_EQ(1U, hashCountedSet.count(ptr));
-    EXPECT_EQ(1U, hashCountedSet.count(ptr.get()));
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
+        EXPECT_EQ(1U, hashCountedSet.count(ptr));
+        EXPECT_EQ(1U, hashCountedSet.count(ptr.get()));
+    }
+
+    EXPECT_STREQ("deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_AddKeyAlreadyPresent)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr(&a);
-        hashCountedSet.add(ptr);
-    }
</del><ins>+        {
+            RefPtr<RefLogger> ptr(&a);
+            hashCountedSet.add(ptr);
+        }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr2(&a);
-        auto addResult = hashCountedSet.add(ptr2);
-        EXPECT_FALSE(addResult.isNewEntry);
</del><ins>+        {
+            RefPtr<RefLogger> ptr2(&a);
+            auto addResult = hashCountedSet.add(ptr2);
+            EXPECT_FALSE(addResult.isNewEntry);
+        }
+
+        EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_AddUsingReleaseKeyAlreadyPresent)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr(&a);
-        hashCountedSet.add(ptr);
-    }
</del><ins>+        {
+            RefPtr<RefLogger> ptr(&a);
+            hashCountedSet.add(ptr);
+        }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr2(&a);
-        auto addResult = hashCountedSet.add(WTFMove(ptr2));
-        EXPECT_FALSE(addResult.isNewEntry);
</del><ins>+        {
+            RefPtr<RefLogger> ptr2(&a);
+            auto addResult = hashCountedSet.add(WTFMove(ptr2));
+            EXPECT_FALSE(addResult.isNewEntry);
+        }
+
+        EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, RefPtrKey_AddUsingMoveKeyAlreadyPresent)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</del><ins>+        HashCountedSet<RefPtr<RefLogger>> hashCountedSet;
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr(&a);
-        hashCountedSet.add(ptr);
-    }
</del><ins>+        {
+            RefPtr<RefLogger> ptr(&a);
+            hashCountedSet.add(ptr);
+        }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr2(&a);
-        auto addResult = hashCountedSet.add(WTFMove(ptr2));
-        EXPECT_FALSE(addResult.isNewEntry);
</del><ins>+        {
+            RefPtr<RefLogger> ptr2(&a);
+            auto addResult = hashCountedSet.add(WTFMove(ptr2));
+            EXPECT_FALSE(addResult.isNewEntry);
+        }
+
+        EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashCountedSet, Values)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (265767 => 265768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp  2020-08-17 19:29:18 UTC (rev 265767)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp     2020-08-17 19:54:18 UTC (rev 265768)
</span><span class="lines">@@ -308,50 +308,58 @@
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_Add)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.add(ptr, 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.add(ptr, 0);
+    }
</ins><span class="cx"> 
</span><del>-    ASSERT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+    ASSERT_STREQ("ref(a) ref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_AddUsingRelease)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.add(WTFMove(ptr), 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.add(WTFMove(ptr), 0);
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_AddUsingMove)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.add(WTFMove(ptr), 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.add(WTFMove(ptr), 0);
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_AddUsingRaw)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.add(ptr.get(), 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.add(ptr.get(), 0);
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) ref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_AddKeyAlreadyPresent)
</span><span class="lines">@@ -374,6 +382,10 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><ins>+
+    map.clear();
+
+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_AddUsingReleaseKeyAlreadyPresent)
</span><span class="lines">@@ -396,6 +408,10 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><ins>+
+    map.clear();
+
+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_AddUsingMoveKeyAlreadyPresent)
</span><span class="lines">@@ -418,118 +434,142 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><ins>+
+    map.clear();
+
+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_Set)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(ptr, 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(ptr, 0);
+    }
</ins><span class="cx"> 
</span><del>-    ASSERT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+    ASSERT_STREQ("ref(a) ref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_SetUsingRelease)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(WTFMove(ptr), 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(WTFMove(ptr), 0);
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_SetUsingMove)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(WTFMove(ptr), 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(WTFMove(ptr), 0);
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_SetUsingRaw)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(ptr.get(), 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(ptr.get(), 0);
+    }
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("ref(a) ref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_SetKeyAlreadyPresent)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(ptr, 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(ptr, 0);
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr2(&a);
-        auto addResult = map.set(ptr2, 1);
-        EXPECT_FALSE(addResult.isNewEntry);
-        EXPECT_EQ(1, map.get(ptr.get()));
</del><ins>+        {
+            RefPtr<RefLogger> ptr2(&a);
+            auto addResult = map.set(ptr2, 1);
+            EXPECT_FALSE(addResult.isNewEntry);
+            EXPECT_EQ(1, map.get(ptr.get()));
+        }
+
+        EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_SetUsingReleaseKeyAlreadyPresent)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(ptr, 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(ptr, 0);
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr2(&a);
-        auto addResult = map.set(WTFMove(ptr2), 1);
-        EXPECT_FALSE(addResult.isNewEntry);
-        EXPECT_EQ(1, map.get(ptr.get()));
</del><ins>+        {
+            RefPtr<RefLogger> ptr2(&a);
+            auto addResult = map.set(WTFMove(ptr2), 1);
+            EXPECT_FALSE(addResult.isNewEntry);
+            EXPECT_EQ(1, map.get(ptr.get()));
+        }
+
+        EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, RefPtrKey_SetUsingMoveKeyAlreadyPresent)
</span><span class="cx"> {
</span><del>-    DerivedRefLogger a("a");
</del><ins>+    {
+        DerivedRefLogger a("a");
</ins><span class="cx"> 
</span><del>-    HashMap<RefPtr<RefLogger>, int> map;
</del><ins>+        HashMap<RefPtr<RefLogger>, int> map;
</ins><span class="cx"> 
</span><del>-    RefPtr<RefLogger> ptr(&a);
-    map.set(ptr, 0);
</del><ins>+        RefPtr<RefLogger> ptr(&a);
+        map.set(ptr, 0);
</ins><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</del><ins>+        EXPECT_STREQ("ref(a) ref(a) ", takeLogStr().c_str());
</ins><span class="cx"> 
</span><del>-    {
-        RefPtr<RefLogger> ptr2(&a);
-        auto addResult = map.set(WTFMove(ptr2), 1);
-        EXPECT_FALSE(addResult.isNewEntry);
-        EXPECT_EQ(1, map.get(ptr.get()));
</del><ins>+        {
+            RefPtr<RefLogger> ptr2(&a);
+            auto addResult = map.set(WTFMove(ptr2), 1);
+            EXPECT_FALSE(addResult.isNewEntry);
+            EXPECT_EQ(1, map.get(ptr.get()));
+        }
+
+        EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EXPECT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</del><ins>+    EXPECT_STREQ("deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WTF_HashMap, Ensure)
</span><span class="lines">@@ -590,6 +630,10 @@
</span><span class="cx"> 
</span><span class="cx">     map.ensure(1, [&] { return RefPtr<RefLogger>(&a); });
</span><span class="cx">     EXPECT_STREQ("", takeLogStr().c_str());
</span><ins>+
+    map.clear();
+
+    EXPECT_STREQ("deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> class ObjectWithRefLogger {
</span></span></pre>
</div>
</div>

</body>
</html>