Title: [206116] trunk/LayoutTests
Revision
206116
Author
commit-qu...@webkit.org
Date
2016-09-19 13:49:32 -0700 (Mon, 19 Sep 2016)

Log Message

Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/console
https://bugs.webkit.org/show_bug.cgi?id=162070

Patch by Devin Rousso <dcrousso+web...@gmail.com> on 2016-09-19
Reviewed by Brian Burg.

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

* inspector/console/clearMessages.html:
* inspector/console/command-line-api.html:
* inspector/console/console-time.html:
* inspector/console/messageAdded-from-named-evaluations.html:
* inspector/console/messageAdded-from-worker.html:
* inspector/console/messageRepeatCountUpdated.html:
* inspector/console/messagesCleared.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (206115 => 206116)


--- trunk/LayoutTests/ChangeLog	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/ChangeLog	2016-09-19 20:49:32 UTC (rev 206116)
@@ -1,5 +1,23 @@
 2016-09-19  Devin Rousso  <dcrousso+web...@gmail.com>
 
+        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/console
+        https://bugs.webkit.org/show_bug.cgi?id=162070
+
+        Reviewed by Brian Burg.
+
+        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
+        tests more readable.
+
+        * inspector/console/clearMessages.html:
+        * inspector/console/command-line-api.html:
+        * inspector/console/console-time.html:
+        * inspector/console/messageAdded-from-named-evaluations.html:
+        * inspector/console/messageAdded-from-worker.html:
+        * inspector/console/messageRepeatCountUpdated.html:
+        * inspector/console/messagesCleared.html:
+
+2016-09-19  Devin Rousso  <dcrousso+web...@gmail.com>
+
         Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/script-profiler
         https://bugs.webkit.org/show_bug.cgi?id=162101
 

Modified: trunk/LayoutTests/inspector/console/clearMessages.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/clearMessages.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/clearMessages.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -10,18 +10,20 @@
     suite.addTestCase({
         name: "CallClearMessages",
         description: "Calling the Console.clearMessages command should trigger Console.messagesCleared.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             ConsoleAgent.clearMessages();
 
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 InspectorTest.assert(false, "MessageAdded event should not fire.");
-                reject();
-            });
+            })
+            .then(reject, reject);
 
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+            .then((event) => {
                 InspectorTest.expectThat(event, "Cleared event should fire.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
         }
     });
 

Modified: trunk/LayoutTests/inspector/console/command-line-api.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/command-line-api.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/command-line-api.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -53,12 +53,11 @@
 
     let suite = InspectorTest.createAsyncSuite("Console.TestCommandLineAPI");
 
-    function addAPITestCase(args) {
-        let {title, input, setup} = args;
+    function addAPITestCase({title, input, setup}) {
         suite.addTestCase({
             name: `Evaluate${title}`,
             setup,
-            test: (resolve, reject) => {
+            test(resolve, reject) {
                 InspectorTest.log(`Input: ${input}`);
 
                 function callback(result, wasThrown) {
@@ -91,7 +90,7 @@
     }
 
     function selectElementForDollarZero(resolve, reject) {
-        WebInspector.domTreeManager.requestDocument(function(documentNode) {
+        WebInspector.domTreeManager.requestDocument((documentNode) => {
             if (!documentNode) {
                 InspectorTest.log("FAIL: DOM node not found.");
                 return reject();
@@ -98,7 +97,7 @@
             }
 
             // Select div#foo for $0.
-            WebInspector.domTreeManager.querySelector(documentNode.id, "#foo", function(contentNodeId) {
+            WebInspector.domTreeManager.querySelector(documentNode.id, "#foo", (contentNodeId) => {
                 if (!contentNodeId) {
                     InspectorTest.log("FAIL: DOM node not found.");
                     return reject();

Modified: trunk/LayoutTests/inspector/console/console-time.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/console-time.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/console-time.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -10,7 +10,7 @@
     suite.addTestCase({
         name: "DefaultLabel",
         description: "Test that default label works as expected.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             let seen = 0;
             const expected = 3;
             WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
@@ -38,13 +38,14 @@
     suite.addTestCase({
         name: "UserLabels",
         description: "Test that user labels works as expected.",
-        test: (resolve, reject) => {
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 let message = event.data.message;
                 InspectorTest.expectThat(message.type === WebInspector.ConsoleMessage.MessageType.Timing, "Should receive a Timing type message.");
                 InspectorTest.expectThat(message.messageText.includes("my-label"), "Message should contain the 'my-label' label name somewhere.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
 
             InspectorTest.evaluateInPage("console.time('my-label')");
             InspectorTest.evaluateInPage("console.timeEnd('my-label')");
@@ -54,7 +55,7 @@
     suite.addTestCase({
         name: "MultipleTimers",
         description: "Test that multiple timers running at the same time work as expected.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             let seen = 0;
             const expected = 2;
             WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
@@ -79,7 +80,7 @@
     suite.addTestCase({
         name: "WarnWhenExisting",
         description: "Test for a warning when trying to start an already started timer.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
             function handler(event) {
                 let message = event.data.message;
@@ -104,14 +105,15 @@
     suite.addTestCase({
         name: "WarnWhenNotExisting",
         description: "Test for a warning when trying to start an already started timer.",
-        test: (resolve, reject) => {
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 let message = event.data.message;
                 InspectorTest.expectThat(message.type === WebInspector.ConsoleMessage.MessageType.Timing, "Should receive a Timing type message.");
                 InspectorTest.expectThat(message.level === WebInspector.ConsoleMessage.MessageLevel.Warning, "Should receive a Warning level message.");
                 InspectorTest.expectThat(message.messageText.includes("default"), "Message should contain the 'default' label name somewhere.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
 
             InspectorTest.evaluateInPage("console.timeEnd()");
         }

Modified: trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -20,14 +20,16 @@
     suite.addTestCase({
         name: "TriggerMessageFromNameEvaluation",
         description: "Message from named evaluation should have a source location.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage("triggerMessageFromNamedEvaluation()");
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 let message = event.data.message;
                 let topCallFrame = message.stackTrace.callFrames[0];
                 InspectorTest.expectThat(topCallFrame.sourceCodeLocation.sourceCode.displayName === "named-eval.js", "Log ConsoleMessage top call frame should have sourceURL name.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage("triggerMessageFromNamedEvaluation()");
         }
     });
 
@@ -34,14 +36,16 @@
     suite.addTestCase({
         name: "TriggerExceptionFromNameFunctionConstructorEvaluation",
         description: "Exception message from named Function constructor evaluation should have a source location.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage("setTimeout(triggerExceptionFromNamedFunctionConstructorEvaluation)");
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 let message = event.data.message;
                 let topCallFrame = message.stackTrace.callFrames[0];
                 InspectorTest.expectThat(topCallFrame.sourceCodeLocation.sourceCode.displayName === "named-function-constructor.js", "Exception ConsoleMessage top call frame should have sourceURL name.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage("setTimeout(triggerExceptionFromNamedFunctionConstructorEvaluation)");
         }
     });
 

Modified: trunk/LayoutTests/inspector/console/messageAdded-from-worker.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/messageAdded-from-worker.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/messageAdded-from-worker.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -15,15 +15,21 @@
     suite.addTestCase({
         name: "TriggerConsoleMessagesInWorker",
         description: "Triggered console messages in a Worker should be received.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage("triggerWorkerConsoleLog()");
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
-                InspectorTest.expectThat(event.data.message.messageText === "WORKER STARTED", "MessageAdded event should fire for started log.");
-                WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+        test(resolve, reject) {
+            let eventCount = 0;
+            WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+                ++eventCount;
+
+                if (eventCount === 1)
+                    InspectorTest.expectThat(event.data.message.messageText === "WORKER STARTED", "MessageAdded event should fire for started log.");
+                else if (eventCount === 2) {
                     InspectorTest.expectThat(event.data.message.messageText === "WORKER RECEIVED MESSAGE", "MessageAdded event should fire for received message log.");
                     resolve();
-                });
+                } else
+                    reject();
             });
+
+            InspectorTest.evaluateInPage("triggerWorkerConsoleLog()");
         }
     });
 

Modified: trunk/LayoutTests/inspector/console/messageRepeatCountUpdated.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/messageRepeatCountUpdated.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/messageRepeatCountUpdated.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -13,20 +13,21 @@
     suite.addTestCase({
         name: "AddTestMessage",
         description: "Add a new message, it should have a single repeat count.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage(testMessage);
-
+        test(resolve, reject) {
             let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
                 InspectorTest.assert(false, "Should not fire PreviousMessageRepeatCountUpdated yet.");
                 reject();
             });
 
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 InspectorTest.expectThat(event.data.message instanceof WebInspector.ConsoleMessage, "MessageAdded event should fire.");
                 InspectorTest.expectThat(event.data.message.repeatCount === 1, "ConsoleMessage repeatCount is 1.");
                 WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, listener, null);
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage(testMessage);
         }
     });
 
@@ -34,20 +35,21 @@
         suite.addTestCase({
             name: `RepeatTestMessage${i}`,
             description: "Repeat the last message, it should trigger messageRepeatCountUpdated.",
-            test: (resolve, reject) => {
-                InspectorTest.evaluateInPage(testMessage);
-
+            test(resolve, reject) {
                 let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
                     InspectorTest.assert(false, "Should not fire MessageAdded, this should be a repeat.");
                     reject();
                 });
 
-                WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
+                WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated)
+                .then((event) => {
                     InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire.");
                     InspectorTest.expectThat(event.data.count === (i + 1), `Count should be ${i + 1}.`);
                     WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, listener, null);
-                    resolve();
-                });
+                })
+                .then(resolve, reject);
+
+                InspectorTest.evaluateInPage(testMessage);
             }
         });
     }
@@ -55,20 +57,21 @@
     suite.addTestCase({
         name: "AddDifferentMessage",
         description: "Add a different message, it should reset the repeat count.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage(differentMessage);
-
+        test(resolve, reject) {
             let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
                 InspectorTest.assert(false, "Should not fire PreviousMessageRepeatCountUpdated, this message is different.");
                 reject();
             });
 
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 InspectorTest.expectThat(event.data.message instanceof WebInspector.ConsoleMessage, "MessageAdded event should fire.");
                 InspectorTest.expectThat(event.data.message.repeatCount === 1, "ConsoleMessage repeatCount is 1.");
                 WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, listener, null);
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage(differentMessage);
         }
     });
 
@@ -75,20 +78,21 @@
     suite.addTestCase({
         name: "RepeatDifferentMessage",
         description: "Repeat this different message, it should increment the repeat count.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage(differentMessage);
-
+        test(resolve, reject) {
             let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
                 InspectorTest.assert(false, "Should not fire MessageAdded, this should be a repeat.");
                 reject();
             });
 
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated)
+            .then((event) => {
                 InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire.");
                 InspectorTest.expectThat(event.data.count === 2, "Count should be 2.");
                 WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, listener, null);
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage(differentMessage);
         }
     });
 
@@ -95,20 +99,21 @@
     suite.addTestCase({
         name: "AddTestMessageAgain",
         description: "Add the original message again, it should have a single repeat count.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage(testMessage);
-
+        test(resolve, reject) {
             let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
                 InspectorTest.assert(false, "Should not fire PreviousMessageRepeatCountUpdated yet.");
                 reject();
             });
 
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+            .then((event) => {
                 InspectorTest.expectThat(event.data.message instanceof WebInspector.ConsoleMessage, "MessageAdded event should fire.");
                 InspectorTest.expectThat(event.data.message.repeatCount === 1, "ConsoleMessage repeatCount is 1.");
                 WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, listener, null);
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage(testMessage);
         }
     });
 
@@ -117,15 +122,16 @@
     suite.addTestCase({
         name: "MessagesWithEqualValuesRepeats",
         description: "Repeat messages with equal values should trigger messageRepeatCountUpdated.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated)
+            .then((event) => {
+                InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire for repeat messages with equal values.");
+            })
+            .then(resolve, reject);
+
             const messageWithValues = "console.log('equal parameter values', 1, 2)";
             InspectorTest.evaluateInPage(messageWithValues);
             InspectorTest.evaluateInPage(messageWithValues);
-
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
-                InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire for repeat messages with equal values.");
-                resolve();
-            });
         }
     });
 
@@ -132,11 +138,7 @@
     suite.addTestCase({
         name: "MessagesWithObjectsDoNotRepeat",
         description: "Repeat messages with objects should not trigger messageRepeatCountUpdated.",
-        test: (resolve, reject) => {
-            const messageWithObject = "console.log('object', window)";
-            InspectorTest.evaluateInPage(messageWithObject);
-            InspectorTest.evaluateInPage(messageWithObject);
-
+        test(resolve, reject) {
             let repeatListener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
                 InspectorTest.assert(false, "PreviousMessageRepeatCountUpdated should not fire for repeat messages with object arguments.");
                 reject();
@@ -150,8 +152,12 @@
                     WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, repeatListener, null);
                     WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, addListener, null);
                     resolve();
-                }                
+                }
             });
+
+            const messageWithObject = "console.log('object', window)";
+            InspectorTest.evaluateInPage(messageWithObject);
+            InspectorTest.evaluateInPage(messageWithObject);
         }
     });
 
@@ -158,10 +164,7 @@
     suite.addTestCase({
         name: "MessagesWithDifferentLevelsDoNotRepeat",
         description: "Repeat messages with different levels should not trigger messageRepeatCountUpdated.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage("console.warn('level')");
-            InspectorTest.evaluateInPage("console.error('level')");
-
+        test(resolve, reject) {
             let repeatListener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
                 InspectorTest.assert(false, "PreviousMessageRepeatCountUpdated should not fire for repeat messages with different levels.");
                 reject();
@@ -175,8 +178,11 @@
                     WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, repeatListener, null);
                     WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, addListener, null);
                     resolve();
-                }                
+                }
             });
+
+            InspectorTest.evaluateInPage("console.warn('level')");
+            InspectorTest.evaluateInPage("console.error('level')");
         }
     });
 

Modified: trunk/LayoutTests/inspector/console/messagesCleared.html (206115 => 206116)


--- trunk/LayoutTests/inspector/console/messagesCleared.html	2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/inspector/console/messagesCleared.html	2016-09-19 20:49:32 UTC (rev 206116)
@@ -10,12 +10,14 @@
     suite.addTestCase({
         name: "ClearViaConsoleClearMessagesAPI",
         description: "Calling Console.clearMessages should trigger Console.messagesCleared.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+            .then((event) => {
+                InspectorTest.expectThat(event, "Cleared event should fire.");
+            })
+            .then(resolve, reject);
+
             ConsoleAgent.clearMessages();
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
-                InspectorTest.expectThat(event, "Cleared event should fire.");
-                resolve();
-            });
         }
     });
 
@@ -22,12 +24,14 @@
     suite.addTestCase({
         name: "ClearViaConsoleAPI",
         description: "Calling console.clear() should trigger Console.messagesCleared.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+            .then((event) => {
+                InspectorTest.expectThat(event, "Cleared event should fire.");
+            })
+            .then(resolve, reject);
+
             InspectorTest.evaluateInPage("console.clear()");
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
-                InspectorTest.expectThat(event, "Cleared event should fire.");
-                resolve();
-            });
         }
     });
 
@@ -34,12 +38,14 @@
     suite.addTestCase({
         name: "ClearViaCommandLineAPI",
         description: "Calling `clear()` in the command line API should trigger Console.messagesCleared.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+            .then((event) => {
+                InspectorTest.expectThat(event, "Cleared event should fire.");
+            })
+            .then(resolve, reject);
+
             WebInspector.runtimeManager.evaluateInInspectedWindow("clear()", {objectGroup: "test", includeCommandLineAPI: true}, function(){});
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
-                InspectorTest.expectThat(event, "Cleared event should fire.");
-                resolve();
-            });
         }
     });
 
@@ -46,12 +52,14 @@
     suite.addTestCase({
         name: "ClearViaPageReload",
         description: "Reloading the page should trigger Console.messagesCleared.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+            .then((event) => {
+                InspectorTest.expectThat(event, "Cleared event should fire.");
+            })
+            .then(resolve, reject);
+
             InspectorTest.reloadPage();
-            WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
-                InspectorTest.expectThat(event, "Cleared event should fire.");
-                resolve();
-            });
         }
     });
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to