<!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>[206116] 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/206116">206116</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-19 13:49:32 -0700 (Mon, 19 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/console
https://bugs.webkit.org/show_bug.cgi?id=162070
Patch by Devin Rousso <dcrousso+webkit@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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleclearMessageshtml">trunk/LayoutTests/inspector/console/clearMessages.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolecommandlineapihtml">trunk/LayoutTests/inspector/console/command-line-api.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoletimehtml">trunk/LayoutTests/inspector/console/console-time.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolemessageAddedfromnamedevaluationshtml">trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolemessageAddedfromworkerhtml">trunk/LayoutTests/inspector/console/messageAdded-from-worker.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolemessageRepeatCountUpdatedhtml">trunk/LayoutTests/inspector/console/messageRepeatCountUpdated.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolemessagesClearedhtml">trunk/LayoutTests/inspector/console/messagesCleared.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-19 20:47:18 UTC (rev 206115)
+++ trunk/LayoutTests/ChangeLog 2016-09-19 20:49:32 UTC (rev 206116)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-09-19 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ 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+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/script-profiler
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162101
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleclearMessageshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/clearMessages.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -10,18 +10,20 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "CallClearMessages",
</span><span class="cx"> description: "Calling the Console.clearMessages command should trigger Console.messagesCleared.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> ConsoleAgent.clearMessages();
</span><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.assert(false, "MessageAdded event should not fire.");
</span><del>- reject();
- });
</del><ins>+ })
+ .then(reject, reject);
</ins><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.expectThat(event, "Cleared event should fire.");
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolecommandlineapihtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/command-line-api.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,12 +53,11 @@
</span><span class="cx">
</span><span class="cx"> let suite = InspectorTest.createAsyncSuite("Console.TestCommandLineAPI");
</span><span class="cx">
</span><del>- function addAPITestCase(args) {
- let {title, input, setup} = args;
</del><ins>+ function addAPITestCase({title, input, setup}) {
</ins><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: `Evaluate${title}`,
</span><span class="cx"> setup,
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> InspectorTest.log(`Input: ${input}`);
</span><span class="cx">
</span><span class="cx"> function callback(result, wasThrown) {
</span><span class="lines">@@ -91,7 +90,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function selectElementForDollarZero(resolve, reject) {
</span><del>- WebInspector.domTreeManager.requestDocument(function(documentNode) {
</del><ins>+ WebInspector.domTreeManager.requestDocument((documentNode) => {
</ins><span class="cx"> if (!documentNode) {
</span><span class="cx"> InspectorTest.log("FAIL: DOM node not found.");
</span><span class="cx"> return reject();
</span><span class="lines">@@ -98,7 +97,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Select div#foo for $0.
</span><del>- WebInspector.domTreeManager.querySelector(documentNode.id, "#foo", function(contentNodeId) {
</del><ins>+ WebInspector.domTreeManager.querySelector(documentNode.id, "#foo", (contentNodeId) => {
</ins><span class="cx"> if (!contentNodeId) {
</span><span class="cx"> InspectorTest.log("FAIL: DOM node not found.");
</span><span class="cx"> return reject();
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoletimehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-time.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "DefaultLabel",
</span><span class="cx"> description: "Test that default label works as expected.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let seen = 0;
</span><span class="cx"> const expected = 3;
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
</span><span class="lines">@@ -38,13 +38,14 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "UserLabels",
</span><span class="cx"> description: "Test that user labels works as expected.",
</span><del>- test: (resolve, reject) => {
- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> let message = event.data.message;
</span><span class="cx"> InspectorTest.expectThat(message.type === WebInspector.ConsoleMessage.MessageType.Timing, "Should receive a Timing type message.");
</span><span class="cx"> InspectorTest.expectThat(message.messageText.includes("my-label"), "Message should contain the 'my-label' label name somewhere.");
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
</ins><span class="cx">
</span><span class="cx"> InspectorTest.evaluateInPage("console.time('my-label')");
</span><span class="cx"> InspectorTest.evaluateInPage("console.timeEnd('my-label')");
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "MultipleTimers",
</span><span class="cx"> description: "Test that multiple timers running at the same time work as expected.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let seen = 0;
</span><span class="cx"> const expected = 2;
</span><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
</span><span class="lines">@@ -79,7 +80,7 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "WarnWhenExisting",
</span><span class="cx"> description: "Test for a warning when trying to start an already started timer.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
</span><span class="cx"> function handler(event) {
</span><span class="cx"> let message = event.data.message;
</span><span class="lines">@@ -104,14 +105,15 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "WarnWhenNotExisting",
</span><span class="cx"> description: "Test for a warning when trying to start an already started timer.",
</span><del>- test: (resolve, reject) => {
- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> let message = event.data.message;
</span><span class="cx"> InspectorTest.expectThat(message.type === WebInspector.ConsoleMessage.MessageType.Timing, "Should receive a Timing type message.");
</span><span class="cx"> InspectorTest.expectThat(message.level === WebInspector.ConsoleMessage.MessageLevel.Warning, "Should receive a Warning level message.");
</span><span class="cx"> InspectorTest.expectThat(message.messageText.includes("default"), "Message should contain the 'default' label name somewhere.");
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
</ins><span class="cx">
</span><span class="cx"> InspectorTest.evaluateInPage("console.timeEnd()");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolemessageAddedfromnamedevaluationshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/messageAdded-from-named-evaluations.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,14 +20,16 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "TriggerMessageFromNameEvaluation",
</span><span class="cx"> description: "Message from named evaluation should have a source location.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("triggerMessageFromNamedEvaluation()");
- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> let message = event.data.message;
</span><span class="cx"> let topCallFrame = message.stackTrace.callFrames[0];
</span><span class="cx"> InspectorTest.expectThat(topCallFrame.sourceCodeLocation.sourceCode.displayName === "named-eval.js", "Log ConsoleMessage top call frame should have sourceURL name.");
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage("triggerMessageFromNamedEvaluation()");
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -34,14 +36,16 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "TriggerExceptionFromNameFunctionConstructorEvaluation",
</span><span class="cx"> description: "Exception message from named Function constructor evaluation should have a source location.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("setTimeout(triggerExceptionFromNamedFunctionConstructorEvaluation)");
- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> let message = event.data.message;
</span><span class="cx"> let topCallFrame = message.stackTrace.callFrames[0];
</span><span class="cx"> InspectorTest.expectThat(topCallFrame.sourceCodeLocation.sourceCode.displayName === "named-function-constructor.js", "Exception ConsoleMessage top call frame should have sourceURL name.");
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage("setTimeout(triggerExceptionFromNamedFunctionConstructorEvaluation)");
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolemessageAddedfromworkerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/messageAdded-from-worker.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -15,15 +15,21 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "TriggerConsoleMessagesInWorker",
</span><span class="cx"> description: "Triggered console messages in a Worker should be received.",
</span><del>- 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) => {
</del><ins>+ 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) {
</ins><span class="cx"> InspectorTest.expectThat(event.data.message.messageText === "WORKER RECEIVED MESSAGE", "MessageAdded event should fire for received message log.");
</span><span class="cx"> resolve();
</span><del>- });
</del><ins>+ } else
+ reject();
</ins><span class="cx"> });
</span><ins>+
+ InspectorTest.evaluateInPage("triggerWorkerConsoleLog()");
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolemessageRepeatCountUpdatedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/messageRepeatCountUpdated.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -13,20 +13,21 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "AddTestMessage",
</span><span class="cx"> description: "Add a new message, it should have a single repeat count.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage(testMessage);
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "Should not fire PreviousMessageRepeatCountUpdated yet.");
</span><span class="cx"> reject();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.expectThat(event.data.message instanceof WebInspector.ConsoleMessage, "MessageAdded event should fire.");
</span><span class="cx"> InspectorTest.expectThat(event.data.message.repeatCount === 1, "ConsoleMessage repeatCount is 1.");
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, listener, null);
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage(testMessage);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -34,20 +35,21 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: `RepeatTestMessage${i}`,
</span><span class="cx"> description: "Repeat the last message, it should trigger messageRepeatCountUpdated.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage(testMessage);
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "Should not fire MessageAdded, this should be a repeat.");
</span><span class="cx"> reject();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire.");
</span><span class="cx"> InspectorTest.expectThat(event.data.count === (i + 1), `Count should be ${i + 1}.`);
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, listener, null);
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage(testMessage);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -55,20 +57,21 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "AddDifferentMessage",
</span><span class="cx"> description: "Add a different message, it should reset the repeat count.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage(differentMessage);
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "Should not fire PreviousMessageRepeatCountUpdated, this message is different.");
</span><span class="cx"> reject();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.expectThat(event.data.message instanceof WebInspector.ConsoleMessage, "MessageAdded event should fire.");
</span><span class="cx"> InspectorTest.expectThat(event.data.message.repeatCount === 1, "ConsoleMessage repeatCount is 1.");
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, listener, null);
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage(differentMessage);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -75,20 +78,21 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "RepeatDifferentMessage",
</span><span class="cx"> description: "Repeat this different message, it should increment the repeat count.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage(differentMessage);
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "Should not fire MessageAdded, this should be a repeat.");
</span><span class="cx"> reject();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire.");
</span><span class="cx"> InspectorTest.expectThat(event.data.count === 2, "Count should be 2.");
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, listener, null);
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage(differentMessage);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -95,20 +99,21 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "AddTestMessageAgain",
</span><span class="cx"> description: "Add the original message again, it should have a single repeat count.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage(testMessage);
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let listener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "Should not fire PreviousMessageRepeatCountUpdated yet.");
</span><span class="cx"> reject();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
+ .then((event) => {
</ins><span class="cx"> InspectorTest.expectThat(event.data.message instanceof WebInspector.ConsoleMessage, "MessageAdded event should fire.");
</span><span class="cx"> InspectorTest.expectThat(event.data.message.repeatCount === 1, "ConsoleMessage repeatCount is 1.");
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, listener, null);
</span><del>- resolve();
- });
</del><ins>+ })
+ .then(resolve, reject);
+
+ InspectorTest.evaluateInPage(testMessage);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -117,15 +122,16 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "MessagesWithEqualValuesRepeats",
</span><span class="cx"> description: "Repeat messages with equal values should trigger messageRepeatCountUpdated.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ 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);
+
</ins><span class="cx"> const messageWithValues = "console.log('equal parameter values', 1, 2)";
</span><span class="cx"> InspectorTest.evaluateInPage(messageWithValues);
</span><span class="cx"> InspectorTest.evaluateInPage(messageWithValues);
</span><del>-
- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
- InspectorTest.expectThat(event, "PreviousMessageRepeatCountUpdated should fire for repeat messages with equal values.");
- resolve();
- });
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -132,11 +138,7 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "MessagesWithObjectsDoNotRepeat",
</span><span class="cx"> description: "Repeat messages with objects should not trigger messageRepeatCountUpdated.",
</span><del>- test: (resolve, reject) => {
- const messageWithObject = "console.log('object', window)";
- InspectorTest.evaluateInPage(messageWithObject);
- InspectorTest.evaluateInPage(messageWithObject);
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let repeatListener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "PreviousMessageRepeatCountUpdated should not fire for repeat messages with object arguments.");
</span><span class="cx"> reject();
</span><span class="lines">@@ -150,8 +152,12 @@
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, repeatListener, null);
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, addListener, null);
</span><span class="cx"> resolve();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> });
</span><ins>+
+ const messageWithObject = "console.log('object', window)";
+ InspectorTest.evaluateInPage(messageWithObject);
+ InspectorTest.evaluateInPage(messageWithObject);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -158,10 +164,7 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "MessagesWithDifferentLevelsDoNotRepeat",
</span><span class="cx"> description: "Repeat messages with different levels should not trigger messageRepeatCountUpdated.",
</span><del>- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("console.warn('level')");
- InspectorTest.evaluateInPage("console.error('level')");
-
</del><ins>+ test(resolve, reject) {
</ins><span class="cx"> let repeatListener = WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, (event) => {
</span><span class="cx"> InspectorTest.assert(false, "PreviousMessageRepeatCountUpdated should not fire for repeat messages with different levels.");
</span><span class="cx"> reject();
</span><span class="lines">@@ -175,8 +178,11 @@
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, repeatListener, null);
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, addListener, null);
</span><span class="cx"> resolve();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> });
</span><ins>+
+ InspectorTest.evaluateInPage("console.warn('level')");
+ InspectorTest.evaluateInPage("console.error('level')");
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolemessagesClearedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/messagesCleared.html (206115 => 206116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -10,12 +10,14 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "ClearViaConsoleClearMessagesAPI",
</span><span class="cx"> description: "Calling Console.clearMessages should trigger Console.messagesCleared.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+ .then((event) => {
+ InspectorTest.expectThat(event, "Cleared event should fire.");
+ })
+ .then(resolve, reject);
+
</ins><span class="cx"> ConsoleAgent.clearMessages();
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
- InspectorTest.expectThat(event, "Cleared event should fire.");
- resolve();
- });
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -22,12 +24,14 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "ClearViaConsoleAPI",
</span><span class="cx"> description: "Calling console.clear() should trigger Console.messagesCleared.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+ .then((event) => {
+ InspectorTest.expectThat(event, "Cleared event should fire.");
+ })
+ .then(resolve, reject);
+
</ins><span class="cx"> InspectorTest.evaluateInPage("console.clear()");
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
- InspectorTest.expectThat(event, "Cleared event should fire.");
- resolve();
- });
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -34,12 +38,14 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "ClearViaCommandLineAPI",
</span><span class="cx"> description: "Calling `clear()` in the command line API should trigger Console.messagesCleared.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+ .then((event) => {
+ InspectorTest.expectThat(event, "Cleared event should fire.");
+ })
+ .then(resolve, reject);
+
</ins><span class="cx"> WebInspector.runtimeManager.evaluateInInspectedWindow("clear()", {objectGroup: "test", includeCommandLineAPI: true}, function(){});
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
- InspectorTest.expectThat(event, "Cleared event should fire.");
- resolve();
- });
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -46,12 +52,14 @@
</span><span class="cx"> suite.addTestCase({
</span><span class="cx"> name: "ClearViaPageReload",
</span><span class="cx"> description: "Reloading the page should trigger Console.messagesCleared.",
</span><del>- test: (resolve, reject) => {
</del><ins>+ test(resolve, reject) {
+ WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.Cleared)
+ .then((event) => {
+ InspectorTest.expectThat(event, "Cleared event should fire.");
+ })
+ .then(resolve, reject);
+
</ins><span class="cx"> InspectorTest.reloadPage();
</span><del>- WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.Cleared, (event) => {
- InspectorTest.expectThat(event, "Cleared event should fire.");
- resolve();
- });
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>