<!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>[189226] trunk</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/189226">189226</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-09-01 14:00:19 -0700 (Tue, 01 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: rewrite inspector/console/command-line-api.html to use AsyncTestSuite
https://bugs.webkit.org/show_bug.cgi?id=148637

Reviewed by Darin Adler.

Source/WebInspectorUI:

* UserInterface/Base/Object.js:
(WebInspector.Object.singleFireEventListener):
(WebInspector.Object.singleFireEventListener.let.wrappedCallback): Arrow.

LayoutTests:

* inspector/console/command-line-api-expected.txt:
* inspector/console/command-line-api.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolecommandlineapiexpectedtxt">trunk/LayoutTests/inspector/console/command-line-api-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolecommandlineapihtml">trunk/LayoutTests/inspector/console/command-line-api.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseObjectjs">trunk/Source/WebInspectorUI/UserInterface/Base/Object.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189225 => 189226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-09-01 20:46:33 UTC (rev 189225)
+++ trunk/LayoutTests/ChangeLog        2015-09-01 21:00:19 UTC (rev 189226)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-01  Brian Burg  &lt;bburg@apple.com&gt;
+
+        Web Inspector: rewrite inspector/console/command-line-api.html to use AsyncTestSuite
+        https://bugs.webkit.org/show_bug.cgi?id=148637
+
+        Reviewed by Darin Adler.
+
+        * inspector/console/command-line-api-expected.txt:
+        * inspector/console/command-line-api.html:
+
</ins><span class="cx"> 2015-09-01  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Range.insersectsNode(node) is supposed to return true if node.parent is null
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolecommandlineapiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/command-line-api-expected.txt (189225 => 189226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/command-line-api-expected.txt        2015-09-01 20:46:33 UTC (rev 189225)
+++ trunk/LayoutTests/inspector/console/command-line-api-expected.txt        2015-09-01 21:00:19 UTC (rev 189226)
</span><span class="lines">@@ -2,34 +2,44 @@
</span><span class="cx"> Tests that command line api works.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-STEP: String(keys([3,4]))
-0,1
</del><ins>+== Running test suite: Console.TestCommandLineAPI
+-- Running test case: EvaluateArrayKeys
+Input: keys([3,4])
+Output: 0,1
</ins><span class="cx"> 
</span><del>-STEP: String(values([3,4]))
-3,4
</del><ins>+-- Running test case: EvaluateArrayValues
+Input: values([3,4])
+Output: 3,4
</ins><span class="cx"> 
</span><del>-STEP: String($0)
-[object HTMLParagraphElement]
</del><ins>+-- Running test case: EvaluateDollarZero
+Input: $0
+Output: undefined
</ins><span class="cx"> 
</span><del>-STEP: String($('foo'))
-CONSOLE: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(&quot;#%s&quot;)
-null
</del><ins>+-- Running test case: EvaluateInvalidSelector
+Input: $('foo')
+Output: null
</ins><span class="cx"> 
</span><del>-STEP: String($('#foo'))
-[object HTMLParagraphElement]
</del><ins>+-- Running test case: EvaluateIdSelector
+Input: $('#foo')
+Output: [object HTMLParagraphElement]
</ins><span class="cx"> 
</span><del>-STEP: String($('#foo', document.body))
-[object HTMLParagraphElement]
</del><ins>+-- Running test case: EvaluateIdSelectorWithContext
+Input: $('#foo', document.body)
+Output: [object HTMLParagraphElement]
</ins><span class="cx"> 
</span><del>-STEP: String($('#foo', 'non-node'))
-[object HTMLParagraphElement]
</del><ins>+-- Running test case: EvaluateIdSelectorWithInvalidContext
+Input: $('#foo', 'non-node')
+Output: [object HTMLParagraphElement]
</ins><span class="cx"> 
</span><del>-STEP: String($('#foo', $('#bar')))
-null
</del><ins>+-- Running test case: EvaluateIdSelectorDynamicContext
+Input: $('#foo', $('#bar'))
+Output: null
</ins><span class="cx"> 
</span><del>-STEP: String($$('p'))
-[object HTMLParagraphElement],[object HTMLParagraphElement]
</del><ins>+-- Running test case: EvaluateElementSelectorAll
+Input: $$('p')
+Output: [object HTMLParagraphElement],[object HTMLParagraphElement]
</ins><span class="cx"> 
</span><del>-STEP: String($$('p', document.body))
-[object HTMLParagraphElement],[object HTMLParagraphElement]
</del><ins>+-- Running test case: EvaluateElementSelectorAllWithContext
+Input: $$('p', document.body)
+Output: [object HTMLParagraphElement],[object HTMLParagraphElement]
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolecommandlineapihtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/command-line-api.html (189225 => 189226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/command-line-api.html        2015-09-01 20:46:33 UTC (rev 189225)
+++ trunk/LayoutTests/inspector/console/command-line-api.html        2015-09-01 21:00:19 UTC (rev 189226)
</span><span class="lines">@@ -5,57 +5,116 @@
</span><span class="cx"> &lt;script&gt;
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>-    var currentStepIndex = 0;
-    var steps = [
-        &quot;String(keys([3,4]))&quot;,
-        &quot;String(values([3,4]))&quot;,
-        &quot;String($0)&quot;,
-        &quot;String($('foo'))&quot;,
-        &quot;String($('#foo'))&quot;,
-        &quot;String($('#foo', document.body))&quot;,
-        &quot;String($('#foo', 'non-node'))&quot;,
-        &quot;String($('#foo', $('#bar')))&quot;,
-        &quot;String($$('p'))&quot;,
-        &quot;String($$('p', document.body))&quot;,
</del><ins>+    // Each input is wrapped in the String constructor to force stringification.
+    let testInputs = [
+        {
+            title: &quot;ArrayKeys&quot;,
+            input: &quot;keys([3,4])&quot;,
+        },
+        {
+            title: &quot;ArrayValues&quot;,
+            input: &quot;values([3,4])&quot;,
+        },
+        {
+            title: &quot;DollarZero&quot;,
+            input: &quot;$0&quot;,
+            setup: selectElementForDollarZero,
+        },
+        {
+            title: &quot;InvalidSelector&quot;,
+            input: &quot;$('foo')&quot;,
+            setup: listenForConsoleWarning,
+        },
+        {
+            title: &quot;IdSelector&quot;,
+            input: &quot;$('#foo')&quot;,
+        },
+        {
+            title: &quot;IdSelectorWithContext&quot;,
+            input: &quot;$('#foo', document.body)&quot;,
+        },
+        {
+            title: &quot;IdSelectorWithInvalidContext&quot;,
+            input: &quot;$('#foo', 'non-node')&quot;,
+        },
+        {
+            title: &quot;IdSelectorDynamicContext&quot;,
+            input: &quot;$('#foo', $('#bar'))&quot;,
+        },
+        {
+            title: &quot;ElementSelectorAll&quot;,
+            input: &quot;$$('p')&quot;,
+        },
+        {
+            title: &quot;ElementSelectorAllWithContext&quot;,
+            input: &quot;$$('p', document.body)&quot;,
+        },
</ins><span class="cx">     ];
</span><span class="cx"> 
</span><del>-    var consoleMessage = null;
</del><ins>+    let suite = InspectorTest.createAsyncSuite(&quot;Console.TestCommandLineAPI&quot;);
</ins><span class="cx"> 
</span><del>-    function runSteps()
-    {
-        for (var step of steps) {
-            WebInspector.runtimeManager.evaluateInInspectedWindow(step, &quot;test&quot;, true, true, false, false, false, function(result, wasThrown) {
-                InspectorTest.log(&quot;\nSTEP: &quot; + steps[currentStepIndex]);
-                if (consoleMessage) {
-                    InspectorTest.log(&quot;CONSOLE: &quot; + consoleMessage.messageText);
-                    consoleMessage = null;
</del><ins>+    function addAPITestCase(args) {
+        let {title, input, setup} = args;
+        suite.addTestCase({
+            name: `Evaluate${title}`,
+            setup,
+            test: (resolve, reject) =&gt; {
+                InspectorTest.log(`Input: ${input}`);
+
+                function callback(result, wasThrown) {
+                    if (result) {
+                        InspectorTest.log(`Output: ${result.description}`);
+                        resolve();
+                    } else
+                        reject();
</ins><span class="cx">                 }
</span><del>-                InspectorTest.log(result.description);
</del><span class="cx"> 
</span><del>-                if (++currentStepIndex &gt;= steps.length)
-                    InspectorTest.completeTest();
-            });
-        }
</del><ins>+                const objectGroup = &quot;test&quot;;
+                const includeCommandLineAPI = true;
+                const ignorePauseOnExceptionsAndMute = false;
+                const shouldReturnByValue = false;
+                const shouldGeneratePreview = false;
+                const shouldSaveResult = false;
+                WebInspector.runtimeManager.evaluateInInspectedWindow(`String(${input})`, objectGroup, includeCommandLineAPI, ignorePauseOnExceptionsAndMute, shouldReturnByValue, shouldGeneratePreview, shouldSaveResult, callback);
+            }
+        })
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Detect console warning for $('foo').
-    WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, function(event) {
-        consoleMessage = event.data.message;
-        InspectorTest.assert(consoleMessage instanceof WebInspector.ConsoleMessage);
-    });
</del><ins>+    for (let input of testInputs)
+        addAPITestCase(input);
</ins><span class="cx"> 
</span><del>-    // Select div#foo for $0.
-    WebInspector.domTreeManager.requestDocument(function(documentNode) {
-        WebInspector.domTreeManager.querySelector(documentNode.id, &quot;#foo&quot;, function(contentNodeId) {
-            if (contentNodeId) {
-                ConsoleAgent.addInspectedNode(contentNodeId);
-                runSteps();
-            } else {
</del><ins>+    suite.runTestCasesAndFinish();
+
+    function listenForConsoleWarning(resolve, reject) {
+        // Detect console warning for $('foo').
+        WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) =&gt; {
+            let message = event.data.message;
+            InspectorTest.assert(message instanceof WebInspector.ConsoleMessage);
+            InspectorTest.log(`CONSOLE: ${message.messageText}`);
+        });
+
+        resolve();
+    }
+
+    function selectElementForDollarZero(resolve, reject) {
+        WebInspector.domTreeManager.requestDocument(function(documentNode) {
+            if (!documentNode) {
</ins><span class="cx">                 InspectorTest.log(&quot;FAIL: DOM node not found.&quot;);
</span><del>-                InspectorTest.completeTest();
</del><ins>+                return reject();
</ins><span class="cx">             }
</span><ins>+
+            // Select div#foo for $0.
+            WebInspector.domTreeManager.querySelector(documentNode.id, &quot;#foo&quot;, function(contentNodeId) {
+                if (!contentNodeId) {
+                    InspectorTest.log(&quot;FAIL: DOM node not found.&quot;);
+                    return reject();
+                }
+
+                ConsoleAgent.addInspectedNode(contentNodeId);
+                resolve();
+            });
</ins><span class="cx">         });
</span><del>-    });
</del><ins>+    }
</ins><span class="cx"> }
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;/head&gt;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (189225 => 189226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-09-01 20:46:33 UTC (rev 189225)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-09-01 21:00:19 UTC (rev 189226)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-01  Brian Burg  &lt;bburg@apple.com&gt;
+
+        Web Inspector: rewrite inspector/console/command-line-api.html to use AsyncTestSuite
+        https://bugs.webkit.org/show_bug.cgi?id=148637
+
+        Reviewed by Darin Adler.
+
+        * UserInterface/Base/Object.js:
+        (WebInspector.Object.singleFireEventListener):
+        (WebInspector.Object.singleFireEventListener.let.wrappedCallback): Arrow.
+
</ins><span class="cx"> 2015-09-01  Devin Rousso  &lt;drousso@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: New rule button in the style sidebar is blurry and too dark
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Object.js (189225 => 189226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Object.js        2015-09-01 20:46:33 UTC (rev 189225)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Object.js        2015-09-01 21:00:19 UTC (rev 189226)
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx"> 
</span><span class="cx">     static singleFireEventListener(eventType, listener, thisObject)
</span><span class="cx">     {
</span><del>-        let wrappedCallback = function() {
</del><ins>+        let wrappedCallback = () =&gt; {
</ins><span class="cx">             this.removeEventListener(eventType, wrappedCallback, null);
</span><span class="cx">             listener.apply(thisObject, arguments);
</span><del>-        }.bind(this);
</del><ins>+        };
</ins><span class="cx"> 
</span><span class="cx">         this.addEventListener(eventType, wrappedCallback, null);
</span><span class="cx">         return wrappedCallback;
</span></span></pre>
</div>
</div>

</body>
</html>