Changeset 206117 in webkit

Timestamp:

Sep 19, 2016 2:07:31 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/unit-tests
​https://bugs.webkit.org/show_bug.cgi?id=162103

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/unit-tests/inspector-test-dispatch-event-to-frontend.html:
• inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html (modified) (1 diff)
• inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

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

trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html

@@ -11 +11 @@
         name: "InspectorTest.TestPage.dispatchEventToFrontend",
         description: "Ensure TestPage.dispatchEventToFrontend works with an InspectorTest.",
-        test: (resolve, reject) => {
-            InspectorTest.evaluateInPage("TestPage.dispatchEventToFrontend('MyEvent', {count: 1})");
-            InspectorTest.singleFireEventListener("MyEvent", (event) => {
+        test(resolve, reject) {
+            InspectorTest.awaitEvent("MyEvent")
+            .then((event) => {
                 InspectorTest.pass("Received Event");
                 InspectorTest.expectThat(event.type === "MyEvent", "Event name should be the event dispatched.");
                 InspectorTest.expectThat(event.data.count === 1, "Event data should be included.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            InspectorTest.evaluateInPage("TestPage.dispatchEventToFrontend('MyEvent', {count: 1})");
         },
     });

trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html

@@ -11 +11 @@
         name: "ProtocolTest.TestPage.dispatchEventToFrontend",
         description: "Ensure TestPage.dispatchEventToFrontend works with a ProtocolTest.",
-        test: (resolve, reject) => {
-            ProtocolTest.evaluateInPage("TestPage.dispatchEventToFrontend('MyEvent', {count: 1})");
-            ProtocolTest.singleFireEventListener("MyEvent", (event) => {
+        test(resolve, reject) {
+            ProtocolTest.awaitEvent("MyEvent")
+            .then((event) => {
                 ProtocolTest.pass("Received Event");
                 ProtocolTest.expectThat(event.type === "MyEvent", "Event name should be the event dispatched.");
                 ProtocolTest.expectThat(event.data.count === 1, "Event data should be included.");
-                resolve();
-            });
+            })
+            .then(resolve, reject);
+
+            ProtocolTest.evaluateInPage("TestPage.dispatchEventToFrontend('MyEvent', {count: 1})");
         },
     });