Changeset 206115 in webkit

Timestamp:

Sep 19, 2016 1:47:18 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/script-profiler
​https://bugs.webkit.org/show_bug.cgi?id=162101

Patch by Devin Rousso <Devin Rousso> on 2016-09-19
Reviewed by Brian Burg.

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

• inspector/script-profiler/event-type-Other.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/script-profiler/event-type-Other.html (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/script-profiler
+        https://bugs.webkit.org/show_bug.cgi?id=162101
+
+        Reviewed by Brian Burg.
+
+        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
+        tests more readable.
+
+        * inspector/script-profiler/event-type-Other.html:
+
 2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/LayoutTests/inspector/script-profiler/event-type-Other.html

@@ -30 +30 @@
         name: "TrackingSession",
         description: "Start a tracking session that includes multiple web script evaluations classified as an Other event type.",
-        test: function(resolve, reject) {
-            InspectorProtocol.awaitEvent({event: "ScriptProfiler.trackingStart"}).then((messageObject) => {
+        test(resolve, reject) {
+            InspectorProtocol.awaitEvent({event: "ScriptProfiler.trackingStart"})
+            .then((messageObject) => {
                 ProtocolTest.log("ScriptProfiler.trackingStart");
             });
@@ -40 +41 @@
             });
 
-            InspectorProtocol.awaitEvent({event: "ScriptProfiler.trackingComplete"}).then((messageObject) => {
+            InspectorProtocol.awaitEvent({event: "ScriptProfiler.trackingComplete"})
+            .then((messageObject) => {
                 ProtocolTest.log("ScriptProfiler.trackingComplete");
-                resolve();
+            })
+            .then(resolve, reject);
+
+            ProtocolTest.awaitEvent("TestPageTimerEvaluated")
+            .then((event) => {
+                InspectorProtocol.sendCommand("ScriptProfiler.stopTracking", {});
             });
 
@@ -49 +56 @@
             ProtocolTest.evaluateInPage("triggerEventDispatchEvaluation()");
             ProtocolTest.evaluateInPage("triggerTimerEvaluation()");
-            ProtocolTest.singleFireEventListener("TestPageTimerEvaluated", (event) => {
-                InspectorProtocol.sendCommand("ScriptProfiler.stopTracking", {});
-            });
         }
     });