<!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>[206111] trunk/LayoutTests</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/206111">206111</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-19 13:41:28 -0700 (Mon, 19 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/indexeddb
https://bugs.webkit.org/show_bug.cgi?id=162073

Patch by Devin Rousso &lt;dcrousso+webkit@gmail.com&gt; on 2016-09-19
Reviewed by Brian Burg.

Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
tests more readable.

* inspector/indexeddb/clearObjectStore.html:
* inspector/indexeddb/deleteDatabaseNamesWithSpace.html:
* inspector/indexeddb/requestDatabase.html:
* inspector/indexeddb/requestDatabaseNames.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorindexeddbclearObjectStorehtml">trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html</a></li>
<li><a href="#trunkLayoutTestsinspectorindexeddbdeleteDatabaseNamesWithSpacehtml">trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html</a></li>
<li><a href="#trunkLayoutTestsinspectorindexeddbrequestDatabasehtml">trunk/LayoutTests/inspector/indexeddb/requestDatabase.html</a></li>
<li><a href="#trunkLayoutTestsinspectorindexeddbrequestDatabaseNameshtml">trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206110 => 206111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/ChangeLog        2016-09-19 20:41:28 UTC (rev 206111)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-19  Devin Rousso  &lt;dcrousso+webkit@gmail.com&gt;
+
+        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/indexeddb
+        https://bugs.webkit.org/show_bug.cgi?id=162073
+
+        Reviewed by Brian Burg.
+
+        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
+        tests more readable.
+
+        * inspector/indexeddb/clearObjectStore.html:
+        * inspector/indexeddb/deleteDatabaseNamesWithSpace.html:
+        * inspector/indexeddb/requestDatabase.html:
+        * inspector/indexeddb/requestDatabaseNames.html:
+
</ins><span class="cx"> 2016-09-19  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Window's pageXOffset / pageYOffset attributes should be replaceable
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorindexeddbclearObjectStorehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html (206110 => 206111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html        2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html        2016-09-19 20:41:28 UTC (rev 206111)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;ClearDatabases&quot;,
</span><span class="cx">         description: &quot;Remove any existing IndexedDB databases.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
</span><span class="cx">             // &lt;https://webkit.org/b/148006&gt; Each test should run with its own clean data store
</span><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateDatabaseAndClearObjectStore&quot;,
</span><span class="cx">         description: &quot;Ensure that clearing an object store clears entries in that object store.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             InspectorTest.evaluateInPage(&quot;createDatabaseWithStores('CompleteDatabase', 1)&quot;);
</span><span class="cx">             IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, &quot;CompleteDatabase&quot;, (error, database) =&gt; {
</span><span class="cx">                 InspectorTest.expectNoError(error);
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> 
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;NoSuchObjectStore&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('EmptyDatabase', 1)&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, &quot;EmptyDatabase&quot;, (error, database) =&gt; {
</span><span class="cx">                     IndexedDBAgent.clearObjectStore(WebInspector.frameResourceManager.mainFrame.securityOrigin, database.name, &quot;NoSuchObjectStore&quot;, (error) =&gt; {
</span><span class="cx">                         InspectorTest.expectThat(error, &quot;Should be an error attempting to clear an object store that does not exist.&quot;);
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx">                     });
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('EmptyDatabase', 1)&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorindexeddbdeleteDatabaseNamesWithSpacehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html (206110 => 206111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html        2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html        2016-09-19 20:41:28 UTC (rev 206111)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;ClearDatabases&quot;,
</span><span class="cx">         description: &quot;Remove any existing IndexedDB databases.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
</span><span class="cx">             // &lt;https://webkit.org/b/148006&gt; Each test should run with its own clean data store
</span><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;EnsureNoDatabases&quot;,
</span><span class="cx">         description: &quot;Ensure no databases exist at the start.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                 InspectorTest.expectNoError(error);
</span><span class="cx">                 InspectorTest.expectThat(names.length === 0, &quot;No IndexedDB databases should exist initially.&quot;);
</span><span class="lines">@@ -35,16 +35,18 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateDatabaseWithSpacesInName&quot;,
</span><span class="cx">         description: &quot;Create a database with spaces in the name.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('Database With Space')&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     InspectorTest.expectThat(names.length === 1, &quot;A single IndexedDB database should exist.&quot;);
</span><span class="cx">                     InspectorTest.log(JSON.stringify(names));
</span><span class="cx">                     resolve();
</span><del>-                });                
</del><ins>+                });
</ins><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('Database With Space')&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;DeleteDatabaseWithSpacesInName&quot;,
</span><span class="cx">         description: &quot;Delete the database.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             InspectorTest.evaluateInPage(&quot;deleteDatabaseNames(['Database With Space'])&quot;);
</span><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                 InspectorTest.expectNoError(error);
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorindexeddbrequestDatabasehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/indexeddb/requestDatabase.html (206110 => 206111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/indexeddb/requestDatabase.html        2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/requestDatabase.html        2016-09-19 20:41:28 UTC (rev 206111)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;ClearDatabases&quot;,
</span><span class="cx">         description: &quot;Remove any existing IndexedDB databases.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
</span><span class="cx">             // &lt;https://webkit.org/b/148006&gt; Each test should run with its own clean data store
</span><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="lines">@@ -22,9 +22,9 @@
</span><span class="cx"> 
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateAndRequestEmptyDatabase&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('EmptyDatabase', 123)&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, &quot;EmptyDatabase&quot;, (error, databaseWithObjectStores) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     InspectorTest.expectThat(databaseWithObjectStores.name === &quot;EmptyDatabase&quot;, &quot;Database name should be 'EmptyDatabase'.&quot;);
</span><span class="lines">@@ -33,14 +33,16 @@
</span><span class="cx">                     resolve();
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('EmptyDatabase', 123)&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateAndRequestDatabaseWithStores&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createDatabaseWithStores('CompleteDatabase', 456)&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, &quot;CompleteDatabase&quot;, (error, databaseWithObjectStores) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     let objectStores = databaseWithObjectStores.objectStores;
</span><span class="lines">@@ -71,6 +73,8 @@
</span><span class="cx">                     resolve();
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createDatabaseWithStores('CompleteDatabase', 456)&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorindexeddbrequestDatabaseNameshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html (206110 => 206111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html        2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html        2016-09-19 20:41:28 UTC (rev 206111)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;ClearDatabases&quot;,
</span><span class="cx">         description: &quot;Remove any existing IndexedDB databases.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
</span><span class="cx">             // &lt;https://webkit.org/b/148006&gt; Each test should run with its own clean data store
</span><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;EnsureNoDatabases&quot;,
</span><span class="cx">         description: &quot;Ensure no databases exist at the start.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
</del><ins>+        test(resolve, reject) {
</ins><span class="cx">             IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                 InspectorTest.expectNoError(error);
</span><span class="cx">                 InspectorTest.expectThat(names.length === 0, &quot;No IndexedDB databases should exist initially.&quot;);
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateDatabase1&quot;,
</span><span class="cx">         description: &quot;Create a first database.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('Database1')&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     InspectorTest.expectThat(names.length === 1, &quot;A single IndexedDB database should exist.&quot;);
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx">                     resolve();
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('Database1')&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -51,9 +53,9 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateDatabase2&quot;,
</span><span class="cx">         description: &quot;Create a second database.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('Database2')&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     InspectorTest.expectThat(names.length === 2, &quot;Two IndexedDB databases should exist.&quot;);
</span><span class="lines">@@ -61,6 +63,8 @@
</span><span class="cx">                     resolve();
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('Database2')&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -67,9 +71,9 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateDatabase3&quot;,
</span><span class="cx">         description: &quot;Create a third database with a unicode name.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('\u124d')&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     InspectorTest.expectThat(names.length === 3, &quot;Three IndexedDB databases should exist.&quot;);
</span><span class="lines">@@ -77,6 +81,8 @@
</span><span class="cx">                     resolve();
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('\u124d')&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -83,9 +89,9 @@
</span><span class="cx">     suite.addTestCase({
</span><span class="cx">         name: &quot;CreateDatabase4&quot;,
</span><span class="cx">         description: &quot;Create a fourth database with a unicode name.&quot;,
</span><del>-        test: (resolve, reject) =&gt; {
-            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('\ud800\udf46')&quot;);
-            InspectorTest.singleFireEventListener(&quot;DatabaseCreated&quot;, (event) =&gt; {
</del><ins>+        test(resolve, reject) {
+            InspectorTest.awaitEvent(&quot;DatabaseCreated&quot;)
+            .then((event) =&gt; {
</ins><span class="cx">                 IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) =&gt; {
</span><span class="cx">                     InspectorTest.expectNoError(error);
</span><span class="cx">                     InspectorTest.expectThat(names.length === 4, &quot;Four IndexedDB databases should exist.&quot;);
</span><span class="lines">@@ -93,6 +99,8 @@
</span><span class="cx">                     resolve();
</span><span class="cx">                 });
</span><span class="cx">             });
</span><ins>+
+            InspectorTest.evaluateInPage(&quot;createEmptyDatabase('\ud800\udf46')&quot;);
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>