<!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>[188267] 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/188267">188267</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-11 11:28:31 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: use different namespaces in test fixtures for protocol tests and frontend tests
https://bugs.webkit.org/show_bug.cgi?id=147787
Patch by Brian Burg <bburg@apple.com> on 2015-08-11
Reviewed by Timothy Hatcher.
Refactor test methods to use three distinct namespaces to reflect their implementation:
- InspectorProtocol contains commands that are only used from within protocol tests.
This includes sending and receiving protocol messages and checking message errors.
- InspectorTest contains test methods for full inspector frontend tests.
- ProtocolTest contains test methods for protocol tests.
In a subsequent patch, most methods in InspectorTest and ProtocolTest namespaces
will be unified so that implementations of log, assert, etc. are no longer duplicated.
For now, at least make it obvious at each callsite what code is being invoked.
* http/tests/inspector/console/access-inspected-object.html:
* http/tests/inspector/dom/resources/InspectorDOMListener.js:
* http/tests/inspector/page/loading-iframe-document-node.html:
* http/tests/inspector/resources/ProtocolTestStub.js:
* http/tests/inspector/resources/console-test.js:
* http/tests/inspector/resources/probe-test.js:
* inspector/console/console-message.html:
* inspector/console/css-source-locations.html:
* inspector/console/js-source-locations.html:
* inspector/console/x-frame-options-message.html:
* inspector/css/getSupportedCSSProperties.html:
* inspector/debugger/breakpoint-action-detach.html:
* inspector/debugger/breakpoint-action-with-exception.html:
* inspector/debugger/breakpoint-condition-detach.html:
* inspector/debugger/breakpoint-condition-with-bad-script.html:
* inspector/debugger/breakpoint-condition-with-exception.html:
* inspector/debugger/breakpoint-eval-with-exception.html:
* inspector/debugger/breakpoint-inside-conditons-and-actions.html:
* inspector/debugger/call-frame-function-name.html:
* inspector/debugger/call-frame-this-host.html:
* inspector/debugger/call-frame-this-nonstrict.html:
* inspector/debugger/call-frame-this-strict.html:
* inspector/debugger/debugger-statement.html:
* inspector/debugger/didSampleProbe-multiple-probes.html:
* inspector/debugger/hit-breakpoint-from-console.html:
* inspector/debugger/nested-inspectors.html:
* inspector/debugger/pause-dedicated-worker.html:
* inspector/debugger/pause-on-assert.html:
* inspector/debugger/regress-133182.html:
* inspector/debugger/removeBreakpoint.html:
* inspector/debugger/searchInContent-linebreaks.html:
* inspector/debugger/setBreakpoint-actions.html:
* inspector/debugger/setBreakpoint-autoContinue.html:
* inspector/debugger/setBreakpoint-column.html:
* inspector/debugger/setBreakpoint-condition.html:
* inspector/debugger/setBreakpoint-dfg-and-modify-local.html:
* inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html:
* inspector/debugger/setBreakpoint-dfg.html:
* inspector/debugger/setBreakpoint-options-exception.html:
* inspector/debugger/setBreakpoint.html:
* inspector/debugger/setBreakpointByUrl-sourceURL.html:
* inspector/debugger/setPauseOnExceptions-all.html:
* inspector/debugger/setPauseOnExceptions-none.html:
* inspector/debugger/setPauseOnExceptions-uncaught.html:
* inspector/debugger/setVariableValue.html:
* inspector/debugger/terminate-dedicated-worker-while-paused.html:
* inspector/dom-debugger/node-removed.html:
* inspector/dom/dom-remove-events.html:
* inspector/dom/dom-search-crash.html:
* inspector/dom/dom-search-with-context.html:
* inspector/dom/dom-search.html:
* inspector/dom/focus.html:
* inspector/dom/getAccessibilityPropertiesForNode.html:
* inspector/dom/getAccessibilityPropertiesForNode_liveRegion.html:
* inspector/dom/getAccessibilityPropertiesForNode_mouseEventNodeId.html:
* inspector/dom/highlight-flow-with-no-region.html:
* inspector/dom/remove-multiple-nodes.html:
* inspector/dom/request-child-nodes-depth.html:
* inspector/layers/layers-anonymous.html:
* inspector/layers/layers-blending-compositing-reasons.html:
* inspector/layers/layers-compositing-reasons.html:
* inspector/layers/layers-for-node.html:
* inspector/layers/layers-generated-content.html:
* inspector/layers/layers-reflected-content.html:
* inspector/page/archive.html:
* inspector/page/frameScheduledNavigation.html:
* inspector/page/frameStartedLoading.html:
* inspector/page/javascriptDialogEvents.html:
* inspector/page/setEmulatedMedia.html:
* inspector/runtime/getProperties.html:
* inspector/unit-tests/async-test-suite.html:
* inspector/unit-tests/sync-test-suite.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorconsoleaccessinspectedobjecthtml">trunk/LayoutTests/http/tests/inspector/console/access-inspected-object.html</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectordomresourcesInspectorDOMListenerjs">trunk/LayoutTests/http/tests/inspector/dom/resources/InspectorDOMListener.js</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorpageloadingiframedocumentnodehtml">trunk/LayoutTests/http/tests/inspector/page/loading-iframe-document-node.html</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesProtocolTestStubjs">trunk/LayoutTests/http/tests/inspector/resources/ProtocolTestStub.js</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesconsoletestjs">trunk/LayoutTests/http/tests/inspector/resources/console-test.js</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesprobetestjs">trunk/LayoutTests/http/tests/inspector/resources/probe-test.js</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsolemessagehtml">trunk/LayoutTests/inspector/console/console-message.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolecsssourcelocationshtml">trunk/LayoutTests/inspector/console/css-source-locations.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolejssourcelocationshtml">trunk/LayoutTests/inspector/console/js-source-locations.html</a></li>
<li><a href="#trunkLayoutTestsinspectorconsolexframeoptionsmessagehtml">trunk/LayoutTests/inspector/console/x-frame-options-message.html</a></li>
<li><a href="#trunkLayoutTestsinspectorcssgetSupportedCSSPropertieshtml">trunk/LayoutTests/inspector/css/getSupportedCSSProperties.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointactiondetachhtml">trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointactionwithexceptionhtml">trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointconditiondetachhtml">trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointconditionwithbadscripthtml">trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointconditionwithexceptionhtml">trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointevalwithexceptionhtml">trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointinsideconditonsandactionshtml">trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggercallframefunctionnamehtml">trunk/LayoutTests/inspector/debugger/call-frame-function-name.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggercallframethishosthtml">trunk/LayoutTests/inspector/debugger/call-frame-this-host.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggercallframethisnonstricthtml">trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggercallframethisstricthtml">trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerdebuggerstatementhtml">trunk/LayoutTests/inspector/debugger/debugger-statement.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerdidSampleProbemultipleprobeshtml">trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerhitbreakpointfromconsolehtml">trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggernestedinspectorshtml">trunk/LayoutTests/inspector/debugger/nested-inspectors.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerpausededicatedworkerhtml">trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerpauseonasserthtml">trunk/LayoutTests/inspector/debugger/pause-on-assert.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerregress133182html">trunk/LayoutTests/inspector/debugger/regress-133182.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerremoveBreakpointhtml">trunk/LayoutTests/inspector/debugger/removeBreakpoint.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersearchInContentlinebreakshtml">trunk/LayoutTests/inspector/debugger/searchInContent-linebreaks.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointactionshtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointautoContinuehtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointcolumnhtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointconditionhtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointdfgandmodifylocalhtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointdfgcalleeandexaminedfglocalhtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointdfghtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointoptionsexceptionhtml">trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointhtml">trunk/LayoutTests/inspector/debugger/setBreakpoint.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointByUrlsourceURLhtml">trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetPauseOnExceptionsallhtml">trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetPauseOnExceptionsnonehtml">trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetPauseOnExceptionsuncaughthtml">trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetVariableValuehtml">trunk/LayoutTests/inspector/debugger/setVariableValue.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerterminatededicatedworkerwhilepausedhtml">trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomdomremoveeventshtml">trunk/LayoutTests/inspector/dom/dom-remove-events.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomdomsearchcrashhtml">trunk/LayoutTests/inspector/dom/dom-search-crash.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomdomsearchwithcontexthtml">trunk/LayoutTests/inspector/dom/dom-search-with-context.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomdomsearchhtml">trunk/LayoutTests/inspector/dom/dom-search.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomfocushtml">trunk/LayoutTests/inspector/dom/focus.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNodehtml">trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_liveRegionhtml">trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_liveRegion.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_mouseEventNodeIdhtml">trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_mouseEventNodeId.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightflowwithnoregionhtml">trunk/LayoutTests/inspector/dom/highlight-flow-with-no-region.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomremovemultiplenodeshtml">trunk/LayoutTests/inspector/dom/remove-multiple-nodes.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomrequestchildnodesdepthhtml">trunk/LayoutTests/inspector/dom/request-child-nodes-depth.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomdebuggernoderemovedhtml">trunk/LayoutTests/inspector/dom-debugger/node-removed.html</a></li>
<li><a href="#trunkLayoutTestsinspectorlayerslayersanonymoushtml">trunk/LayoutTests/inspector/layers/layers-anonymous.html</a></li>
<li><a href="#trunkLayoutTestsinspectorlayerslayersblendingcompositingreasonshtml">trunk/LayoutTests/inspector/layers/layers-blending-compositing-reasons.html</a></li>
<li><a href="#trunkLayoutTestsinspectorlayerslayerscompositingreasonshtml">trunk/LayoutTests/inspector/layers/layers-compositing-reasons.html</a></li>
<li><a href="#trunkLayoutTestsinspectorlayerslayersfornodehtml">trunk/LayoutTests/inspector/layers/layers-for-node.html</a></li>
<li><a href="#trunkLayoutTestsinspectorlayerslayersgeneratedcontenthtml">trunk/LayoutTests/inspector/layers/layers-generated-content.html</a></li>
<li><a href="#trunkLayoutTestsinspectorlayerslayersreflectedcontenthtml">trunk/LayoutTests/inspector/layers/layers-reflected-content.html</a></li>
<li><a href="#trunkLayoutTestsinspectorpagearchivehtml">trunk/LayoutTests/inspector/page/archive.html</a></li>
<li><a href="#trunkLayoutTestsinspectorpageframeScheduledNavigationhtml">trunk/LayoutTests/inspector/page/frameScheduledNavigation.html</a></li>
<li><a href="#trunkLayoutTestsinspectorpageframeStartedLoadinghtml">trunk/LayoutTests/inspector/page/frameStartedLoading.html</a></li>
<li><a href="#trunkLayoutTestsinspectorpagejavascriptDialogEventshtml">trunk/LayoutTests/inspector/page/javascriptDialogEvents.html</a></li>
<li><a href="#trunkLayoutTestsinspectorpagesetEmulatedMediahtml">trunk/LayoutTests/inspector/page/setEmulatedMedia.html</a></li>
<li><a href="#trunkLayoutTestsinspectorruntimegetPropertieshtml">trunk/LayoutTests/inspector/runtime/getProperties.html</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsasynctestsuitehtml">trunk/LayoutTests/inspector/unit-tests/async-test-suite.html</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestssynctestsuitehtml">trunk/LayoutTests/inspector/unit-tests/sync-test-suite.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/ChangeLog 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -1,3 +1,96 @@
</span><ins>+2015-08-11 Brian Burg <bburg@apple.com>
+
+ Web Inspector: use different namespaces in test fixtures for protocol tests and frontend tests
+ https://bugs.webkit.org/show_bug.cgi?id=147787
+
+ Reviewed by Timothy Hatcher.
+
+ Refactor test methods to use three distinct namespaces to reflect their implementation:
+
+ - InspectorProtocol contains commands that are only used from within protocol tests.
+ This includes sending and receiving protocol messages and checking message errors.
+
+ - InspectorTest contains test methods for full inspector frontend tests.
+
+ - ProtocolTest contains test methods for protocol tests.
+
+ In a subsequent patch, most methods in InspectorTest and ProtocolTest namespaces
+ will be unified so that implementations of log, assert, etc. are no longer duplicated.
+ For now, at least make it obvious at each callsite what code is being invoked.
+
+ * http/tests/inspector/console/access-inspected-object.html:
+ * http/tests/inspector/dom/resources/InspectorDOMListener.js:
+ * http/tests/inspector/page/loading-iframe-document-node.html:
+ * http/tests/inspector/resources/ProtocolTestStub.js:
+ * http/tests/inspector/resources/console-test.js:
+ * http/tests/inspector/resources/probe-test.js:
+ * inspector/console/console-message.html:
+ * inspector/console/css-source-locations.html:
+ * inspector/console/js-source-locations.html:
+ * inspector/console/x-frame-options-message.html:
+ * inspector/css/getSupportedCSSProperties.html:
+ * inspector/debugger/breakpoint-action-detach.html:
+ * inspector/debugger/breakpoint-action-with-exception.html:
+ * inspector/debugger/breakpoint-condition-detach.html:
+ * inspector/debugger/breakpoint-condition-with-bad-script.html:
+ * inspector/debugger/breakpoint-condition-with-exception.html:
+ * inspector/debugger/breakpoint-eval-with-exception.html:
+ * inspector/debugger/breakpoint-inside-conditons-and-actions.html:
+ * inspector/debugger/call-frame-function-name.html:
+ * inspector/debugger/call-frame-this-host.html:
+ * inspector/debugger/call-frame-this-nonstrict.html:
+ * inspector/debugger/call-frame-this-strict.html:
+ * inspector/debugger/debugger-statement.html:
+ * inspector/debugger/didSampleProbe-multiple-probes.html:
+ * inspector/debugger/hit-breakpoint-from-console.html:
+ * inspector/debugger/nested-inspectors.html:
+ * inspector/debugger/pause-dedicated-worker.html:
+ * inspector/debugger/pause-on-assert.html:
+ * inspector/debugger/regress-133182.html:
+ * inspector/debugger/removeBreakpoint.html:
+ * inspector/debugger/searchInContent-linebreaks.html:
+ * inspector/debugger/setBreakpoint-actions.html:
+ * inspector/debugger/setBreakpoint-autoContinue.html:
+ * inspector/debugger/setBreakpoint-column.html:
+ * inspector/debugger/setBreakpoint-condition.html:
+ * inspector/debugger/setBreakpoint-dfg-and-modify-local.html:
+ * inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html:
+ * inspector/debugger/setBreakpoint-dfg.html:
+ * inspector/debugger/setBreakpoint-options-exception.html:
+ * inspector/debugger/setBreakpoint.html:
+ * inspector/debugger/setBreakpointByUrl-sourceURL.html:
+ * inspector/debugger/setPauseOnExceptions-all.html:
+ * inspector/debugger/setPauseOnExceptions-none.html:
+ * inspector/debugger/setPauseOnExceptions-uncaught.html:
+ * inspector/debugger/setVariableValue.html:
+ * inspector/debugger/terminate-dedicated-worker-while-paused.html:
+ * inspector/dom-debugger/node-removed.html:
+ * inspector/dom/dom-remove-events.html:
+ * inspector/dom/dom-search-crash.html:
+ * inspector/dom/dom-search-with-context.html:
+ * inspector/dom/dom-search.html:
+ * inspector/dom/focus.html:
+ * inspector/dom/getAccessibilityPropertiesForNode.html:
+ * inspector/dom/getAccessibilityPropertiesForNode_liveRegion.html:
+ * inspector/dom/getAccessibilityPropertiesForNode_mouseEventNodeId.html:
+ * inspector/dom/highlight-flow-with-no-region.html:
+ * inspector/dom/remove-multiple-nodes.html:
+ * inspector/dom/request-child-nodes-depth.html:
+ * inspector/layers/layers-anonymous.html:
+ * inspector/layers/layers-blending-compositing-reasons.html:
+ * inspector/layers/layers-compositing-reasons.html:
+ * inspector/layers/layers-for-node.html:
+ * inspector/layers/layers-generated-content.html:
+ * inspector/layers/layers-reflected-content.html:
+ * inspector/page/archive.html:
+ * inspector/page/frameScheduledNavigation.html:
+ * inspector/page/frameStartedLoading.html:
+ * inspector/page/javascriptDialogEvents.html:
+ * inspector/page/setEmulatedMedia.html:
+ * inspector/runtime/getProperties.html:
+ * inspector/unit-tests/async-test-suite.html:
+ * inspector/unit-tests/sync-test-suite.html:
+
</ins><span class="cx"> 2015-08-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Arabic letter Yeh is drawn in LastResort
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorconsoleaccessinspectedobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/console/access-inspected-object.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/console/access-inspected-object.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/http/tests/inspector/console/access-inspected-object.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -9,22 +9,22 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, didGetDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, didGetDocument);
</ins><span class="cx">
</span><span class="cx"> function didGetDocument(messageObject)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("DOM.querySelector", {
</del><ins>+ InspectorProtocol.sendCommand("DOM.querySelector", {
</ins><span class="cx"> "nodeId": messageObject.result.root.nodeId,
</span><span class="cx"> "selector": "iframe#myframe"
</span><span class="cx"> }, didFindIframe);
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = iframeRequestHandler;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = iframeRequestHandler;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function didFindIframe(messageObject)
</span><span class="cx"> {
</span><span class="cx"> if (messageObject.error) {
</span><del>- InspectorTest.log("FAIL: " + messageObject.error);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + messageObject.error);
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> var node = messageObject.params.nodes[0];
</span><span class="cx"> if (!node || node.nodeName !== "IFRAME")
</span><span class="cx"> return;
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = null;
- InspectorTest.sendCommand("DOM.querySelector", {
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = null;
+ InspectorProtocol.sendCommand("DOM.querySelector", {
</ins><span class="cx"> "nodeId": node.contentDocument.nodeId,
</span><span class="cx"> "selector": "div#rootDiv"
</span><span class="cx"> }, didFindDiv);
</span><span class="lines">@@ -42,15 +42,15 @@
</span><span class="cx">
</span><span class="cx"> function didFindDiv(messageObject)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Console.enable", {});
- InspectorTest.sendCommand("Console.addInspectedNode", {
</del><ins>+ InspectorProtocol.sendCommand("Console.enable", {});
+ InspectorProtocol.sendCommand("Console.addInspectedNode", {
</ins><span class="cx"> "nodeId": messageObject.result.nodeId
</span><span class="cx"> }, didAddInspectedNode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function didAddInspectedNode(messageObject)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> "expression": "$0",
</span><span class="cx"> "includeCommandLineAPI": true
</span><span class="cx"> }, didEvaluate);
</span><span class="lines">@@ -59,10 +59,10 @@
</span><span class="cx"> function didEvaluate(messageObject)
</span><span class="cx"> {
</span><span class="cx"> if (messageObject.result.wasThrown)
</span><del>- InspectorTest.log("FAIL: unexpected exception: " + JSON.stringify(messageObject, null, 2));
</del><ins>+ ProtocolTest.log("FAIL: unexpected exception: " + JSON.stringify(messageObject, null, 2));
</ins><span class="cx"> if (messageObject.result.result.value !== null)
</span><del>- InspectorTest.log("FAIL: unexpected value: " + JSON.stringify(messageObject, null, 2));
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: unexpected value: " + JSON.stringify(messageObject, null, 2));
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectordomresourcesInspectorDOMListenerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/dom/resources/InspectorDOMListener.js (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/dom/resources/InspectorDOMListener.js 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/http/tests/inspector/dom/resources/InspectorDOMListener.js 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx"> {
</span><span class="cx"> var nodesById = {};
</span><span class="cx">
</span><del>- InspectorTest.addEventListener("DOM.setChildNodes", onSetChildNodes);
- InspectorTest.addEventListener("DOM.childNodeRemoved", onChildNodeRemoved);
- InspectorTest.addEventListener("DOM.childNodeInserted", onChildNodeInserted);
</del><ins>+ InspectorProtocol.addEventListener("DOM.setChildNodes", onSetChildNodes);
+ InspectorProtocol.addEventListener("DOM.childNodeRemoved", onChildNodeRemoved);
+ InspectorProtocol.addEventListener("DOM.childNodeInserted", onChildNodeInserted);
</ins><span class="cx">
</span><span class="cx"> function createNodeAttributesMap(attributes)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorpageloadingiframedocumentnodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/page/loading-iframe-document-node.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/page/loading-iframe-document-node.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/http/tests/inspector/page/loading-iframe-document-node.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -27,24 +27,24 @@
</span><span class="cx"> 4. Use the JS object to retrieve the DOM agent nodeid for the document node.
</span><span class="cx"> */
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Page.frameStartedLoading"] = step2_onFrameStartedLoading;
- InspectorTest.eventHandler["Runtime.executionContextCreated"] = step3_onExecutionContextCreated;
- InspectorTest.eventHandler["Page.loadEventFired"] = onLoadEventFired;
</del><ins>+ InspectorProtocol.eventHandler["Page.frameStartedLoading"] = step2_onFrameStartedLoading;
+ InspectorProtocol.eventHandler["Runtime.executionContextCreated"] = step3_onExecutionContextCreated;
+ InspectorProtocol.eventHandler["Page.loadEventFired"] = onLoadEventFired;
</ins><span class="cx">
</span><span class="cx"> var targetFrameId = null;
</span><span class="cx">
</span><span class="cx"> function step1_bootstrap() {
</span><del>- InspectorTest.log("step1_bootstrap");
</del><ins>+ ProtocolTest.log("step1_bootstrap");
</ins><span class="cx"> // Enable the frame events.
</span><del>- InspectorTest.sendCommand("Page.enable", {}, function() {
</del><ins>+ InspectorProtocol.sendCommand("Page.enable", {}, function() {
</ins><span class="cx"> // Enable the Runtime.executionContextCreated event.
</span><del>- InspectorTest.sendCommand("Runtime.enable", {}, function() {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.enable", {}, function() {
</ins><span class="cx"> // Initialize the DOM agent.
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, function() {
- InspectorTest.log("Main document loaded");
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, function() {
+ ProtocolTest.log("Main document loaded");
</ins><span class="cx">
</span><span class="cx"> // Add the iframe to the DOM.
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "appendIframe()" });
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "appendIframe()" });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> function step2_onFrameStartedLoading(response)
</span><span class="cx"> {
</span><del>- InspectorTest.log("step2_onFrameStartedLoading");
</del><ins>+ ProtocolTest.log("step2_onFrameStartedLoading");
</ins><span class="cx"> targetFrameId = response.params.frameId;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> if (frameId !== targetFrameId)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- InspectorTest.log("step3_onExecutionContextCreated: Requesting document from iframe's context.");
</del><ins>+ ProtocolTest.log("step3_onExecutionContextCreated: Requesting document from iframe's context.");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> "expression": "document",
</span><span class="cx"> "objectGroup": "console",
</span><span class="cx"> "includeCommandLineAPI": false,
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> function callback(response)
</span><span class="cx"> {
</span><span class="cx"> var objectId = response.result.result.objectId;
</span><del>- InspectorTest.log("Received script object for iframe's document node");
</del><ins>+ ProtocolTest.log("Received script object for iframe's document node");
</ins><span class="cx"> step4_requestNode(frameId, objectId);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -86,27 +86,27 @@
</span><span class="cx"> {
</span><span class="cx"> function callback(response)
</span><span class="cx"> {
</span><del>- InspectorTest.log(response.result.nodeId ? "PASS: Received node for iframe's document node" : "FAIL: Iframe's document node is not available");
</del><ins>+ ProtocolTest.log(response.result.nodeId ? "PASS: Received node for iframe's document node" : "FAIL: Iframe's document node is not available");
</ins><span class="cx"> completeTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.log("step4_requestNode: Requesting DOM node for iframe's document node");
- InspectorTest.sendCommand("DOM.requestNode", { objectId: objectId }, callback);
</del><ins>+ ProtocolTest.log("step4_requestNode: Requesting DOM node for iframe's document node");
+ InspectorProtocol.sendCommand("DOM.requestNode", { objectId: objectId }, callback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function completeTest()
</span><span class="cx"> {
</span><del>- InspectorTest.log("Test finished");
</del><ins>+ ProtocolTest.log("Test finished");
</ins><span class="cx"> // Stop loading the iframe to avoid timing out the test.
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "removeIframe()" });
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "removeIframe()" });
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onLoadEventFired()
</span><span class="cx"> {
</span><span class="cx"> // We should finish the test before this event is triggered.
</span><span class="cx"> // If you see this in the output, then the slow-image is not loaded correctly in the iframe.
</span><del>- InspectorTest.log("FAIL: Iframe load event fired before the test finished.");
</del><ins>+ ProtocolTest.log("FAIL: Iframe load event fired before the test finished.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> step1_bootstrap()
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesProtocolTestStubjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/resources/ProtocolTestStub.js (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/ProtocolTestStub.js 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/http/tests/inspector/resources/ProtocolTestStub.js 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -25,16 +25,18 @@
</span><span class="cx"> */
</span><span class="cx"> InspectorFrontendAPI = {};
</span><span class="cx">
</span><del>-InspectorTest = {};
-InspectorTest._dispatchTable = [];
-InspectorTest._requestId = -1;
-InspectorTest.eventHandler = {};
-InspectorTest.logCount = 0;
</del><ins>+InspectorProtocol = {};
+InspectorProtocol._dispatchTable = [];
+InspectorProtocol._requestId = -1;
+InspectorProtocol.eventHandler = {};
</ins><span class="cx">
</span><del>-InspectorTest.dumpInspectorProtocolMessages = false;
-InspectorTest.forceSyncDebugLogging = false;
</del><ins>+ProtocolTest = {};
+ProtocolTest.logCount = 0;
</ins><span class="cx">
</span><del>-InspectorTest.sendCommand = function(methodOrObject, params, handler)
</del><ins>+ProtocolTest.forceSyncDebugLogging = false;
+InspectorProtocol.dumpInspectorProtocolMessages = false;
+
+InspectorProtocol.sendCommand = function(methodOrObject, params, handler)
</ins><span class="cx"> {
</span><span class="cx"> // Allow new-style arguments object, as in awaitCommand.
</span><span class="cx"> var method = methodOrObject;
</span><span class="lines">@@ -48,7 +50,7 @@
</span><span class="cx"> return this._requestId;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.awaitCommand = function(args)
</del><ins>+InspectorProtocol.awaitCommand = function(args)
</ins><span class="cx"> {
</span><span class="cx"> var {method, params} = args;
</span><span class="cx"> return new Promise(function(resolve, reject) {
</span><span class="lines">@@ -58,21 +60,21 @@
</span><span class="cx"> }.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.awaitEvent = function(args)
</del><ins>+InspectorProtocol.awaitEvent = function(args)
</ins><span class="cx"> {
</span><span class="cx"> var {event} = args;
</span><span class="cx"> if (typeof event !== "string")
</span><span class="cx"> throw new Error("Event must be a string.");
</span><span class="cx">
</span><span class="cx"> return new Promise(function(resolve, reject) {
</span><del>- InspectorTest.eventHandler[event] = function(message) {
- InspectorTest.eventHandler[event] = undefined;
</del><ins>+ InspectorProtocol.eventHandler[event] = function(message) {
+ InspectorProtocol.eventHandler[event] = undefined;
</ins><span class="cx"> resolve(message);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.addEventListener = function(eventTypeOrObject, listener)
</del><ins>+InspectorProtocol.addEventListener = function(eventTypeOrObject, listener)
</ins><span class="cx"> {
</span><span class="cx"> var event = eventTypeOrObject;
</span><span class="cx"> if (typeof eventTypeOrObject === "object")
</span><span class="lines">@@ -85,11 +87,11 @@
</span><span class="cx"> throw new Error("Event listener must be callable.");
</span><span class="cx">
</span><span class="cx"> // Convert to an array of listeners.
</span><del>- var listeners = InspectorTest.eventHandler[event];
</del><ins>+ var listeners = InspectorProtocol.eventHandler[event];
</ins><span class="cx"> if (!listeners)
</span><del>- listeners = InspectorTest.eventHandler[event] = [];
</del><ins>+ listeners = InspectorProtocol.eventHandler[event] = [];
</ins><span class="cx"> else if (typeof listeners === "function")
</span><del>- listeners = InspectorTest.eventHandler[event] = [listeners];
</del><ins>+ listeners = InspectorProtocol.eventHandler[event] = [listeners];
</ins><span class="cx">
</span><span class="cx"> // Prevent registering multiple times.
</span><span class="cx"> if (listeners.includes(listener))
</span><span class="lines">@@ -98,22 +100,31 @@
</span><span class="cx"> listeners.push(listener);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.sendMessage = function(messageObject)
</del><ins>+InspectorProtocol.sendMessage = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> // This matches the debug dumping in InspectorBackend, which is bypassed
</span><del>- // by InspectorTest. Return messages should be dumped by InspectorBackend.
</del><ins>+ // by InspectorProtocol. Return messages should be dumped by InspectorBackend.
</ins><span class="cx"> if (this.dumpInspectorProtocolMessages)
</span><span class="cx"> console.log("frontend: " + JSON.stringify(messageObject));
</span><span class="cx">
</span><span class="cx"> InspectorFrontendHost.sendMessageToBackend(JSON.stringify(messageObject));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+InspectorProtocol.checkForError = function(responseObject)
+{
+ if (responseObject.error) {
+ ProtocolTest.log("PROTOCOL ERROR: " + JSON.stringify(responseObject.error));
+ ProtocolTest.completeTest();
+ throw "PROTOCOL ERROR";
+ }
+}
+
</ins><span class="cx"> InspectorFrontendAPI.dispatchMessageAsync = function(messageObject)
</span><span class="cx"> {
</span><span class="cx"> // If the message has an id, then it is a reply to a command.
</span><span class="cx"> var messageId = messageObject["id"];
</span><span class="cx"> if (typeof messageId === "number") {
</span><del>- var handler = InspectorTest._dispatchTable[messageId];
</del><ins>+ var handler = InspectorProtocol._dispatchTable[messageId];
</ins><span class="cx"> if (!handler)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -129,7 +140,7 @@
</span><span class="cx"> // Otherwise, it is an event.
</span><span class="cx"> } else {
</span><span class="cx"> var eventName = messageObject["method"];
</span><del>- var handler = InspectorTest.eventHandler[eventName];
</del><ins>+ var handler = InspectorProtocol.eventHandler[eventName];
</ins><span class="cx"> if (!handler)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -149,7 +160,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.AsyncTestSuite = class AsyncTestSuite {
</del><ins>+window.addEventListener("message", function(event) {
+ try {
+ eval(event.data);
+ } catch (e) {
+ alert(e.stack);
+ ProtocolTest.completeTest();
+ throw e;
+ }
+});
+
+// FIXME: Everything below here should be extracted to a file containing shared test utilities
+// between the two harnesses.
+
+ProtocolTest.AsyncTestSuite = class AsyncTestSuite {
</ins><span class="cx"> constructor(name) {
</span><span class="cx"> if (!name || typeof name !== "string")
</span><span class="cx"> throw new Error("Tried to create AsyncTestSuite without string suite name.");
</span><span class="lines">@@ -193,7 +217,7 @@
</span><span class="cx"> runTestCasesAndFinish()
</span><span class="cx"> {
</span><span class="cx"> function finish() {
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.runTestCases()
</span><span class="lines">@@ -210,19 +234,19 @@
</span><span class="cx">
</span><span class="cx"> this._startedRunning = true;
</span><span class="cx">
</span><del>- InspectorTest.log("");
- InspectorTest.log("== Running test suite: " + this.name);
</del><ins>+ ProtocolTest.log("");
+ ProtocolTest.log("== Running test suite: " + this.name);
</ins><span class="cx">
</span><span class="cx"> // Avoid adding newlines if nothing was logged.
</span><del>- var priorLogCount = InspectorTest.logCount;
</del><ins>+ var priorLogCount = ProtocolTest.logCount;
</ins><span class="cx"> var suite = this;
</span><span class="cx"> var result = this.testcases.reduce(function(chain, testcase, i) {
</span><span class="cx"> return chain.then(function() {
</span><del>- if (i > 0 && priorLogCount + 1 < InspectorTest.logCount)
- InspectorTest.log("");
</del><ins>+ if (i > 0 && priorLogCount + 1 < ProtocolTest.logCount)
+ ProtocolTest.log("");
</ins><span class="cx">
</span><del>- priorLogCount = InspectorTest.logCount;
- InspectorTest.log("-- Running test case: " + testcase.name);
</del><ins>+ priorLogCount = ProtocolTest.logCount;
+ ProtocolTest.log("-- Running test case: " + testcase.name);
</ins><span class="cx"> suite.runCount++;
</span><span class="cx"> return new Promise(testcase.test);
</span><span class="cx"> });
</span><span class="lines">@@ -237,13 +261,13 @@
</span><span class="cx"> if (typeof message !== "string")
</span><span class="cx"> message = JSON.stringify(message);
</span><span class="cx">
</span><del>- InspectorTest.log("!! EXCEPTION: " + message);
</del><ins>+ ProtocolTest.log("!! EXCEPTION: " + message);
</ins><span class="cx"> throw e; // Reject this promise by re-throwing the error.
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.SyncTestSuite = class SyncTestSuite {
</del><ins>+ProtocolTest.SyncTestSuite = class SyncTestSuite {
</ins><span class="cx"> constructor(name) {
</span><span class="cx"> if (!name || typeof name !== "string")
</span><span class="cx"> throw new Error("Tried to create SyncTestSuite without string suite name.");
</span><span class="lines">@@ -286,7 +310,7 @@
</span><span class="cx"> runTestCasesAndFinish()
</span><span class="cx"> {
</span><span class="cx"> this.runTestCases();
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> runTestCases()
</span><span class="lines">@@ -298,19 +322,19 @@
</span><span class="cx">
</span><span class="cx"> this._startedRunning = true;
</span><span class="cx">
</span><del>- InspectorTest.log("");
- InspectorTest.log("== Running test suite: " + this.name);
</del><ins>+ ProtocolTest.log("");
+ ProtocolTest.log("== Running test suite: " + this.name);
</ins><span class="cx">
</span><del>- var priorLogCount = InspectorTest.logCount;
</del><ins>+ var priorLogCount = ProtocolTest.logCount;
</ins><span class="cx"> var suite = this;
</span><span class="cx"> for (var i = 0; i < this.testcases.length; i++) {
</span><span class="cx"> var testcase = this.testcases[i];
</span><del>- if (i > 0 && priorLogCount + 1 < InspectorTest.logCount)
- InspectorTest.log("");
</del><ins>+ if (i > 0 && priorLogCount + 1 < ProtocolTest.logCount)
+ ProtocolTest.log("");
</ins><span class="cx">
</span><del>- priorLogCount = InspectorTest.logCount;
</del><ins>+ priorLogCount = ProtocolTest.logCount;
</ins><span class="cx">
</span><del>- InspectorTest.log("-- Running test case: " + testcase.name);
</del><ins>+ ProtocolTest.log("-- Running test case: " + testcase.name);
</ins><span class="cx"> suite.runCount++;
</span><span class="cx"> try {
</span><span class="cx"> var result = testcase.test.call(null);
</span><span class="lines">@@ -329,7 +353,7 @@
</span><span class="cx"> if (typeof message !== "string")
</span><span class="cx"> message = JSON.stringify(message);
</span><span class="cx">
</span><del>- InspectorTest.log("!! EXCEPTION: " + message);
</del><ins>+ ProtocolTest.log("!! EXCEPTION: " + message);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -339,18 +363,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Logs a message to test document.
</span><del>-InspectorTest.log = function(message)
</del><ins>+ProtocolTest.log = function(message)
</ins><span class="cx"> {
</span><del>- ++InspectorTest.logCount;
</del><ins>+ ++ProtocolTest.logCount;
</ins><span class="cx">
</span><span class="cx"> if (this.forceSyncDebugLogging)
</span><span class="cx"> this.debugLog(message);
</span><span class="cx"> else
</span><del>- this.sendCommand("Runtime.evaluate", { "expression": "log(" + JSON.stringify(message) + ")" } );
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "log(" + JSON.stringify(message) + ")" } );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Logs an assertion result to the test document.
</span><del>-InspectorTest.assert = function(condition, message)
</del><ins>+ProtocolTest.assert = function(condition, message)
</ins><span class="cx"> {
</span><span class="cx"> var status = condition ? "PASS" : "FAIL";
</span><span class="cx"> var message = typeof message !== "string" ? JSON.stringify(message) : message;
</span><span class="lines">@@ -360,27 +384,18 @@
</span><span class="cx">
</span><span class="cx"> // Logs message a directly to stdout of the test process via alert function.
</span><span class="cx"> // This message should survive process crash or kill by timeout.
</span><del>-InspectorTest.debugLog = function(message)
</del><ins>+ProtocolTest.debugLog = function(message)
</ins><span class="cx"> {
</span><del>- this.sendCommand("Runtime.evaluate", { "expression": "debugLog(" + JSON.stringify(message) + ")" } );
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "debugLog(" + JSON.stringify(message) + ")" } );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.completeTest = function()
</del><ins>+ProtocolTest.completeTest = function()
</ins><span class="cx"> {
</span><del>- this.sendCommand("Runtime.evaluate", { "expression": "closeTest();"} );
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "closeTest();"} );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.checkForError = function(responseObject)
</del><ins>+ProtocolTest.importScript = function(scriptName)
</ins><span class="cx"> {
</span><del>- if (responseObject.error) {
- InspectorTest.log("PROTOCOL ERROR: " + JSON.stringify(responseObject.error));
- InspectorTest.completeTest();
- throw "PROTOCOL ERROR";
- }
-}
-
-InspectorTest.importScript = function(scriptName)
-{
</del><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx"> var isAsyncRequest = false;
</span><span class="cx"> xhr.open("GET", scriptName, isAsyncRequest);
</span><span class="lines">@@ -390,13 +405,3 @@
</span><span class="cx"> var script = "try { " + xhr.responseText + "} catch (e) { alert(" + JSON.stringify("Error in: " + scriptName) + "); throw e; }";
</span><span class="cx"> window.eval(script);
</span><span class="cx"> }
</span><del>-
-window.addEventListener("message", function(event) {
- try {
- eval(event.data);
- } catch (e) {
- alert(e.stack);
- InspectorTest.completeTest();
- throw e;
- }
-});
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesconsoletestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/resources/console-test.js (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/console-test.js 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/http/tests/inspector/resources/console-test.js 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-InspectorTest.Console = {};
</del><ins>+ProtocolTest.Console = {};
</ins><span class="cx">
</span><del>-InspectorTest.Console.sanitizeConsoleMessage = function(messageObject)
</del><ins>+ProtocolTest.Console.sanitizeConsoleMessage = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> function basename(url)
</span><span class="cx"> {
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx"> return obj;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTest.Console.addTestCase = function(suite, args)
</del><ins>+ProtocolTest.Console.addTestCase = function(suite, args)
</ins><span class="cx"> {
</span><del>- if (!(suite instanceof InspectorTest.AsyncTestSuite))
</del><ins>+ if (!(suite instanceof ProtocolTest.AsyncTestSuite))
</ins><span class="cx"> throw new Error("Console test cases must be added to an async test suite.");
</span><span class="cx">
</span><span class="cx"> var {name, description, expression, expected} = args;
</span><span class="lines">@@ -40,23 +40,23 @@
</span><span class="cx"> name,
</span><span class="cx"> description,
</span><span class="cx"> test: function(resolve, reject) {
</span><del>- InspectorTest.awaitEvent({
</del><ins>+ InspectorProtocol.awaitEvent({
</ins><span class="cx"> event: "Console.messageAdded",
</span><span class="cx"> })
</span><span class="cx"> .then(function(messageObject) {
</span><span class="cx"> var consoleMessage = messageObject.params.message;
</span><span class="cx"> var {source, level, text, parameters} = consoleMessage;
</span><del>- InspectorTest.assert(source === expected.source, "ConsoleMessage type should be '" + expected.source + "'.");
- InspectorTest.assert(level === expected.level, "ConsoleMessage level should be '" + expected.level + "'.");
</del><ins>+ ProtocolTest.assert(source === expected.source, "ConsoleMessage type should be '" + expected.source + "'.");
+ ProtocolTest.assert(level === expected.level, "ConsoleMessage level should be '" + expected.level + "'.");
</ins><span class="cx">
</span><span class="cx"> if (expected.text)
</span><del>- InspectorTest.assert(text === expected.text, "ConsoleMessage text should be '" + expected.text + "'.");
</del><ins>+ ProtocolTest.assert(text === expected.text, "ConsoleMessage text should be '" + expected.text + "'.");
</ins><span class="cx">
</span><span class="cx"> if (expected.parameters) {
</span><del>- InspectorTest.assert(parameters.length === expected.parameters.length, "ConsoleMessage parameters.length === " + expected.parameters.length);
</del><ins>+ ProtocolTest.assert(parameters.length === expected.parameters.length, "ConsoleMessage parameters.length === " + expected.parameters.length);
</ins><span class="cx"> for (var i = 0; i < parameters.length; ++i) {
</span><span class="cx"> var expectedType = expected.parameters[i];
</span><del>- InspectorTest.assert(parameters[i].type === expectedType, "ConsoleMessage parameter " + i + " should have type '" + expectedType + "'.");
</del><ins>+ ProtocolTest.assert(parameters[i].type === expectedType, "ConsoleMessage parameter " + i + " should have type '" + expectedType + "'.");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> .catch(reject);
</span><span class="cx">
</span><span class="cx"> // Cause a messageAdded event to be generated.
</span><del>- InspectorTest.log("Evaluating expression: " + expression);
- InspectorTest.sendCommand({
</del><ins>+ ProtocolTest.log("Evaluating expression: " + expression);
+ InspectorProtocol.sendCommand({
</ins><span class="cx"> method: "Runtime.evaluate",
</span><span class="cx"> params: {expression}
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesprobetestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/resources/probe-test.js (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/probe-test.js 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/http/tests/inspector/resources/probe-test.js 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>-window.ProbeHelper = {};
</del><ins>+ProtocolTest.Probe = {};
</ins><span class="cx">
</span><del>-ProbeHelper.simplifiedProbeSample = function(messageObject)
</del><ins>+ProtocolTest.Probe.sanitizeProbeSample = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> var data = messageObject.params.sample;
</span><span class="cx"> return {
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ProbeHelper.stringifyProbeSample = function(ProbeSample)
</del><ins>+ProtocolTest.Probe.stringifyProbeSample = function(ProbeSample)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(ProbeSample instanceof WebInspector.ProbeSample, "Unexpected object type!");
</span><span class="cx"> return JSON.stringify({
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ProbeHelper.installTracingListeners = function()
</del><ins>+ProtocolTest.Probe.installTracingListeners = function()
</ins><span class="cx"> {
</span><span class="cx"> if (!WebInspector.debuggerManager || !WebInspector.probeManager)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsolemessagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-message.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-message.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/console/console-message.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -14,11 +14,11 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("console-test.js");
</del><ins>+ ProtocolTest.importScript("console-test.js");
</ins><span class="cx">
</span><del>- var suite = new InspectorTest.AsyncTestSuite("Console.MessagesFromCommandLineAPI");
</del><ins>+ var suite = new ProtocolTest.AsyncTestSuite("Console.MessagesFromCommandLineAPI");
</ins><span class="cx">
</span><del>- InspectorTest.Console.addTestCase(suite, {
</del><ins>+ ProtocolTest.Console.addTestCase(suite, {
</ins><span class="cx"> name: "ConsoleLogString",
</span><span class="cx"> description: "Test `console.log(\"log\")`",
</span><span class="cx"> expression: 'console.log("log");',
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.Console.addTestCase(suite, {
</del><ins>+ ProtocolTest.Console.addTestCase(suite, {
</ins><span class="cx"> name: "ConsoleInfoString",
</span><span class="cx"> description: "Test `console.info(\"info\")`",
</span><span class="cx"> expression: 'console.info("info");',
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.Console.addTestCase(suite, {
</del><ins>+ ProtocolTest.Console.addTestCase(suite, {
</ins><span class="cx"> name: "ConsoleWarnString",
</span><span class="cx"> description: "Test `console.warn(\"warn\")`",
</span><span class="cx"> expression: 'console.warn("warn");',
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.Console.addTestCase(suite, {
</del><ins>+ ProtocolTest.Console.addTestCase(suite, {
</ins><span class="cx"> name: "ConsoleErrorString",
</span><span class="cx"> description: "Test `console.error(\"error\")`",
</span><span class="cx"> expression: 'console.error("error");',
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.Console.addTestCase(suite, {
</del><ins>+ ProtocolTest.Console.addTestCase(suite, {
</ins><span class="cx"> name: "ConsoleDebugString",
</span><span class="cx"> description: "Test `console.debug(\"debug\")`",
</span><span class="cx"> expression: 'console.debug("debug");',
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.awaitCommand({
</del><ins>+ InspectorProtocol.awaitCommand({
</ins><span class="cx"> method: "Console.enable",
</span><span class="cx"> params: {}
</span><span class="cx"> })
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> .catch(fatalError);
</span><span class="cx">
</span><span class="cx"> function fatalError(e) {
</span><del>- InspectorTest.log("Test failed with fatal error: " + JSON.stringify(e));
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Test failed with fatal error: " + JSON.stringify(e));
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolecsssourcelocationshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/css-source-locations.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/css-source-locations.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/console/css-source-locations.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -15,34 +15,34 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("console-test.js");
</del><ins>+ ProtocolTest.importScript("console-test.js");
</ins><span class="cx">
</span><span class="cx"> var consoleMessageCount = 0;
</span><span class="cx"> const expectedConsoleMessageCount = 7;
</span><span class="cx">
</span><span class="cx"> // Due to the difficulty of testing inline style tags in a test case, this test
</span><span class="cx"> // is a reference test that contains serialized Console.messageAdded event data.
</span><del>- InspectorTest.addEventListener({
</del><ins>+ InspectorProtocol.addEventListener({
</ins><span class="cx"> event: "Console.messageAdded",
</span><span class="cx"> listener: function(messageObject) {
</span><del>- var message = InspectorTest.Console.sanitizeConsoleMessage(messageObject);
- InspectorTest.log(JSON.stringify(message));
</del><ins>+ var message = ProtocolTest.Console.sanitizeConsoleMessage(messageObject);
+ ProtocolTest.log(JSON.stringify(message));
</ins><span class="cx">
</span><span class="cx"> if (++consoleMessageCount !== expectedConsoleMessageCount)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- InspectorTest.awaitCommand({
</del><ins>+ InspectorProtocol.awaitCommand({
</ins><span class="cx"> method: "Console.disable",
</span><span class="cx"> params: {}
</span><span class="cx"> })
</span><span class="cx"> .then(function() {
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Start the test.
</span><del>- InspectorTest.sendCommand({
</del><ins>+ InspectorProtocol.sendCommand({
</ins><span class="cx"> method: "Console.enable",
</span><span class="cx"> params: {}
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolejssourcelocationshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/js-source-locations.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/js-source-locations.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/console/js-source-locations.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -11,25 +11,25 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("console-test.js");
</del><ins>+ ProtocolTest.importScript("console-test.js");
</ins><span class="cx">
</span><span class="cx"> var consoleMessageCount = 0;
</span><span class="cx"> const expectedConsoleMessageCount = 8;
</span><span class="cx">
</span><span class="cx"> // Due to the difficulty of testing inline script tags in a test case, this test
</span><span class="cx"> // is a reference test that contains serialized Console.messageAdded event data.
</span><del>- InspectorTest.addEventListener({
</del><ins>+ InspectorProtocol.addEventListener({
</ins><span class="cx"> event: "Console.messageAdded",
</span><span class="cx"> listener: function(messageObject) {
</span><del>- var message = InspectorTest.Console.sanitizeConsoleMessage(messageObject);
- InspectorTest.log(JSON.stringify(message));
</del><ins>+ var message = ProtocolTest.Console.sanitizeConsoleMessage(messageObject);
+ ProtocolTest.log(JSON.stringify(message));
</ins><span class="cx">
</span><span class="cx"> if (++consoleMessageCount === expectedConsoleMessageCount)
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.sendCommand({
</del><ins>+ InspectorProtocol.sendCommand({
</ins><span class="cx"> method: "Console.enable",
</span><span class="cx"> params: {}
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsolexframeoptionsmessagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/x-frame-options-message.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/x-frame-options-message.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/console/x-frame-options-message.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,18 +5,18 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("console-test.js");
</del><ins>+ ProtocolTest.importScript("console-test.js");
</ins><span class="cx">
</span><del>- let suite = new InspectorTest.AsyncTestSuite("Console.XFrameOptionsMessages");
</del><ins>+ let suite = new ProtocolTest.AsyncTestSuite("Console.XFrameOptionsMessages");
</ins><span class="cx">
</span><del>- InspectorTest.Console.addTestCase(suite, {
</del><ins>+ ProtocolTest.Console.addTestCase(suite, {
</ins><span class="cx"> name: "XFrameOptionsDeny",
</span><span class="cx"> description: "Ensure that a console message is logged when enforcing an X-Frame-Options policy. In this case, setting X-Frame-Options: 'deny' means the iframe does not want to be embedded in the test page.",
</span><span class="cx"> expression: "triggerXFrameOptionDeny();",
</span><span class="cx"> expected: {source: 'security', level: 'error'}
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.awaitCommand({
</del><ins>+ InspectorProtocol.awaitCommand({
</ins><span class="cx"> method: "Console.enable",
</span><span class="cx"> params: {}
</span><span class="cx"> })
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> .catch(fatalError);
</span><span class="cx">
</span><span class="cx"> function fatalError(e) {
</span><del>- InspectorTest.log("Test failed with fatal error: " + JSON.stringify(e));
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Test failed with fatal error: " + JSON.stringify(e));
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorcssgetSupportedCSSPropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/css/getSupportedCSSProperties.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/css/getSupportedCSSProperties.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/css/getSupportedCSSProperties.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -4,25 +4,25 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("CSS.getSupportedCSSProperties", {}, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand("CSS.getSupportedCSSProperties", {}, function(messageObject) {
</ins><span class="cx"> if ("error" in messageObject)
</span><del>- InspectorTest.log(messageObject.error.message);
</del><ins>+ ProtocolTest.log(messageObject.error.message);
</ins><span class="cx"> else {
</span><span class="cx"> var cssProperty = "box-shadow";
</span><span class="cx"> var entries = messageObject["result"]["cssProperties"];
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < entries.length; ++i) {
</span><span class="cx"> if (entries[i].name === cssProperty) {
</span><del>- InspectorTest.log(entries[i].name + " is supported");
</del><ins>+ ProtocolTest.log(entries[i].name + " is supported");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (i === entries.length)
</span><del>- InspectorTest.log(cssProperty + " is NOT supported");
</del><ins>+ ProtocolTest.log(cssProperty + " is NOT supported");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointactiondetachhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -21,10 +21,10 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="cx"> scriptId: messageObject.params.scriptId,
</span><span class="lines">@@ -38,18 +38,18 @@
</span><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "runBreakpointWithCondition()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "runBreakpointWithCondition()"});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointactionwithexceptionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx">
</span><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="lines">@@ -23,30 +23,30 @@
</span><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function(messageObject) {
- InspectorTest.checkForError(messageObject);
- InspectorTest.log("PASS: Breakpoint action executed, but the exception did not cause the debugger to pause.")
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function(messageObject) {
+ InspectorProtocol.checkForError(messageObject);
+ ProtocolTest.log("PASS: Breakpoint action executed, but the exception did not cause the debugger to pause.")
</ins><span class="cx"> completeTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</del><ins>+ ProtocolTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</ins><span class="cx"> completeTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function completeTest()
</span><span class="cx"> {
</span><span class="cx"> // Reset the pauseOnException state before ending the test.
</span><del>- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointconditiondetachhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="cx"> scriptId: messageObject.params.scriptId,
</span><span class="lines">@@ -38,18 +38,18 @@
</span><span class="cx"> condition: "disconnect()"
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "runBreakpointWithCondition()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "runBreakpointWithCondition()"});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointconditionwithbadscripthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="cx"> scriptId: messageObject.params.scriptId,
</span><span class="lines">@@ -23,27 +23,27 @@
</span><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function() {
- InspectorTest.log("PASS: The VM should not crash.");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function() {
+ ProtocolTest.log("PASS: The VM should not crash.");
</ins><span class="cx"> completeTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</del><ins>+ ProtocolTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</ins><span class="cx"> completeTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function completeTest()
</span><span class="cx"> {
</span><span class="cx"> // Reset the pauseOnException state before ending the test.
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointconditionwithexceptionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="cx"> scriptId: messageObject.params.scriptId,
</span><span class="lines">@@ -23,29 +23,29 @@
</span><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function() {
- InspectorTest.log("PASS: The debugger should not pause on the exception inside the condition.");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function() {
+ ProtocolTest.log("PASS: The debugger should not pause on the exception inside the condition.");
</ins><span class="cx"> completeTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</del><ins>+ ProtocolTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</ins><span class="cx"> completeTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function completeTest()
</span><span class="cx"> {
</span><span class="cx"> // Reset the pauseOnException state before ending the test.
</span><del>- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointevalwithexceptionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="cx"> scriptId: messageObject.params.scriptId,
</span><span class="lines">@@ -16,46 +16,46 @@
</span><span class="cx"> columnNumber: 0
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"}, function() {
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"}, function() {
</ins><span class="cx"> completeTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = onBreakpointHit;
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = onBreakpointHit;
</ins><span class="cx">
</span><span class="cx"> function onBreakpointHit(messageObject)
</span><span class="cx"> {
</span><del>- InspectorTest.log("PASS: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</del><ins>+ ProtocolTest.log("PASS: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</ins><span class="cx">
</span><span class="cx"> // Make sure we do not pause again in the debugger.
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = onPausedOnException;
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = onPausedOnException;
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "this.should.trigger.an.exception"}, function(messageObject) {
- InspectorTest.checkForError(messageObject);
- InspectorTest.log("PASS: The debugger should not stop on the exception thrown by a console command while paused on a breakpoint.");
- InspectorTest.sendCommand("Debugger.resume");
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "this.should.trigger.an.exception"}, function(messageObject) {
+ InspectorProtocol.checkForError(messageObject);
+ ProtocolTest.log("PASS: The debugger should not stop on the exception thrown by a console command while paused on a breakpoint.");
+ InspectorProtocol.sendCommand("Debugger.resume");
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onPausedOnException(messageObject)
</span><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Should not break on exceptions while paused on a breakpoint.");
</del><ins>+ ProtocolTest.log("FAIL: Should not break on exceptions while paused on a breakpoint.");
</ins><span class="cx"> completeTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function completeTest()
</span><span class="cx"> {
</span><del>- // InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ // InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> // Reset the pauseOnException state before ending the test.
</span><del>- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
- InspectorTest.sendCommand("Debugger.disable");
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
+ InspectorProtocol.sendCommand("Debugger.disable");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointinsideconditonsandactionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx">
</span><span class="cx"> var breakpoint = {
</span><span class="cx"> location: {
</span><span class="lines">@@ -35,31 +35,31 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorTest.checkForError);
- InspectorTest.sendCommand("Debugger.setBreakpoint", breakpointInsideConditonAndAction, InspectorTest.checkForError);
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorTest.checkForError);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function(messageObject) {
- InspectorTest.checkForError(messageObject);
- InspectorTest.log("PASS: Breakpoint condition and action executed, but the exception did not cause the debugger to pause.")
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpoint, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", breakpointInsideConditonAndAction, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorProtocol.checkForError);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function(messageObject) {
+ InspectorProtocol.checkForError(messageObject);
+ ProtocolTest.log("PASS: Breakpoint condition and action executed, but the exception did not cause the debugger to pause.")
</ins><span class="cx"> completeTest();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</del><ins>+ ProtocolTest.log("FAIL: Paused in debugger: reason = \"" + messageObject.params.reason + "\"");
</ins><span class="cx"> completeTest();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function completeTest()
</span><span class="cx"> {
</span><span class="cx"> // Reset the pauseOnException state before ending the test.
</span><del>- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"});
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggercallframefunctionnamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/call-frame-function-name.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/call-frame-function-name.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/call-frame-function-name.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -11,26 +11,26 @@
</span><span class="cx"> // We set a breakpoint before evaluating 'sum += ...', and verify that
</span><span class="cx"> // call frame functionNames are what we expect.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/call-frame-function-name\.html$/.test(messageObject.params.url) && messageObject.params.startLine > 10) {
</span><del>- InspectorTest.log("Found <script>");
</del><ins>+ ProtocolTest.log("Found <script>");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var lineNumber = messageObject.params.startLine + 6;
</span><span class="cx"> var columnNumber = 12;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: lineNumber, columnNumber: columnNumber};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
- InspectorTest.log("Running testFunction");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
+ ProtocolTest.log("Running testFunction");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> var functionNames = [ ];
</span><span class="cx"> var i;
</span><span class="cx"> for (i = 0; i < 3; i++)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx">
</span><span class="cx"> function assertFunctionName(index, actual, expected) {
</span><span class="cx"> if (actual == expected)
</span><del>- InspectorTest.log('PASS: frame[' + index + '] "' + actual + '"');
</del><ins>+ ProtocolTest.log('PASS: frame[' + index + '] "' + actual + '"');
</ins><span class="cx"> else
</span><del>- InspectorTest.log('FAIL: frame[' + index + '] expect "' + expected + '", actual "' + actual + '"');
</del><ins>+ ProtocolTest.log('FAIL: frame[' + index + '] expect "' + expected + '", actual "' + actual + '"');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // frame 0 should be the anonymous inner function.
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> // frame 2 should be "testFunction".
</span><span class="cx"> assertFunctionName(2, functionNames[2], "testFunction");
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggercallframethishosthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/call-frame-this-host.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/call-frame-this-host.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/call-frame-this-host.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -11,26 +11,26 @@
</span><span class="cx"> // We set a breakpoint before evaluating 'sum += ...', and verify that
</span><span class="cx"> // call frame this values are what we expect.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/call-frame-this-host\.html$/.test(messageObject.params.url) && messageObject.params.startLine > 10) {
</span><del>- InspectorTest.log("Found <script>");
</del><ins>+ ProtocolTest.log("Found <script>");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var lineNumber = messageObject.params.startLine + 6;
</span><span class="cx"> var columnNumber = 12;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: lineNumber, columnNumber: columnNumber};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
- InspectorTest.log("Running testFunction");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
+ ProtocolTest.log("Running testFunction");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> var thisValues = [ ];
</span><span class="cx"> var i;
</span><span class="cx"> for (i = 0; i < 3; i++)
</span><span class="lines">@@ -39,17 +39,17 @@
</span><span class="cx"> function assertThisValue(index, actual, expected) {
</span><span class="cx"> var success = true;
</span><span class="cx"> if (actual.type != expected.type) {
</span><del>- InspectorTest.log('FAIL: frame[' + index + '] expect type "' + expected.type + '", actual "' + actual.type + '"');
</del><ins>+ ProtocolTest.log('FAIL: frame[' + index + '] expect type "' + expected.type + '", actual "' + actual.type + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (actual.className != expected.className) {
</span><del>- InspectorTest.log('FAIL: frame[' + index + '] expect className "' + expected.className + '", actual "' + actual.className + '"');
</del><ins>+ ProtocolTest.log('FAIL: frame[' + index + '] expect className "' + expected.className + '", actual "' + actual.className + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (success)
</span><del>- InspectorTest.log('PASS: frame[' + index + '] type "' + actual.type + '" className "' + actual.className + '"');
</del><ins>+ ProtocolTest.log('PASS: frame[' + index + '] type "' + actual.type + '" className "' + actual.className + '"');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // frame 0 should be the anonymous inner function.
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "className": "Window"
</span><span class="cx"> });
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggercallframethisnonstricthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -11,42 +11,42 @@
</span><span class="cx"> // We set a breakpoint before evaluating 'sum += ...', and verify that
</span><span class="cx"> // call frame this values are what we expect.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/call-frame-this-nonstrict\.html$/.test(messageObject.params.url) && messageObject.params.startLine > 10) {
</span><del>- InspectorTest.log("Found <script>");
</del><ins>+ ProtocolTest.log("Found <script>");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var lineNumber = messageObject.params.startLine + 3;
</span><span class="cx"> var columnNumber = 4;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: lineNumber, columnNumber: columnNumber};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
- InspectorTest.log("Running testFunction");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
+ ProtocolTest.log("Running testFunction");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var step = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> function assertThisValue(step, actual, expected) {
</span><span class="cx"> var success = true;
</span><span class="cx"> if (actual.type != expected.type) {
</span><del>- InspectorTest.log('FAIL: step ' + step + ': expect type "' + expected.type + '", actual "' + actual.type + '"');
</del><ins>+ ProtocolTest.log('FAIL: step ' + step + ': expect type "' + expected.type + '", actual "' + actual.type + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (actual.className != expected.className) {
</span><span class="cx"> var actualResult
</span><del>- InspectorTest.log('FAIL: step ' + step + ': expect className "' + expected.className + '", actual "' + actual.className + '"');
</del><ins>+ ProtocolTest.log('FAIL: step ' + step + ': expect className "' + expected.className + '", actual "' + actual.className + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (success)
</span><del>- InspectorTest.log('PASS: step ' + step + ': type "' + actual.type + '" className "' + actual.className + '"');
</del><ins>+ ProtocolTest.log('PASS: step ' + step + ': type "' + actual.type + '" className "' + actual.className + '"');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (step) {
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> });
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> if (step == 5)
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> step++;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggercallframethisstricthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -11,49 +11,49 @@
</span><span class="cx"> // We set a breakpoint before evaluating 'sum += ...', and verify that
</span><span class="cx"> // call frame this values are what we expect.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/call-frame-this-strict\.html$/.test(messageObject.params.url) && messageObject.params.startLine > 10) {
</span><del>- InspectorTest.log("Found <script>");
</del><ins>+ ProtocolTest.log("Found <script>");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var lineNumber = messageObject.params.startLine + 3;
</span><span class="cx"> var columnNumber = 4;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: lineNumber, columnNumber: columnNumber};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
- InspectorTest.log("Running testFunction");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
+ ProtocolTest.log("Running testFunction");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var step = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> function assertThisValue(step, actual, expected) {
</span><span class="cx"> var success = true;
</span><span class="cx"> if (actual.type != expected.type) {
</span><del>- InspectorTest.log('FAIL: step ' + step + ': expect type "' + expected.type + '", actual "' + actual.type + '"');
</del><ins>+ ProtocolTest.log('FAIL: step ' + step + ': expect type "' + expected.type + '", actual "' + actual.type + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (actual.type != "undefined") {
</span><span class="cx"> if (typeof actual.value != typeof expected.value) {
</span><del>- InspectorTest.log('FAIL: step ' + step + ': expect value type "' + typeof expected.value + '", actual "' + typeof actual.value + '"');
</del><ins>+ ProtocolTest.log('FAIL: step ' + step + ': expect value type "' + typeof expected.value + '", actual "' + typeof actual.value + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (actual.value != expected.value) {
</span><span class="cx"> var actualResult
</span><del>- InspectorTest.log('FAIL: step ' + step + ': expect value "' + expected.value + '", actual "' + actual.value + '"');
</del><ins>+ ProtocolTest.log('FAIL: step ' + step + ': expect value "' + expected.value + '", actual "' + actual.value + '"');
</ins><span class="cx"> success = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (success)
</span><del>- InspectorTest.log('PASS: step ' + step + ': type "' + actual.type + '" value "' + actual.value + '"');
</del><ins>+ ProtocolTest.log('PASS: step ' + step + ': type "' + actual.type + '" value "' + actual.value + '"');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (step) {
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> });
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> if (step == 5)
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> step++;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerdebuggerstatementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/debugger-statement.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/debugger-statement.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/debugger-statement.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -12,30 +12,30 @@
</span><span class="cx"> // This test setting 2 breakpoints in DFG compiled functions: one inlined,
</span><span class="cx"> // and one not inlined.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var breakpointFound = false;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "debuggerStatement();"
</span><span class="cx"> }, function(responseObject) {
</span><span class="cx"> if (breakpointFound)
</span><del>- InspectorTest.log("PASS");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Broke at debugger statement\n");
</del><ins>+ ProtocolTest.log("Broke at debugger statement\n");
</ins><span class="cx"> breakpointFound = true;
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerdidSampleProbemultipleprobeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,9 +5,9 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("probe-test.js");
</del><ins>+ ProtocolTest.importScript("probe-test.js");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var samples = [];
</span><span class="cx"> const expectedSampleCount = 4;
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> function dumpSamples() {
</span><span class="cx"> for (var i = 0; i < samples.length; i++)
</span><del>- InspectorTest.log("Sample " + (i + 1) + ": " + JSON.stringify(samples[i]));
</del><ins>+ ProtocolTest.log("Sample " + (i + 1) + ": " + JSON.stringify(samples[i]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var tests = [
</span><span class="lines">@@ -45,10 +45,10 @@
</span><span class="cx"> },
</span><span class="cx"> ];
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 18, columnNumber: 0};
</span><span class="cx"> var options = {
</span><span class="lines">@@ -59,30 +59,30 @@
</span><span class="cx"> ]
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx">
</span><del>- InspectorTest.log("Running breakpointActions to trigger probe samples.");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
</del><ins>+ ProtocolTest.log("Running breakpointActions to trigger probe samples.");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.didSampleProbe"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.didSampleProbe"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- var sample = ProbeHelper.simplifiedProbeSample(messageObject);
</del><ins>+ var sample = ProtocolTest.Probe.sanitizeProbeSample(messageObject);
</ins><span class="cx"> samples.push(sample);
</span><del>- InspectorTest.log("Received probe sample payload: " + JSON.stringify(sample.payload));
</del><ins>+ ProtocolTest.log("Received probe sample payload: " + JSON.stringify(sample.payload));
</ins><span class="cx">
</span><span class="cx"> if (receivedAllExpectedSamples()) {
</span><span class="cx"> tests.forEach(function(test) {
</span><span class="cx"> var result = test.predicate();
</span><del>- InspectorTest.assert(result, test.message);
</del><ins>+ ProtocolTest.assert(result, test.message);
</ins><span class="cx"> if (!result)
</span><span class="cx"> test.error();
</span><span class="cx"> });
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerhitbreakpointfromconsolehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,32 +5,32 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 18, columnNumber: 0};
</span><span class="cx"> var options = {
</span><span class="cx"> condition: "a > 10",
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> // Should NOT hit breakpoint (a < 10).
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(2, {x:1,y:2})"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(2, {x:1,y:2})"});
</ins><span class="cx"> // Should hit breakpoint (a > 10).
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
- InspectorTest.log("PASS");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
+ ProtocolTest.log("PASS");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggernestedinspectorshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/nested-inspectors.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/nested-inspectors.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/nested-inspectors.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,40 +8,40 @@
</span><span class="cx"> function testFunction() {
</span><span class="cx"> // This function runs in the second inspector window. We can use this one to debug the first inspector.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Debugger.setPauseOnExceptions - all");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Debugger.setPauseOnExceptions - all");
</ins><span class="cx">
</span><span class="cx"> // Trigger an exception in the main inspector.
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throw new Error('PASS: Expected exception') }, 0);"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throw new Error('PASS: Expected exception') }, 0);"});
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("PASS: Paused!");
- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ ProtocolTest.log("PASS: Paused!");
+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.resumed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.resumed"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("PASS: Resumed!");
</del><ins>+ ProtocolTest.log("PASS: Resumed!");
</ins><span class="cx">
</span><span class="cx"> // Revert Debugger.setPauseOnExceptions as it can have an impact on the following tests.
</span><del>- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "none"}, function(responseObject) {
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"}, function(responseObject) {
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- window.log = InspectorTest.log.bind(InspectorTest);
</del><ins>+ window.log = ProtocolTest.log.bind(InspectorProtocol);
</ins><span class="cx"> window.closeTest = function()
</span><span class="cx"> {
</span><span class="cx"> window.internals.closeDummyInspectorFrontend();
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var secondInspectorFrontend = window.internals.openDummyInspectorFrontend("ProtocolTestStub.html");
</del><ins>+ var secondInspectorFrontend = window.internals.openDummyInspectorFrontend("InspectorProtocolStub.html");
</ins><span class="cx"> secondInspectorFrontend.addEventListener("load", function(event) {
</span><span class="cx"> secondInspectorFrontend.postMessage("(" + testFunction.toString() +")();", "*");
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpausededicatedworkerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> var workerRequestId = 1;
</span><span class="cx"> function sendCommandToWorker(method, params)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Worker.sendMessageToWorker", {
</del><ins>+ InspectorProtocol.sendCommand("Worker.sendMessageToWorker", {
</ins><span class="cx"> "workerId": workerId,
</span><span class="cx"> "message": {
</span><span class="cx"> "method": method,
</span><span class="lines">@@ -28,31 +28,31 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Worker.enable", {}, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand("Worker.enable", {}, function(messageObject) {
</ins><span class="cx"> if ("error" in messageObject) {
</span><del>- InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Worker.workerCreated"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Worker.workerCreated"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> workerId = messageObject["params"]["workerId"];
</span><del>- InspectorTest.log("Worker created");
- InspectorTest.sendCommand("Worker.connectToWorker", { "workerId": workerId }, function(messageObject) {
- InspectorTest.log("didConnectToWorker");
</del><ins>+ ProtocolTest.log("Worker created");
+ InspectorProtocol.sendCommand("Worker.connectToWorker", { "workerId": workerId }, function(messageObject) {
+ ProtocolTest.log("didConnectToWorker");
</ins><span class="cx"> sendCommandToWorker("Debugger.enable", {});
</span><span class="cx"> sendCommandToWorker("Debugger.pause", {});
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> var message = messageObject["params"]["message"];
</span><span class="cx"> if (message["method"] === "Debugger.paused") {
</span><del>- InspectorTest.log("SUCCESS: Worker paused");
</del><ins>+ ProtocolTest.log("SUCCESS: Worker paused");
</ins><span class="cx"> sendCommandToWorker("Debugger.disable", {});
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpauseonasserthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/pause-on-assert.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/pause-on-assert.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/pause-on-assert.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorTest.checkForError);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorProtocol.checkForError);
</ins><span class="cx">
</span><span class="cx"> var step = null;
</span><span class="cx"> var steps = [
</span><span class="lines">@@ -42,29 +42,29 @@
</span><span class="cx"> },
</span><span class="cx"> ];
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (step.pause)
</span><del>- InspectorTest.log("PASS: Paused!");
</del><ins>+ ProtocolTest.log("PASS: Paused!");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: Paused when unexpected");
</del><ins>+ ProtocolTest.log("FAIL: Paused when unexpected");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.resume", {}, runNextStep);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {}, runNextStep);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runNextStep() {
</span><span class="cx"> step = steps.shift();
</span><span class="cx"> if (!step) {
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Evalute the command inside a setTimeout so that we can hit exceptions and break.
</span><span class="cx"> // Otherwise, evaluating through RuntimeAgent will not trigger a pause.
</span><span class="cx"> // Likewise, if no pause is expected wait for a bit before continuing.
</span><del>- InspectorTest.log(step.message);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function(){" + step.evaluate + "}, 0)"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ ProtocolTest.log(step.message);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function(){" + step.evaluate + "}, 0)"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> if (!step.pause)
</span><span class="cx"> setTimeout(runNextStep, 20);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerregress133182html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/regress-133182.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/regress-133182.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/regress-133182.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -24,27 +24,27 @@
</span><span class="cx"> // Evaluate statement and expect to pause.
</span><span class="cx"> if (testIndex < statementsWithUncaughtExceptions.length) {
</span><span class="cx"> var statement = statementsWithUncaughtExceptions[testIndex++];
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Done evaluating statements to pause. Evaluate some more we do not expect to pause.
</span><del>- InspectorTest.log("PASS - paused for each uncaught exception");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS - paused for each uncaught exception");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "uncaught"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "uncaught"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> expectPause = true;
</span><span class="cx"> triggerNextUncaughtException();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!expectPause) {
</span><del>- InspectorTest.log("FAIL - debugger paused when we did not expect to");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL - debugger paused when we did not expect to");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,15 +52,15 @@
</span><span class="cx"> console.log("[" + testIndex + "] Testing statement '" + statementsWithUncaughtExceptions[testIndex - 1] + "'");
</span><span class="cx"> console.log("[" + testIndex + "] Paused and about to step");
</span><span class="cx"> isStepping = true;
</span><del>- InspectorTest.sendCommand("Debugger.stepOver", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.stepOver", {});
</ins><span class="cx"> } else {
</span><span class="cx"> console.log("[" + testIndex + "] Paused after stepping");
</span><span class="cx"> isStepping = false;
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.resumed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.resumed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> console.log("[" + testIndex + "] Resumed");
</span><span class="cx"> if (!isStepping)
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerremoveBreakpointhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/removeBreakpoint.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/removeBreakpoint.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/removeBreakpoint.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,48 +5,48 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var breakpointTriggered = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 3, columnNumber: 0};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Set Breakpoint, Triggering it");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Set Breakpoint, Triggering it");
</ins><span class="cx"> breakpointIdentifier = responseObject.result.breakpointId;
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> ++breakpointTriggered;
</span><span class="cx">
</span><span class="cx"> if (breakpointTriggered === 1)
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> else {
</span><del>- InspectorTest.log("FAIL: should not have hit breakpoint after it was removed.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: should not have hit breakpoint after it was removed.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.resumed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.resumed"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Resumed, Removing Breakpoint and trying to trigger it again");
- InspectorTest.sendCommand("Debugger.removeBreakpoint", {"breakpointId": breakpointIdentifier}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ ProtocolTest.log("Resumed, Removing Breakpoint and trying to trigger it again");
+ InspectorProtocol.sendCommand("Debugger.removeBreakpoint", {"breakpointId": breakpointIdentifier}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> setTimeout(function() {
</span><del>- InspectorTest.log("PASS: did not hit breakpoint after removing it.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS: did not hit breakpoint after removing it.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }, 50);
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersearchInContentlinebreakshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/searchInContent-linebreaks.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/searchInContent-linebreaks.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/searchInContent-linebreaks.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -13,12 +13,12 @@
</span><span class="cx">
</span><span class="cx"> var testResults = [];
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/-linebreaks\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.sendCommand("Debugger.searchInContent", {"scriptId": messageObject.params.scriptId, "query": "test"}, function(url, messageObject) {
</del><ins>+ InspectorProtocol.sendCommand("Debugger.searchInContent", {"scriptId": messageObject.params.scriptId, "query": "test"}, function(url, messageObject) {
</ins><span class="cx"> var results = messageObject.result.result;
</span><span class="cx">
</span><span class="cx"> var testResult = {url: url, count: results.length, matches: []};
</span><span class="lines">@@ -42,21 +42,21 @@
</span><span class="cx">
</span><span class="cx"> var sortedTestResults = testResults.sort(compareResultURLs);
</span><span class="cx">
</span><del>- InspectorTest.log("Scripts searched: " + sortedTestResults.length);
- InspectorTest.log("");
</del><ins>+ ProtocolTest.log("Scripts searched: " + sortedTestResults.length);
+ ProtocolTest.log("");
</ins><span class="cx">
</span><span class="cx"> for (var testResult of sortedTestResults) {
</span><span class="cx"> var fileName = /([\w-]+\.js)$/.exec(testResult.url)[1];
</span><del>- InspectorTest.log("Script: " + fileName);
- InspectorTest.log("Results found: " + testResult.count);
</del><ins>+ ProtocolTest.log("Script: " + fileName);
+ ProtocolTest.log("Results found: " + testResult.count);
</ins><span class="cx">
</span><span class="cx"> for (var match of testResult.matches)
</span><del>- InspectorTest.log("Line " + match.lineNumber + ": " + JSON.stringify(match.lineContent));
</del><ins>+ ProtocolTest.log("Line " + match.lineNumber + ": " + JSON.stringify(match.lineContent));
</ins><span class="cx">
</span><del>- InspectorTest.log("");
</del><ins>+ ProtocolTest.log("");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointactionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,11 +5,11 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("console-test.js");
- InspectorTest.importScript("probe-test.js");
</del><ins>+ ProtocolTest.importScript("console-test.js");
+ ProtocolTest.importScript("probe-test.js");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Console.enable", {});
- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Console.enable", {});
+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var isExpectingLogs = false;
</span><span class="cx"> var isExpectingSounds = false;
</span><span class="lines">@@ -25,10 +25,10 @@
</span><span class="cx"> return logCount === expectedLogCount && sampleCount === expectedSampleCount && soundCount === expectedSoundCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 18, columnNumber: 0};
</span><span class="cx"> var options = {
</span><span class="lines">@@ -43,81 +43,81 @@
</span><span class="cx"> ]
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> breakpointIdentifier = responseObject.result.breakpointId;
</span><del>- InspectorTest.log("Running breakpointActions a few times that should not trigger");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(1)"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(2, 12)"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(2, {x:1,y:2})"}, function() {
</del><ins>+ ProtocolTest.log("Running breakpointActions a few times that should not trigger");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(1)"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(2, 12)"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(2, {x:1,y:2})"}, function() {
</ins><span class="cx"> isExpectingLogs = true;
</span><span class="cx"> isExpectingSounds = true;
</span><span class="cx"> isExpectingSamples = true;
</span><del>- InspectorTest.log("Running breakpointActions to triggering the breakpoint actions");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"}, function() {
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(100, document.body)"});
</del><ins>+ ProtocolTest.log("Running breakpointActions to triggering the breakpoint actions");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"}, function() {
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(100, document.body)"});
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx">
</span><del>- InspectorTest.log("FAIL: should not have hit breakpoint, autoContinue was true");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: should not have hit breakpoint, autoContinue was true");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.playBreakpointActionSound"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.playBreakpointActionSound"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!isExpectingSounds) {
</span><del>- InspectorTest.log("FAIL: unexpected breakpoint sound.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: unexpected breakpoint sound.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.log("PASS: Breakpoint Sound");
</del><ins>+ ProtocolTest.log("PASS: Breakpoint Sound");
</ins><span class="cx">
</span><span class="cx"> ++soundCount;
</span><span class="cx">
</span><span class="cx"> if (receivedAllExpectedOutput())
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.didSampleProbe"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.didSampleProbe"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!isExpectingSamples) {
</span><del>- InspectorTest.log("FAIL: unexpected probe sample, probe samples should only have come from breakpoint actions.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: unexpected probe sample, probe samples should only have come from breakpoint actions.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var simplifiedSample = ProbeHelper.simplifiedProbeSample(messageObject);
- InspectorTest.log("PASS: Probe sample payload: " + JSON.stringify(simplifiedSample.payload));
</del><ins>+ var simplifiedSample = ProtocolTest.Probe.sanitizeProbeSample(messageObject);
+ ProtocolTest.log("PASS: Probe sample payload: " + JSON.stringify(simplifiedSample.payload));
</ins><span class="cx">
</span><span class="cx"> ++sampleCount;
</span><span class="cx">
</span><span class="cx"> if (receivedAllExpectedOutput())
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Console.messageAdded"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Console.messageAdded"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!isExpectingLogs) {
</span><del>- InspectorTest.log("FAIL: unexpected log, logs should only have come from breakpoint actions.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: unexpected log, logs should only have come from breakpoint actions.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var message = InspectorTest.Console.sanitizeConsoleMessage(messageObject);
- InspectorTest.log("PASS: Console Message: " + JSON.stringify(message));
</del><ins>+ var message = ProtocolTest.Console.sanitizeConsoleMessage(messageObject);
+ ProtocolTest.log("PASS: Console Message: " + JSON.stringify(message));
</ins><span class="cx">
</span><span class="cx"> ++logCount;
</span><span class="cx">
</span><span class="cx"> if (receivedAllExpectedOutput())
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointautoContinuehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,34 +5,34 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var allowedToHitBreakpoint = false;
</span><span class="cx"> var breakpointIdentifier = null;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 13, columnNumber: 0};
</span><span class="cx"> var options = {autoContinue: true};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> breakpointIdentifier = responseObject.result.breakpointId;
</span><del>- InspectorTest.log("Running breakpointAutomaticallyContinue multiple times with automatically continue");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"}, function() {
- InspectorTest.log("Removing breakpoint");
- InspectorTest.sendCommand("Debugger.removeBreakpoint", {"breakpointId": breakpointIdentifier}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
</del><ins>+ ProtocolTest.log("Running breakpointAutomaticallyContinue multiple times with automatically continue");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"}, function() {
+ ProtocolTest.log("Removing breakpoint");
+ InspectorProtocol.sendCommand("Debugger.removeBreakpoint", {"breakpointId": breakpointIdentifier}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
</ins><span class="cx"> allowedToHitBreakpoint = true;
</span><span class="cx"> options = {autoContinue: false};
</span><del>- InspectorTest.log("Setting new breakpoint without autoContinue that should trigger");
- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"});
</del><ins>+ ProtocolTest.log("Setting new breakpoint without autoContinue that should trigger");
+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointAutomaticallyContinue()"});
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -40,16 +40,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx">
</span><span class="cx"> if (!allowedToHitBreakpoint) {
</span><del>- InspectorTest.log("FAIL: should not have hit breakpoint.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: should not have hit breakpoint.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> } else {
</span><del>- InspectorTest.log("PASS: hit breakpoint when allowed.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS: hit breakpoint when allowed.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointcolumnhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -11,32 +11,32 @@
</span><span class="cx"> // We set a breakpoint before evaluating `var b = ...`, and verify that
</span><span class="cx"> // by running some expressions at that call frame.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/setBreakpoint-column\.html$/.test(messageObject.params.url) && messageObject.params.startLine > 10) {
</span><del>- InspectorTest.log("Found <script>");
</del><ins>+ ProtocolTest.log("Found <script>");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var lineNumber = messageObject.params.startLine + 2;
</span><span class="cx"> var columnNumber = 10;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: lineNumber, columnNumber: columnNumber};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
- InspectorTest.log("Running testFunction");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
+ ProtocolTest.log("Running testFunction");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "testFunction()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> var callFrameIdentifier = messageObject.params.callFrames[0].callFrameId;
</span><del>- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `a` (expecting number 1) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "b"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `b` (expecting undefined) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `a` (expecting number 1) was: " + JSON.stringify(messageObject.result.result));
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "b"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `b` (expecting undefined) was: " + JSON.stringify(messageObject.result.result));
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointconditionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,70 +5,70 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var inBreakpoint = false;
</span><span class="cx"> var breakpointTriggered = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 8, columnNumber: 0};
</span><span class="cx"> var options = {condition: "(a + b) > 10"};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Running breakpointWithCondition multiple times");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1, 2)"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(5, 5)"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(7, 4)"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Running breakpointWithCondition multiple times");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1, 2)"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(5, 5)"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(7, 4)"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> inBreakpoint = true;
</span><span class="cx"> ++breakpointTriggered;
</span><span class="cx">
</span><span class="cx"> var callFrameIdentifier = messageObject.params.callFrames[0].callFrameId;
</span><span class="cx"> if (breakpointTriggered === 1) {
</span><del>- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `a` (expecting number 7) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "b"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `b` (expecting number 4) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `a` (expecting number 7) was: " + JSON.stringify(messageObject.result.result));
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "b"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `b` (expecting number 4) was: " + JSON.stringify(messageObject.result.result));
+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> } else if (breakpointTriggered === 2) {
</span><del>- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `a` (expecting number 4) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "b"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `b` (expecting number 7) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.log("PASS: hit breakpoints with expected values");
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `a` (expecting number 4) was: " + JSON.stringify(messageObject.result.result));
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "b"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `b` (expecting number 7) was: " + JSON.stringify(messageObject.result.result));
+ ProtocolTest.log("PASS: hit breakpoints with expected values");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><del>- InspectorTest.log("FAIL: hit too many breakpoints.");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: hit too many breakpoints.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.resumed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.resumed"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Resumed, running breakpointWithCondition multiple times again");
</del><ins>+ ProtocolTest.log("Resumed, running breakpointWithCondition multiple times again");
</ins><span class="cx"> inBreakpoint = false;
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(9, 0)"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(12, -4)"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(4, 7)"}, function() {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(9, 0)"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(12, -4)"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(4, 7)"}, function() {
</ins><span class="cx"> setTimeout(function() {
</span><span class="cx"> if (!inBreakpoint) {
</span><del>- InspectorTest.log("FAIL: Did not hit conditional breakpoint the second time");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: Did not hit conditional breakpoint the second time");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }, 100);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointdfgandmodifylocalhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -12,54 +12,54 @@
</span><span class="cx"> // This test setting 2 breakpoints in DFG compiled functions: one inlined,
</span><span class="cx"> // and one not inlined.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var breakpointId = null;
</span><span class="cx"> var scriptId = 0;
</span><span class="cx"> var startLine = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> scriptId = messageObject.params.scriptId;
</span><span class="cx"> startLine = messageObject.params.startLine;
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "dfgWithoutInline2();"
</span><span class="cx"> }, function(responseObject) {
</span><del>- InspectorTest.log("dfg function warmed up\n");
</del><ins>+ ProtocolTest.log("dfg function warmed up\n");
</ins><span class="cx">
</span><span class="cx"> var location1 = {scriptId: scriptId, lineNumber: 2, columnNumber: 0};
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location1}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Breakpoint set in breakpointBasic()");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location1}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Breakpoint set in breakpointBasic()");
</ins><span class="cx">
</span><span class="cx"> breakpointId = responseObject.result.breakpointId;
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "callNotInlineable2();"
</span><span class="cx"> }, function(responseObject) {
</span><del>- InspectorTest.log("Test complete");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Test complete");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> var callFrames = messageObject.params.callFrames;
</span><span class="cx"> if (callFrames.length < 3)
</span><del>- InspectorTest.log("FAIL: too few frames in stack trace");
</del><ins>+ ProtocolTest.log("FAIL: too few frames in stack trace");
</ins><span class="cx">
</span><span class="cx"> var callFrameId = callFrames[1].callFrameId;
</span><del>- InspectorTest.log("Evaluating in DFG frame at frame[1]: 'x = 20000;'");
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "x = 20000;" }, function(responseObject) {
- InspectorTest.sendCommand("Debugger.resume", {}, function(responseObject) {
- InspectorTest.log("Resumed from breakpoint");
</del><ins>+ ProtocolTest.log("Evaluating in DFG frame at frame[1]: 'x = 20000;'");
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "x = 20000;" }, function(responseObject) {
+ InspectorProtocol.sendCommand("Debugger.resume", {}, function(responseObject) {
+ ProtocolTest.log("Resumed from breakpoint");
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointdfgcalleeandexaminedfglocalhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -12,52 +12,52 @@
</span><span class="cx"> // This test setting a breakpoints in DFG compiled functions callee and then modify
</span><span class="cx"> // and examine a global and local via the DFG frame.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var breakpointId = null;
</span><span class="cx"> var scriptId = 0;
</span><span class="cx"> var startLine = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> scriptId = messageObject.params.scriptId;
</span><span class="cx"> startLine = messageObject.params.startLine;
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "dfgWithoutInline3();"
</span><span class="cx"> }, function(responseObject) {
</span><del>- InspectorTest.log("dfg function warmed up\n");
</del><ins>+ ProtocolTest.log("dfg function warmed up\n");
</ins><span class="cx">
</span><span class="cx"> var location1 = {scriptId: scriptId, lineNumber: 2, columnNumber: 0};
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location1}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Breakpoint set in breakpointBasic()");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location1}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Breakpoint set in breakpointBasic()");
</ins><span class="cx">
</span><span class="cx"> breakpointId = responseObject.result.breakpointId;
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "dfgWithoutInline3();"
</span><span class="cx"> }, function(responseObject) {
</span><del>- InspectorTest.log("Test complete");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Test complete");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> function dumpResponse(response)
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> if (response.result.wasThrown) {
</span><del>- InspectorTest.log("Exception thrown processing request");
</del><ins>+ ProtocolTest.log("Exception thrown processing request");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- InspectorTest.log("Response value is " + response.result.result.value);
</del><ins>+ ProtocolTest.log("Response value is " + response.result.result.value);
</ins><span class="cx"> return true;
</span><span class="cx"> } catch (e) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -66,39 +66,39 @@
</span><span class="cx">
</span><span class="cx"> function resumeFromBreakpoint()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.resume", {}, function(responseObject) {
- InspectorTest.log("Resumed from breakpoint");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {}, function(responseObject) {
+ ProtocolTest.log("Resumed from breakpoint");
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> var callFrames = messageObject.params.callFrames;
</span><span class="cx"> if (callFrames.length < 3) {
</span><del>- InspectorTest.log("FAIL: too few frames in stack trace");
</del><ins>+ ProtocolTest.log("FAIL: too few frames in stack trace");
</ins><span class="cx"> resumeFromBreakpoint();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> var callFrameId = callFrames[2].callFrameId;
</span><del>- InspectorTest.log("Evaluating in DFG frame at frame[2]: 'globalVal3 = 30;'");
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "globalVal3 = 30;" }, function(responseObject) {
</del><ins>+ ProtocolTest.log("Evaluating in DFG frame at frame[2]: 'globalVal3 = 30;'");
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "globalVal3 = 30;" }, function(responseObject) {
</ins><span class="cx"> if (!dumpResponse(responseObject)) {
</span><span class="cx"> resumeFromBreakpoint();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- InspectorTest.log("Evaluating in DFG frame at frame[2]: 'localVal3 = 12;'");
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "localVal3 = 12;" }, function(responseObject) {
</del><ins>+ ProtocolTest.log("Evaluating in DFG frame at frame[2]: 'localVal3 = 12;'");
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "localVal3 = 12;" }, function(responseObject) {
</ins><span class="cx"> if (!dumpResponse(responseObject)) {
</span><span class="cx"> resumeFromBreakpoint();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- InspectorTest.log("Evaluating in DFG frame at frame[2]: 'localVal3'");
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "localVal3" }, function(responseObject) {
</del><ins>+ ProtocolTest.log("Evaluating in DFG frame at frame[2]: 'localVal3'");
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", { callFrameId: callFrameId, expression: "localVal3" }, function(responseObject) {
</ins><span class="cx"> if (!dumpResponse(responseObject)) {
</span><span class="cx"> resumeFromBreakpoint();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- InspectorTest.sendCommand("Debugger.resume", {}, function(responseObject) {
- InspectorTest.log("Resumed from breakpoint");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {}, function(responseObject) {
+ ProtocolTest.log("Resumed from breakpoint");
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointdfghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -12,39 +12,39 @@
</span><span class="cx"> // This test setting 2 breakpoints in DFG compiled functions: one inlined,
</span><span class="cx"> // and one not inlined.
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var dfgNonInlinedBreakpointId = null;
</span><span class="cx"> var dfgInlinedBreakpointId = null;
</span><span class="cx"> var scriptIdentifier = 0;
</span><span class="cx"> var startLine = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> startLine = messageObject.params.startLine;
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "dfgWithoutInline(); dfgWithInline();"
</span><span class="cx"> }, function(responseObject) {
</span><del>- InspectorTest.log("dfg functions warmed up\n");
</del><ins>+ ProtocolTest.log("dfg functions warmed up\n");
</ins><span class="cx">
</span><span class="cx"> var location1 = {scriptId: scriptIdentifier, lineNumber: 22, columnNumber: 0};
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location1}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Breakpoint set in notInlineable()");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location1}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Breakpoint set in notInlineable()");
</ins><span class="cx">
</span><span class="cx"> dfgNonInlinedBreakpointId = responseObject.result.breakpointId;
</span><span class="cx"> var location2 = {scriptId: scriptIdentifier, lineNumber: 28, columnNumber: 0};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location2}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Breakpoint set in inlineable()\n");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location2}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Breakpoint set in inlineable()\n");
</ins><span class="cx">
</span><span class="cx"> dfgInlinedBreakpointId = responseObject.result.breakpointId;
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {
</ins><span class="cx"> expression: "dfgWithoutInline(); dfgWithInline();"
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -54,24 +54,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var breakpointsHit = 0;
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> var breakpointId = null;
</span><span class="cx"> breakpointsHit++;
</span><del>- InspectorTest.log("Hit Breakpoint " + breakpointsHit + "!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint " + breakpointsHit + "!");
</ins><span class="cx"> if (breakpointsHit == 1)
</span><span class="cx"> breakpointId = dfgNonInlinedBreakpointId;
</span><span class="cx"> else if (breakpointsHit == 2)
</span><span class="cx"> breakpointId = dfgInlinedBreakpointId;
</span><span class="cx"> else
</span><del>- InspectorTest.log("Unexpected breakpoint");
</del><ins>+ ProtocolTest.log("Unexpected breakpoint");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.removeBreakpoint", {"breakpointId": breakpointId}, function(responseObject) {
- InspectorTest.log("Removed Breakpoint " + breakpointsHit + "!");
- InspectorTest.sendCommand("Debugger.resume", {}, function(responseObject) {
</del><ins>+ InspectorProtocol.sendCommand("Debugger.removeBreakpoint", {"breakpointId": breakpointId}, function(responseObject) {
+ ProtocolTest.log("Removed Breakpoint " + breakpointsHit + "!");
+ InspectorProtocol.sendCommand("Debugger.resume", {}, function(responseObject) {
</ins><span class="cx"> if (breakpointsHit == 2) {
</span><del>- InspectorTest.log("PASS");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointoptionsexceptionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,51 +5,51 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.importScript("console-test.js");
</del><ins>+ ProtocolTest.importScript("console-test.js");
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Console.enable", {});
- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Console.enable", {});
+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><span class="cx"> var logsSeen = 0;
</span><span class="cx"> const expectedLogs = 2;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 8, columnNumber: 0};
</span><span class="cx"> var options = {condition: "this.will.cause.exception", autoContinue: true};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Running breakpointWithCondition to trigger condition exception.");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function() {
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Running breakpointWithCondition to trigger condition exception.");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointWithCondition(1,2)"}, function() {
</ins><span class="cx"> location = {scriptId: scriptIdentifier, lineNumber: 18, columnNumber: 0};
</span><span class="cx"> options = {actions: [{"type": "evaluate", "data": "this.will.cause.exception"}], autoContinue: true};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
- InspectorTest.log("Running breakpointActions to trigger actions exception.");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(1,2)"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
+ ProtocolTest.log("Running breakpointActions to trigger actions exception.");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointActions(1,2)"});
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx">
</span><del>- InspectorTest.log("FAIL: should not have hit breakpoint, autoContinue was true");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: should not have hit breakpoint, autoContinue was true");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Console.messageAdded"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Console.messageAdded"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- var message = InspectorTest.Console.sanitizeConsoleMessage(messageObject);
- InspectorTest.log("PASS: Console Message: " + JSON.stringify(message));
</del><ins>+ var message = ProtocolTest.Console.sanitizeConsoleMessage(messageObject);
+ ProtocolTest.log("PASS: Console Message: " + JSON.stringify(message));
</ins><span class="cx">
</span><span class="cx"> if (++logsSeen === expectedLogs)
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,35 +5,35 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/resources\/breakpoint\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found breakpoint.js");
</del><ins>+ ProtocolTest.log("Found breakpoint.js");
</ins><span class="cx"> var scriptIdentifier = messageObject.params.scriptId;
</span><span class="cx"> var location = {scriptId: scriptIdentifier, lineNumber: 3, columnNumber: 0};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function(responseObject) {
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function(responseObject) {
</ins><span class="cx"> if (!responseObject.error) {
</span><del>- InspectorTest.log("FAIL: Expected error setting duplicate breakpoint");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: Expected error setting duplicate breakpoint");
+ ProtocolTest.completeTest();
</ins><span class="cx"> } else {
</span><del>- InspectorTest.log("PASS: Received error setting duplicate breakpoint: " + responseObject.error.message);
- InspectorTest.log("Running breakpointBasic");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"});
</del><ins>+ ProtocolTest.log("PASS: Received error setting duplicate breakpoint: " + responseObject.error.message);
+ ProtocolTest.log("Running breakpointBasic");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "breakpointBasic()"});
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
- InspectorTest.log("PASS");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
+ ProtocolTest.log("PASS");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointByUrlsourceURLhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,30 +8,30 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> if (/sourceURL-test\.js$/.test(messageObject.params.url)) {
</span><del>- InspectorTest.log("Found sourceURL-test.js");
</del><ins>+ ProtocolTest.log("Found sourceURL-test.js");
</ins><span class="cx"> var params = {url: messageObject.params.url, lineNumber: 3, columnNumber: 0};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpointByUrl", params, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Running sourceURLFunction");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "sourceURLFunction()"});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpointByUrl", params, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Running sourceURLFunction");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "sourceURLFunction()"});
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Hit Breakpoint!");
</del><ins>+ ProtocolTest.log("Hit Breakpoint!");
</ins><span class="cx"> var callFrameIdentifier = messageObject.params.callFrames[0].callFrameId;
</span><del>- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `a` (expecting number 1) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "c"}, function(messageObject) {
- InspectorTest.log("Evaluted value of `c` (expecting undefined) was: " + JSON.stringify(messageObject.result.result));
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "a"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `a` (expecting number 1) was: " + JSON.stringify(messageObject.result.result));
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "c"}, function(messageObject) {
+ ProtocolTest.log("Evaluted value of `c` (expecting undefined) was: " + JSON.stringify(messageObject.result.result));
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetPauseOnExceptionsallhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> var statement = list[i];
</span><span class="cx"> var last = i === list.length - 1;
</span><span class="cx"> var responseCallback = last ? function() { setTimeout(callback, 10); } : function(){};
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"}, responseCallback);
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"}, responseCallback);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> var statements = statementsWithoutExceptions;
</span><span class="cx"> evaluateStatements(statements, function() {
</span><del>- InspectorTest.log("PASS - did not pause on non-exception statements");
</del><ins>+ ProtocolTest.log("PASS - did not pause on non-exception statements");
</ins><span class="cx"> callback();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> // Evaluate statement and expect to pause.
</span><span class="cx"> if (currentCaughtExceptionStatement < statementsWithCaughtExceptions.length) {
</span><span class="cx"> var statement = statementsWithCaughtExceptions[currentCaughtExceptionStatement++];
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Done evaluating caught exceptions statements. Move on to uncaught exceptions.
</span><del>- InspectorTest.log("PASS - paused for each caught exception");
</del><ins>+ ProtocolTest.log("PASS - paused for each caught exception");
</ins><span class="cx"> triggerNext = triggerNextUncaughtException;
</span><span class="cx"> triggerNext();
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> // Evaluate statement and expect to pause.
</span><span class="cx"> if (currentUncaughtExceptionStatement < statementsWithUncaughtExceptions.length) {
</span><span class="cx"> var statement = statementsWithUncaughtExceptions[currentUncaughtExceptionStatement++];
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,40 +92,40 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Done evaluating statements to pause. Evaluate some more we do not expect to pause.
</span><del>- InspectorTest.log("PASS - paused for each uncaught exception");
</del><ins>+ ProtocolTest.log("PASS - paused for each uncaught exception");
</ins><span class="cx"> expectPause = false;
</span><span class="cx"> evaluateExpectedNoPauses(function() {
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Debugger.setPauseOnExceptions - all");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Debugger.setPauseOnExceptions - all");
</ins><span class="cx"> evaluateExpectedNoPauses(function() {
</span><span class="cx"> expectPause = true;
</span><span class="cx"> triggerNext();
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Paused!");
</del><ins>+ ProtocolTest.log("Paused!");
</ins><span class="cx">
</span><span class="cx"> if (!expectPause) {
</span><del>- InspectorTest.log("FAIL - debugger paused when we did not expect to");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL - debugger paused when we did not expect to");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.resumed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.resumed"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Resumed");
</del><ins>+ ProtocolTest.log("Resumed");
</ins><span class="cx"> triggerNext();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetPauseOnExceptionsnonehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,38 +5,38 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "none"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Debugger.setPauseOnExceptions - none");
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { 1+1; }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { noException(); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(noException, 7); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { try{ ({}).a.b.c.d } catch (e) { console.log('caught inline: ' + JSON.stringify(e)); } }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(exceptionBasic, 1); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(exceptionDOM, 2); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(exceptionInHostFunction, 3); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(throwString, 10); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(throwParam, 5, new Error('error message')); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { {}.a.b.c.d; }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { exceptionBasic(); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { exceptionDOM(); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { exceptionInHostFunction(); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throwString(); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throwParam({x:1}); }, 0);"});
- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throwParam(new Error('error message')); }, 0);"}, function() {
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Debugger.setPauseOnExceptions - none");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { 1+1; }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { noException(); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(noException, 7); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { try{ ({}).a.b.c.d } catch (e) { console.log('caught inline: ' + JSON.stringify(e)); } }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(exceptionBasic, 1); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(exceptionDOM, 2); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(exceptionInHostFunction, 3); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(throwString, 10); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { catchNested(throwParam, 5, new Error('error message')); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { {}.a.b.c.d; }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { exceptionBasic(); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { exceptionDOM(); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { exceptionInHostFunction(); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throwString(); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throwParam({x:1}); }, 0);"});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { throwParam(new Error('error message')); }, 0);"}, function() {
</ins><span class="cx"> setTimeout(function() {
</span><del>- InspectorTest.log("PASS: No pauses");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS: No pauses");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }, 10);
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Paused!");
- InspectorTest.log("FAIL");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Paused!");
+ ProtocolTest.log("FAIL");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetPauseOnExceptionsuncaughthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> var statement = list[i];
</span><span class="cx"> var last = i === list.length - 1;
</span><span class="cx"> var responseCallback = last ? function() { setTimeout(callback, 10); } : function(){};
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"}, responseCallback);
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"}, responseCallback);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> {
</span><span class="cx"> var statements = statementsWithoutExceptions.concat(statementsWithCaughtExceptions);
</span><span class="cx"> evaluateStatements(statements, function() {
</span><del>- InspectorTest.log("PASS - did not pause on non-exception statements or caught exception statements");
</del><ins>+ ProtocolTest.log("PASS - did not pause on non-exception statements or caught exception statements");
</ins><span class="cx"> callback();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> // Evaluate statement and expect to pause.
</span><span class="cx"> if (currentUncaughtExceptionStatement < statementsWithUncaughtExceptions.length) {
</span><span class="cx"> var statement = statementsWithUncaughtExceptions[currentUncaughtExceptionStatement++];
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {expression: "setTimeout(function() { " + statement + " }, 0);"});
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -69,41 +69,41 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Done evaluating statements to pause. Evaluate some more we do not expect to pause.
</span><del>- InspectorTest.log("PASS - paused for each uncaught exception");
</del><ins>+ ProtocolTest.log("PASS - paused for each uncaught exception");
</ins><span class="cx"> expectPause = false;
</span><span class="cx"> evaluateExpectedNoPauses(function() {
</span><del>- InspectorTest.log("PASS");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("PASS");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
- InspectorTest.sendCommand("Debugger.setPauseOnExceptions", {state: "uncaught"}, function(responseObject) {
- InspectorTest.checkForError(responseObject);
- InspectorTest.log("Debugger.setPauseOnExceptions - uncaught");
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "uncaught"}, function(responseObject) {
+ InspectorProtocol.checkForError(responseObject);
+ ProtocolTest.log("Debugger.setPauseOnExceptions - uncaught");
</ins><span class="cx"> evaluateExpectedNoPauses(function() {
</span><span class="cx"> expectPause = true;
</span><span class="cx"> triggerNextUncaughtException();
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.paused"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.paused"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Paused!");
</del><ins>+ ProtocolTest.log("Paused!");
</ins><span class="cx">
</span><span class="cx"> if (!expectPause) {
</span><del>- InspectorTest.log("FAIL - debugger paused when we did not expect to");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL - debugger paused when we did not expect to");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.resume", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.resume", {});
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Debugger.resumed"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Debugger.resumed"] = function(messageObject)
</ins><span class="cx"> {
</span><del>- InspectorTest.log("Resumed");
</del><ins>+ ProtocolTest.log("Resumed");
</ins><span class="cx"> triggerNextUncaughtException();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetVariableValuehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setVariableValue.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setVariableValue.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/setVariableValue.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -15,14 +15,14 @@
</span><span class="cx"> try {
</span><span class="cx"> processStepOrFail(s);
</span><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log(e.stack);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(e.stack);
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function processStepOrFail(s) {
</span><span class="cx"> if (!s) {
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!s.command) {
</span><span class="lines">@@ -37,29 +37,29 @@
</span><span class="cx"> if ("error" in response) {
</span><span class="cx"> if (!("errorHandler" in s)) {
</span><span class="cx"> // Error message is not logged intentionally, it may be platform-specific.
</span><del>- InspectorTest.log("Protocol command '" + s.command + "' failed");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Protocol command '" + s.command + "' failed");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> next = s.errorHandler(response.error);
</span><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log(e.stack);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(e.stack);
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> try {
</span><span class="cx"> next = s.callback(response.result);
</span><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log(e.stack);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(e.stack);
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> processStep(next);
</span><span class="cx"> }
</span><del>- InspectorTest.sendCommand(s.command, s.params, innerCallback);
</del><ins>+ InspectorProtocol.sendCommand(s.command, s.params, innerCallback);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function callbackLogClosureEval(result) {
</span><del>- InspectorTest.log("Closure returns: " + JSON.stringify(result.result));
- InspectorTest.log(" (expected: 'ttttrue52013')");
</del><ins>+ ProtocolTest.log("Closure returns: " + JSON.stringify(result.result));
+ ProtocolTest.log(" (expected: 'ttttrue52013')");
</ins><span class="cx">
</span><span class="cx"> var params = {
</span><span class="cx"> functionObjectId: functionObjectId,
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setVariableCallback() {
</span><del>- InspectorTest.log("Debugger.setVariableValue OK");
</del><ins>+ ProtocolTest.log("Debugger.setVariableValue OK");
</ins><span class="cx">
</span><span class="cx"> var params = {
</span><span class="cx"> objectId: functionObjectId,
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function callbackLogClosureEval2(result) {
</span><del>- InspectorTest.log("Closure returns: " + JSON.stringify(result.result));
- InspectorTest.log(" (expected: 'ttttrue42013')");
</del><ins>+ ProtocolTest.log("Closure returns: " + JSON.stringify(result.result));
+ ProtocolTest.log(" (expected: 'ttttrue42013')");
</ins><span class="cx">
</span><span class="cx"> var params = {
</span><span class="cx"> // No target is specified
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setVariableErrorCallback3(error) {
</span><del>- InspectorTest.log("Expected error: " + JSON.stringify(error));
</del><ins>+ ProtocolTest.log("Expected error: " + JSON.stringify(error));
</ins><span class="cx">
</span><span class="cx"> var params = {
</span><span class="cx"> functionObjectId: functionObjectId,
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setVariableErrorCallback4(error) {
</span><del>- InspectorTest.log("Expected error");
</del><ins>+ ProtocolTest.log("Expected error");
</ins><span class="cx">
</span><span class="cx"> var params = {
</span><span class="cx"> functionObjectId: functionObjectId,
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setVariableErrorCallback5(error) {
</span><del>- InspectorTest.log("Expected error");
</del><ins>+ ProtocolTest.log("Expected error");
</ins><span class="cx">
</span><span class="cx"> // End of test.
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerterminatededicatedworkerwhilepausedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> var workerRequestId = 1;
</span><span class="cx"> function sendCommandToWorker(method, params)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Worker.sendMessageToWorker", {
</del><ins>+ InspectorProtocol.sendCommand("Worker.sendMessageToWorker", {
</ins><span class="cx"> "workerId": workerId,
</span><span class="cx"> "message": {
</span><span class="cx"> "method": method,
</span><span class="lines">@@ -28,32 +28,32 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Worker.enable", {}, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand("Worker.enable", {}, function(messageObject) {
</ins><span class="cx"> if ("error" in messageObject) {
</span><del>- InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Worker.workerCreated"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Worker.workerCreated"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> workerId = messageObject["params"]["workerId"];
</span><del>- InspectorTest.log("Worker created");
- InspectorTest.sendCommand("Worker.connectToWorker", {"workerId": workerId}, function(messageObject) {
- InspectorTest.log("didConnectToWorker");
</del><ins>+ ProtocolTest.log("Worker created");
+ InspectorProtocol.sendCommand("Worker.connectToWorker", {"workerId": workerId}, function(messageObject) {
+ ProtocolTest.log("didConnectToWorker");
</ins><span class="cx"> sendCommandToWorker("Debugger.enable", {});
</span><span class="cx"> sendCommandToWorker("Debugger.pause", {});
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> var message = messageObject["params"]["message"];
</span><span class="cx"> if (message["method"] === "Debugger.paused") {
</span><del>- InspectorTest.log("Worker paused");
- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "worker.terminate()"}, function(messageObject) {
- InspectorTest.log("SUCCESS: Did terminate paused worker");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Worker paused");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "worker.terminate()"}, function(messageObject) {
+ ProtocolTest.log("SUCCESS: Did terminate paused worker");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdomremoveeventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/dom-remove-events.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/dom-remove-events.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/dom-remove-events.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> {
</span><span class="cx"> var nodesById = {};
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = onSetChildNodes;
- InspectorTest.eventHandler["DOM.childNodeRemoved"] = onChildNodeRemoved;
- InspectorTest.eventHandler["DOM.childNodeInserted"] = onChildNodeInserted;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = onSetChildNodes;
+ InspectorProtocol.eventHandler["DOM.childNodeRemoved"] = onChildNodeRemoved;
+ InspectorProtocol.eventHandler["DOM.childNodeInserted"] = onChildNodeInserted;
</ins><span class="cx">
</span><span class="cx"> function createNodeAttributesMap(node)
</span><span class="cx"> {
</span><span class="lines">@@ -47,31 +47,31 @@
</span><span class="cx"> function onChildNodeRemoved(response)
</span><span class="cx"> {
</span><span class="cx"> var nodeId = response.params.nodeId;
</span><del>- InspectorTest.assert(getNodeIdentifier(nodeId) === "target_element", "onChildNodeRemoved called for #target_element");
</del><ins>+ ProtocolTest.assert(getNodeIdentifier(nodeId) === "target_element", "onChildNodeRemoved called for #target_element");
</ins><span class="cx"> delete nodesById[nodeId];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onChildNodeInserted(response)
</span><span class="cx"> {
</span><span class="cx"> collectNode(response.params.node);
</span><del>- InspectorTest.assert(getNodeIdentifier(response.params.parentNodeId) === "final_container", "onChildNodeInserted called for parent node #final_container");
- InspectorTest.assert(getNodeIdentifier(response.params.node.nodeId) === "target_element", "onChildNodeInserted called for child node #target_element");
</del><ins>+ ProtocolTest.assert(getNodeIdentifier(response.params.parentNodeId) === "final_container", "onChildNodeInserted called for parent node #final_container");
+ ProtocolTest.assert(getNodeIdentifier(response.params.node.nodeId) === "target_element", "onChildNodeInserted called for child node #target_element");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(msg)
</span><span class="cx"> {
</span><del>- InspectorTest.checkForError(msg);
- InspectorTest.sendCommand("DOM.querySelector", {"nodeId": msg.result.root.nodeId, "selector": "#final_container"}, onQuerySelector);
</del><ins>+ InspectorProtocol.checkForError(msg);
+ InspectorProtocol.sendCommand("DOM.querySelector", {"nodeId": msg.result.root.nodeId, "selector": "#final_container"}, onQuerySelector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onQuerySelector(response)
</span><span class="cx"> {
</span><span class="cx"> // Make sure we receive the children of the "#final_container" as they are added.
</span><del>- InspectorTest.sendCommand("DOM.requestChildNodes", {nodeId: response.result.nodeId});
- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "moveNode()"}, function() {
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("DOM.requestChildNodes", {nodeId: response.result.nodeId});
+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "moveNode()"}, function() {
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdomsearchcrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/dom-search-crash.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/dom-search-crash.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/dom-search-crash.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -4,18 +4,18 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(message) {
</span><del>- InspectorTest.checkForError(message);
- InspectorTest.sendCommand("DOM.performSearch", {query: "FooBar"}, onSearchCompleted);
</del><ins>+ InspectorProtocol.checkForError(message);
+ InspectorProtocol.sendCommand("DOM.performSearch", {query: "FooBar"}, onSearchCompleted);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onSearchCompleted(message)
</span><span class="cx"> {
</span><del>- InspectorTest.checkForError(message);
- InspectorTest.log("PASS: Test passes if it doesn't crash.");
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.checkForError(message);
+ ProtocolTest.log("PASS: Test passes if it doesn't crash.");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdomsearchwithcontexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/dom-search-with-context.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/dom-search-with-context.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/dom-search-with-context.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> // Create a DOM listener to convert nodeIds to tag names.
</span><del>- InspectorTest.importScript("../dom/resources/InspectorDOMListener.js");
</del><ins>+ ProtocolTest.importScript("../dom/resources/InspectorDOMListener.js");
</ins><span class="cx"> var dom = createDOMListener();
</span><span class="cx">
</span><span class="cx"> // Caching the output to avoid searching through the log.
</span><span class="lines">@@ -44,10 +44,10 @@
</span><span class="cx"> }
</span><span class="cx"> ];
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(message) {
</span><del>- InspectorTest.checkForError(message);
</del><ins>+ InspectorProtocol.checkForError(message);
</ins><span class="cx"> dom.collectNode(message.result.root);
</span><span class="cx"> documentId = message.result.root.nodeId;
</span><span class="cx"> performSearches(domSearchQueries, testFinished);
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> {
</span><span class="cx"> resolveSelectors(queryData.nodes, function(nodeIds) {
</span><span class="cx"> output.push("=== Query: " + JSON.stringify(queryData.query) + " in [" + queryData.nodes.join(", ") + "] ===");
</span><del>- InspectorTest.sendCommand("DOM.performSearch", {query: queryData.query, nodeIds: nodeIds}, function(message) {
- InspectorTest.checkForError(message);
</del><ins>+ InspectorProtocol.sendCommand("DOM.performSearch", {query: queryData.query, nodeIds: nodeIds}, function(message) {
+ InspectorProtocol.checkForError(message);
</ins><span class="cx"> printSearchResults(message.result, callback);
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> if (!remaining)
</span><span class="cx"> return callback(results);
</span><span class="cx"> nodes.forEach(function(selector, index) {
</span><del>- InspectorTest.sendCommand("DOM.querySelector", {nodeId: documentId, selector: selector}, function(message) {
- InspectorTest.checkForError(message);
</del><ins>+ InspectorProtocol.sendCommand("DOM.querySelector", {nodeId: documentId, selector: selector}, function(message) {
+ InspectorProtocol.checkForError(message);
</ins><span class="cx"> results[index] = message.result.nodeId;
</span><span class="cx"> if (--remaining <= 0)
</span><span class="cx"> callback(results);
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return callback();
</span><span class="cx">
</span><span class="cx"> var options = {"searchId": results.searchId, "fromIndex": 0, "toIndex": results.resultCount};
</span><del>- InspectorTest.sendCommand("DOM.getSearchResults", options, function(message) {
</del><ins>+ InspectorProtocol.sendCommand("DOM.getSearchResults", options, function(message) {
</ins><span class="cx"> for (var nodeId of message.result.nodeIds)
</span><span class="cx"> output.push(dom.getNodeIdentifier(nodeId));
</span><span class="cx"> callback();
</span><span class="lines">@@ -107,8 +107,8 @@
</span><span class="cx">
</span><span class="cx"> function testFinished()
</span><span class="cx"> {
</span><del>- InspectorTest.log(output.join("\n"));
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(output.join("\n"));
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdomsearchhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/dom-search.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/dom-search.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/dom-search.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -5,19 +5,19 @@
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> // Loading the queries from external file to avoid having them show up in the results.
</span><del>- InspectorTest.importScript("../../../../inspector/dom/resources/dom-search-queries.js");
</del><ins>+ ProtocolTest.importScript("../../../../inspector/dom/resources/dom-search-queries.js");
</ins><span class="cx">
</span><span class="cx"> // Create a DOM listener to convert nodeIds to tag names.
</span><del>- InspectorTest.importScript("../dom/resources/InspectorDOMListener.js");
</del><ins>+ ProtocolTest.importScript("../dom/resources/InspectorDOMListener.js");
</ins><span class="cx"> var dom = createDOMListener();
</span><span class="cx">
</span><span class="cx"> // Caching the output to avoid searching through the log.
</span><span class="cx"> var output = [];
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(message) {
</span><del>- InspectorTest.checkForError(message);
</del><ins>+ InspectorProtocol.checkForError(message);
</ins><span class="cx"> dom.collectNode(message.result.root);
</span><span class="cx"> performSearches(domSearchQueries, testFinished);
</span><span class="cx"> }
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> function search(query, callback)
</span><span class="cx"> {
</span><span class="cx"> output.push("=== Query: " + JSON.stringify(query) + " ===");
</span><del>- InspectorTest.sendCommand("DOM.performSearch", {query: query}, function(message) {
- InspectorTest.checkForError(message);
</del><ins>+ InspectorProtocol.sendCommand("DOM.performSearch", {query: query}, function(message) {
+ InspectorProtocol.checkForError(message);
</ins><span class="cx"> printSearchResults(message.result, callback);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return callback();
</span><span class="cx">
</span><span class="cx"> var options = {"searchId": results.searchId, "fromIndex": 0, "toIndex": results.resultCount};
</span><del>- InspectorTest.sendCommand("DOM.getSearchResults", options, function onResultsReceived(message) {
</del><ins>+ InspectorProtocol.sendCommand("DOM.getSearchResults", options, function onResultsReceived(message) {
</ins><span class="cx"> for (var nodeId of message.result.nodeIds)
</span><span class="cx"> output.push(dom.getNodeIdentifier(nodeId));
</span><span class="cx"> callback();
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx">
</span><span class="cx"> function testFinished()
</span><span class="cx"> {
</span><del>- InspectorTest.log(output.join("\n"));
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(output.join("\n"));
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomfocushtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/focus.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/focus.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/focus.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -10,32 +10,32 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(msg) {
</span><span class="cx"> if (msg.error) {
</span><del>- InspectorTest.log(msg.error.message);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(msg.error.message);
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> var node = msg.result.root;
</span><del>- InspectorTest.sendCommand("DOM.querySelector", { "nodeId": node.nodeId, "selector": "#second" }, onQuerySelector);
</del><ins>+ InspectorProtocol.sendCommand("DOM.querySelector", { "nodeId": node.nodeId, "selector": "#second" }, onQuerySelector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onQuerySelector(msg) {
</span><span class="cx"> if (msg.error) {
</span><del>- InspectorTest.log(msg.error.message);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(msg.error.message);
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> var node = msg.result;
</span><del>- InspectorTest.sendCommand("DOM.focus", { "nodeId": node.nodeId }, onFocus);
</del><ins>+ InspectorProtocol.sendCommand("DOM.focus", { "nodeId": node.nodeId }, onFocus);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onFocus(msg) {
</span><span class="cx"> if (msg.error)
</span><del>- InspectorTest.log(msg.error);
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log(msg.error);
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -139,45 +139,45 @@
</span><span class="cx"> var documentNodeId = null;
</span><span class="cx">
</span><span class="cx"> function onGotDocument(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> documentNodeId = response.result.root.nodeId;
</span><del>- InspectorTest.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": documentNodeId}, onGotAccessibilityPropertiesForDocumentNode);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": documentNodeId}, onGotAccessibilityPropertiesForDocumentNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotAccessibilityPropertiesForDocumentNode(response) {
</span><del>- InspectorTest.checkForError(response);
- InspectorTest.log("#document");
</del><ins>+ InspectorProtocol.checkForError(response);
+ ProtocolTest.log("#document");
</ins><span class="cx"> logAccessibilityProperties(response.result.properties);
</span><del>- InspectorTest.log("\n");
- InspectorTest.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
</del><ins>+ ProtocolTest.log("\n");
+ InspectorProtocol.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotQuerySelectorAll(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> examples = response.result.nodeIds;
</span><del>- InspectorTest.log("Total elements to be tested: " + examples.length + ".");
</del><ins>+ ProtocolTest.log("Total elements to be tested: " + examples.length + ".");
</ins><span class="cx"> loop();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function loop() {
</span><span class="cx"> if (examples.length) {
</span><del>- InspectorTest.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
</ins><span class="cx"> } else {
</span><span class="cx"> finishTest();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotOuterHTML(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> var outerHTML = response.result.outerHTML;
</span><span class="cx"> outerHTML = outerHTML.replace(/ class="ex"/g, ""); // remove any duplicated, unnecessary class attributes
</span><span class="cx"> outerHTML = outerHTML.replace(/;base64,.*?"/, "...\""); // suppress full data URIs in output
</span><del>- InspectorTest.log("\n" + outerHTML);
- InspectorTest.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
</del><ins>+ ProtocolTest.log("\n" + outerHTML);
+ InspectorProtocol.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotAccessibilityProperties(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> logAccessibilityProperties(response.result.properties);
</span><span class="cx"> examples.pop();
</span><span class="cx"> loop();
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> case "mouseEventNodeId":
</span><span class="cx"> case "parentNodeId":
</span><span class="cx"> if (typeof value === "number")
</span><del>- InspectorTest.log(" " + key + ": exists");
</del><ins>+ ProtocolTest.log(" " + key + ": exists");
</ins><span class="cx"> break;
</span><span class="cx"> case "childNodeIds":
</span><span class="cx"> case "controlledNodeIds":
</span><span class="lines">@@ -201,23 +201,23 @@
</span><span class="cx"> case "ownedNodeIds":
</span><span class="cx"> case "selectedChildNodeIds":
</span><span class="cx"> if (typeof value === "object" && value.length)
</span><del>- InspectorTest.log(" " + key + ".length: " + value.length);
</del><ins>+ ProtocolTest.log(" " + key + ".length: " + value.length);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- InspectorTest.log(" " + key + ": " + value);
</del><ins>+ ProtocolTest.log(" " + key + ": " + value);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishTest() {
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_liveRegionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_liveRegion.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_liveRegion.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_liveRegion.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -62,36 +62,36 @@
</span><span class="cx"> var bodyNodeId = null;
</span><span class="cx">
</span><span class="cx"> function onGotDocument(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> documentNodeId = response.result.root.nodeId;
</span><del>- InspectorTest.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
</del><ins>+ InspectorProtocol.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotQuerySelectorAll(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> examples = response.result.nodeIds;
</span><del>- InspectorTest.log("Total elements to be tested: " + examples.length + ".");
</del><ins>+ ProtocolTest.log("Total elements to be tested: " + examples.length + ".");
</ins><span class="cx"> loop();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function loop() {
</span><span class="cx"> if (examples.length) {
</span><del>- InspectorTest.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
</ins><span class="cx"> } else {
</span><span class="cx"> finishTest();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotOuterHTML(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> var outerHTML = response.result.outerHTML;
</span><span class="cx"> outerHTML = outerHTML.replace(/ class="ex"/g, ""); // remove any duplicated, unnecessary class attributes
</span><del>- InspectorTest.log("\n" + outerHTML);
- InspectorTest.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
</del><ins>+ ProtocolTest.log("\n" + outerHTML);
+ InspectorProtocol.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotAccessibilityProperties(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> logAccessibilityProperties(response.result.properties);
</span><span class="cx"> examples.pop();
</span><span class="cx"> loop();
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> case "liveRegionAtomic":
</span><span class="cx"> case "liveRegionRelevant":
</span><span class="cx"> case "liveRegionStatus":
</span><del>- InspectorTest.log(" " + key + ": " + value);
</del><ins>+ ProtocolTest.log(" " + key + ": " + value);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> continue;
</span><span class="lines">@@ -115,12 +115,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishTest() {
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNode_mouseEventNodeIdhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_mouseEventNodeId.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_mouseEventNodeId.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode_mouseEventNodeId.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -76,47 +76,47 @@
</span><span class="cx"> var bodyNodeId = null;
</span><span class="cx">
</span><span class="cx"> function onGotDocument(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> documentNodeId = response.result.root.nodeId;
</span><del>- InspectorTest.sendCommand("DOM.querySelector", {"nodeId": documentNodeId, "selector": "body"}, onGotBody);
</del><ins>+ InspectorProtocol.sendCommand("DOM.querySelector", {"nodeId": documentNodeId, "selector": "body"}, onGotBody);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotBody(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> bodyNodeId = response.result.nodeId;
</span><del>- InspectorTest.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": bodyNodeId}, onGotAccessibilityPropertiesForBodyNode);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": bodyNodeId}, onGotAccessibilityPropertiesForBodyNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotAccessibilityPropertiesForBodyNode(response) {
</span><del>- InspectorTest.checkForError(response);
- InspectorTest.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
</del><ins>+ InspectorProtocol.checkForError(response);
+ InspectorProtocol.sendCommand("DOM.querySelectorAll", {"nodeId": documentNodeId, "selector": ".ex"}, onGotQuerySelectorAll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotQuerySelectorAll(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> examples = response.result.nodeIds;
</span><del>- InspectorTest.log("Total elements to be tested: " + examples.length + ".");
</del><ins>+ ProtocolTest.log("Total elements to be tested: " + examples.length + ".");
</ins><span class="cx"> loop();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function loop() {
</span><span class="cx"> if (examples.length) {
</span><del>- InspectorTest.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getOuterHTML", {"nodeId": examples[examples.length-1]}, onGotOuterHTML);
</ins><span class="cx"> } else {
</span><span class="cx"> finishTest();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotOuterHTML(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> var outerHTML = response.result.outerHTML;
</span><span class="cx"> outerHTML = outerHTML.replace(/ class="ex"/g, ""); // remove any duplicated, unnecessary class attributes
</span><del>- InspectorTest.log("\n" + outerHTML);
- InspectorTest.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
</del><ins>+ ProtocolTest.log("\n" + outerHTML);
+ InspectorProtocol.sendCommand("DOM.getAccessibilityPropertiesForNode", {"nodeId": examples[examples.length-1]}, onGotAccessibilityProperties);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotAccessibilityProperties(response) {
</span><del>- InspectorTest.checkForError(response);
</del><ins>+ InspectorProtocol.checkForError(response);
</ins><span class="cx"> logAccessibilityProperties(response.result.properties);
</span><span class="cx"> examples.pop();
</span><span class="cx"> loop();
</span><span class="lines">@@ -132,16 +132,16 @@
</span><span class="cx"> msg += "self";
</span><span class="cx"> else
</span><span class="cx"> msg += "ancestor element";
</span><del>- InspectorTest.log(msg);
</del><ins>+ ProtocolTest.log(msg);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishTest() {
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "cleanup()"}, function(){
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightflowwithnoregionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlight-flow-with-no-region.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/highlight-flow-with-no-region.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/highlight-flow-with-no-region.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -9,16 +9,16 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(msg) {
</span><del>- InspectorTest.checkForError(msg);
</del><ins>+ InspectorProtocol.checkForError(msg);
</ins><span class="cx"> var node = msg.result.root;
</span><del>- InspectorTest.sendCommand("DOM.querySelector", { "nodeId": node.nodeId, "selector": "#inspectedElement" }, onQuerySelector);
</del><ins>+ InspectorProtocol.sendCommand("DOM.querySelector", { "nodeId": node.nodeId, "selector": "#inspectedElement" }, onQuerySelector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onQuerySelector(msg) {
</span><del>- InspectorTest.checkForError(msg);
</del><ins>+ InspectorProtocol.checkForError(msg);
</ins><span class="cx"> var node = msg.result;
</span><span class="cx"> var highlightConfig = {
</span><span class="cx"> showInfo: true,
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx"> borderColor: {r: 255, g: 255, b: 255},
</span><span class="cx"> marginColor: {r: 255, g: 255, b: 255},
</span><span class="cx"> };
</span><del>- InspectorTest.sendCommand("DOM.highlightNode", { "highlightConfig": highlightConfig, "nodeId": node.nodeId }, onHighlightComplete);
</del><ins>+ InspectorProtocol.sendCommand("DOM.highlightNode", { "highlightConfig": highlightConfig, "nodeId": node.nodeId }, onHighlightComplete);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onHighlightComplete(msg) {
</span><del>- InspectorTest.checkForError(msg);
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.checkForError(msg);
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomremovemultiplenodeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/remove-multiple-nodes.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/remove-multiple-nodes.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/remove-multiple-nodes.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -18,9 +18,9 @@
</span><span class="cx"> {
</span><span class="cx"> var nodesById = {};
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = onSetChildNodes;
- InspectorTest.eventHandler["DOM.childNodeRemoved"] = onChildNodeRemoved;
- InspectorTest.eventHandler["DOM.childNodeInserted"] = onChildNodeInserted;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = onSetChildNodes;
+ InspectorProtocol.eventHandler["DOM.childNodeRemoved"] = onChildNodeRemoved;
+ InspectorProtocol.eventHandler["DOM.childNodeInserted"] = onChildNodeInserted;
</ins><span class="cx">
</span><span class="cx"> function createNodeAttributesMap(attributes)
</span><span class="cx"> {
</span><span class="lines">@@ -67,32 +67,32 @@
</span><span class="cx"> function onChildNodeRemoved(response)
</span><span class="cx"> {
</span><span class="cx"> var nodeId = response.params.nodeId;
</span><del>- InspectorTest.log("Removing node " + getNodeIdentifier(nodeId));
</del><ins>+ ProtocolTest.log("Removing node " + getNodeIdentifier(nodeId));
</ins><span class="cx"> delete nodesById[nodeId];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onChildNodeInserted(response)
</span><span class="cx"> {
</span><span class="cx"> collectNode(response.params.node);
</span><del>- InspectorTest.log("Inserting node " + getNodeIdentifier(response.params.node.nodeId) + " into " + getNodeIdentifier(response.params.parentNodeId));
</del><ins>+ ProtocolTest.log("Inserting node " + getNodeIdentifier(response.params.node.nodeId) + " into " + getNodeIdentifier(response.params.parentNodeId));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx">
</span><span class="cx"> function onGotDocument(msg)
</span><span class="cx"> {
</span><del>- InspectorTest.checkForError(msg);
- InspectorTest.sendCommand("DOM.querySelectorAll", {"nodeId": msg.result.root.nodeId, "selector": "#parent_container,#final_container"}, onQuerySelectorAll);
</del><ins>+ InspectorProtocol.checkForError(msg);
+ InspectorProtocol.sendCommand("DOM.querySelectorAll", {"nodeId": msg.result.root.nodeId, "selector": "#parent_container,#final_container"}, onQuerySelectorAll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onQuerySelectorAll(response)
</span><span class="cx"> {
</span><span class="cx"> // Make sure we receive the children of the "#final_container" as they are added.
</span><span class="cx"> for (var i = 0; i < response.result.nodeIds.length; ++i)
</span><del>- InspectorTest.sendCommand("DOM.requestChildNodes", {nodeId: response.result.nodeIds[i]});
</del><ins>+ InspectorProtocol.sendCommand("DOM.requestChildNodes", {nodeId: response.result.nodeIds[i]});
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "moveNode()"}, function() {
- InspectorTest.completeTest();
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "moveNode()"}, function() {
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomrequestchildnodesdepthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/request-child-nodes-depth.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/request-child-nodes-depth.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom/request-child-nodes-depth.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> getDocument();
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = function setChildNodes(messageObject)
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = function setChildNodes(messageObject)
</ins><span class="cx"> {
</span><span class="cx"> eventsCount++;
</span><span class="cx">
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> else if (eventsCount === 3)
</span><span class="cx"> gotAllChildren(messageObject);
</span><span class="cx"> else
</span><del>- InspectorTest.log(JSON.stringify(messageObject, null, " "));
</del><ins>+ ProtocolTest.log(JSON.stringify(messageObject, null, " "));
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function getDocument()
</span><span class="lines">@@ -104,15 +104,15 @@
</span><span class="cx"> {
</span><span class="cx"> assert("Expected number of setChildNodes events", eventsCount, 3);
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function step(test)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + test.name + " ===\n");
- InspectorTest.sendCommand(test.command, test.parameters, function(messageObject) {
</del><ins>+ ProtocolTest.log("\n=== " + test.name + " ===\n");
+ InspectorProtocol.sendCommand(test.command, test.parameters, function(messageObject) {
</ins><span class="cx"> if (messageObject.hasOwnProperty("error"))
</span><del>- InspectorTest.log("Backend error: " + messageObject.error.message + " (" + messageObject.error.code + ")\n");
</del><ins>+ ProtocolTest.log("Backend error: " + messageObject.error.message + " (" + messageObject.error.code + ")\n");
</ins><span class="cx">
</span><span class="cx"> if (test.callback)
</span><span class="cx"> test.callback(messageObject.result);
</span><span class="lines">@@ -122,10 +122,10 @@
</span><span class="cx"> function assert(message, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (actual === expected)
</span><del>- InspectorTest.log("PASS: " + message);
</del><ins>+ ProtocolTest.log("PASS: " + message);
</ins><span class="cx"> else {
</span><del>- InspectorTest.log("FAIL: " + message + ", expected \"" + expected + "\" but got \"" + actual + "\"");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + message + ", expected \"" + expected + "\" but got \"" + actual + "\"");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdebuggernoderemovedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom-debugger/node-removed.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom-debugger/node-removed.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/dom-debugger/node-removed.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -19,11 +19,11 @@
</span><span class="cx"> {
</span><span class="cx"> var nodesById = {};
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = onSetChildNodes;
- InspectorTest.eventHandler["DOM.childNodeRemoved"] = onChildNodeRemoved;
- InspectorTest.eventHandler["DOM.childNodeInserted"] = onChildNodeInserted;
- InspectorTest.eventHandler["Debugger.paused"] = onDebuggerPaused;
- InspectorTest.eventHandler["Debugger.scriptParsed"] = onScriptParsed;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = onSetChildNodes;
+ InspectorProtocol.eventHandler["DOM.childNodeRemoved"] = onChildNodeRemoved;
+ InspectorProtocol.eventHandler["DOM.childNodeInserted"] = onChildNodeInserted;
+ InspectorProtocol.eventHandler["Debugger.paused"] = onDebuggerPaused;
+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = onScriptParsed;
</ins><span class="cx">
</span><span class="cx"> function createNodeAttributesMap(attributes)
</span><span class="cx"> {
</span><span class="lines">@@ -70,23 +70,23 @@
</span><span class="cx"> function onChildNodeRemoved(response)
</span><span class="cx"> {
</span><span class="cx"> var nodeId = response.params.nodeId;
</span><del>- InspectorTest.assert(getNodeIdentifier(nodeId) === "div#target_element", "onChildNodeRemoved called for #target_element");
</del><ins>+ ProtocolTest.assert(getNodeIdentifier(nodeId) === "div#target_element", "onChildNodeRemoved called for #target_element");
</ins><span class="cx"> delete nodesById[nodeId];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onChildNodeInserted(response)
</span><span class="cx"> {
</span><span class="cx"> collectNode(response.params.node);
</span><del>- InspectorTest.assert(getNodeIdentifier(response.params.parentNodeId) === "div#final_container", "onChildNodeInserted called for parent node #final_container");
- InspectorTest.assert(getNodeIdentifier(response.params.node.nodeId) === "div#target_element", "onChildNodeInserted called for child node #target_element");
</del><ins>+ ProtocolTest.assert(getNodeIdentifier(response.params.parentNodeId) === "div#final_container", "onChildNodeInserted called for parent node #final_container");
+ ProtocolTest.assert(getNodeIdentifier(response.params.node.nodeId) === "div#target_element", "onChildNodeInserted called for child node #target_element");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onDebuggerPaused(response)
</span><span class="cx"> {
</span><del>- InspectorTest.log("Stopped on DOM breakpoint");
- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "moveNode()"}, function() {
- InspectorTest.sendCommand("Debugger.resume");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Stopped on DOM breakpoint");
+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "moveNode()"}, function() {
+ InspectorProtocol.sendCommand("Debugger.resume");
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,19 +95,19 @@
</span><span class="cx"> // FIXME: The DOM breakpoints are not working unless there's a JS brakpoint set. Setting a fake breakpoint to workaround that.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=123770
</span><span class="cx"> if (/node-removed\.html$/.test(messageObject.params.url) && messageObject.params.startLine > 20) {
</span><del>- InspectorTest.eventHandler["Debugger.scriptParsed"] = null;
- InspectorTest.log("Found <script>");
</del><ins>+ InspectorProtocol.eventHandler["Debugger.scriptParsed"] = null;
+ ProtocolTest.log("Found <script>");
</ins><span class="cx"> var location = {scriptId: messageObject.params.scriptId, lineNumber: messageObject.params.startLine + 2, columnNumber: 0};
</span><del>- InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
- InspectorTest.sendCommand("DOM.getDocument", {}, onGotDocument);
</del><ins>+ InspectorProtocol.sendCommand("Debugger.setBreakpoint", {location: location}, function() {
+ InspectorProtocol.sendCommand("DOM.getDocument", {}, onGotDocument);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onGotDocument(response)
</span><span class="cx"> {
</span><del>- InspectorTest.checkForError(response);
- InspectorTest.sendCommand("DOM.querySelectorAll", {"nodeId": response.result.root.nodeId, "selector": "#target_element,#final_container"}, onQuerySelectorAll);
</del><ins>+ InspectorProtocol.checkForError(response);
+ InspectorProtocol.sendCommand("DOM.querySelectorAll", {"nodeId": response.result.root.nodeId, "selector": "#target_element,#final_container"}, onQuerySelectorAll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onQuerySelectorAll(response)
</span><span class="lines">@@ -115,13 +115,13 @@
</span><span class="cx"> var targetElementId = response.result.nodeIds[0];
</span><span class="cx"> var finalContainerId = response.result.nodeIds[1];
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("DOMDebugger.setDOMBreakpoint", {nodeId: targetElementId, type: "node-removed"});
- InspectorTest.sendCommand("DOM.requestChildNodes", {nodeId: finalContainerId});
</del><ins>+ InspectorProtocol.sendCommand("DOMDebugger.setDOMBreakpoint", {nodeId: targetElementId, type: "node-removed"});
+ InspectorProtocol.sendCommand("DOM.requestChildNodes", {nodeId: finalContainerId});
</ins><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", {"expression": "removeNode()"});
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "removeNode()"});
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Debugger.enable", {});
</del><ins>+ InspectorProtocol.sendCommand("Debugger.enable", {});
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorlayerslayersanonymoushtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/layers/layers-anonymous.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/layers/layers-anonymous.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/layers/layers-anonymous.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> var nodes;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = setChildNodes;
</ins><span class="cx">
</span><span class="cx"> enableLayerTreeAgent();
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> assert("Node has id", node.attributes[0], "id");
</span><span class="cx"> assert("Node has expected id", node.attributes[1], "first-letter");
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function setChildNodes (messageObject) {
</span><span class="lines">@@ -87,20 +87,20 @@
</span><span class="cx">
</span><span class="cx"> function logTestName(name)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + name + " ===\n");
</del><ins>+ ProtocolTest.log("\n=== " + name + " ===\n");
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function runCommand(command)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand(command.command, command.parameters, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand(command.command, command.parameters, function(messageObject) {
</ins><span class="cx"> if (messageObject.hasOwnProperty("error")) {
</span><del>- InspectorTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (command.name)
</span><del>- InspectorTest.log("PASS");
</del><ins>+ ProtocolTest.log("PASS");
</ins><span class="cx">
</span><span class="cx"> if (command.callback)
</span><span class="cx"> command.callback(messageObject.result);
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> function assert(name, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (expected === actual)
</span><del>- InspectorTest.log("PASS: " + name + ".");
</del><ins>+ ProtocolTest.log("PASS: " + name + ".");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</del><ins>+ ProtocolTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorlayerslayersblendingcompositingreasonshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/layers/layers-blending-compositing-reasons.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/layers/layers-blending-compositing-reasons.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/layers/layers-blending-compositing-reasons.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> var nodes = [];
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = setChildNodes;
</ins><span class="cx">
</span><span class="cx"> enableLayerTreeAgent();
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (++count === layers.length)
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> layers.forEach(function (layer) {
</span><span class="lines">@@ -105,16 +105,16 @@
</span><span class="cx">
</span><span class="cx"> function logTestName(name)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + name + " ===\n");
</del><ins>+ ProtocolTest.log("\n=== " + name + " ===\n");
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function runCommand(command)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand(command.command, command.parameters, function(messageObject) {
- InspectorTest.checkForError(messageObject);
</del><ins>+ InspectorProtocol.sendCommand(command.command, command.parameters, function(messageObject) {
+ InspectorProtocol.checkForError(messageObject);
</ins><span class="cx">
</span><span class="cx"> if (command.name)
</span><del>- InspectorTest.log("PASS");
</del><ins>+ ProtocolTest.log("PASS");
</ins><span class="cx">
</span><span class="cx"> if (command.callback)
</span><span class="cx"> command.callback(messageObject.result);
</span><span class="lines">@@ -124,9 +124,9 @@
</span><span class="cx"> function assert(name, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (expected === actual)
</span><del>- InspectorTest.log("PASS: " + name + ".");
</del><ins>+ ProtocolTest.log("PASS: " + name + ".");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</del><ins>+ ProtocolTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorlayerslayerscompositingreasonshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/layers/layers-compositing-reasons.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/layers/layers-compositing-reasons.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/layers/layers-compositing-reasons.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> var nodes = [];
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = setChildNodes;
</ins><span class="cx">
</span><span class="cx"> enableLayerTreeAgent();
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (++count === layers.length)
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> layers.forEach(function (layer) {
</span><span class="lines">@@ -105,20 +105,20 @@
</span><span class="cx">
</span><span class="cx"> function logTestName(name)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + name + " ===\n");
</del><ins>+ ProtocolTest.log("\n=== " + name + " ===\n");
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function runCommand(command)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand(command.command, command.parameters, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand(command.command, command.parameters, function(messageObject) {
</ins><span class="cx"> if (messageObject.hasOwnProperty("error")) {
</span><del>- InspectorTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (command.name)
</span><del>- InspectorTest.log("PASS");
</del><ins>+ ProtocolTest.log("PASS");
</ins><span class="cx">
</span><span class="cx"> if (command.callback)
</span><span class="cx"> command.callback(messageObject.result);
</span><span class="lines">@@ -128,9 +128,9 @@
</span><span class="cx"> function assert(name, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (expected === actual)
</span><del>- InspectorTest.log("PASS: " + name + ".");
</del><ins>+ ProtocolTest.log("PASS: " + name + ".");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</del><ins>+ ProtocolTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorlayerslayersfornodehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/layers/layers-for-node.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/layers/layers-for-node.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/layers/layers-for-node.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> var initialLayers;
</span><span class="cx"> var eventsCount = 0;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["LayerTree.layerTreeDidChange"] = function (messageObject) {
</del><ins>+ InspectorProtocol.eventHandler["LayerTree.layerTreeDidChange"] = function (messageObject) {
</ins><span class="cx"> eventsCount++;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> {
</span><span class="cx"> var attributes = attributesDictionaryFromArray(result.attributes);
</span><span class="cx"> if (attributes.id !== "last-element")
</span><del>- InspectorTest.log("FAIL: Did not obtain the expected element for the last inserted layer.");
</del><ins>+ ProtocolTest.log("FAIL: Did not obtain the expected element for the last inserted layer.");
</ins><span class="cx">
</span><span class="cx"> finishTest();
</span><span class="cx"> };
</span><span class="lines">@@ -107,11 +107,11 @@
</span><span class="cx"> function finishTest()
</span><span class="cx"> {
</span><span class="cx"> if (!eventsCount)
</span><del>- InspectorTest.log("FAIL: Did not receive layerTreeDidChange events.");
</del><ins>+ ProtocolTest.log("FAIL: Did not receive layerTreeDidChange events.");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("\n=== Test complete, all expected conditions met ===");
</del><ins>+ ProtocolTest.log("\n=== Test complete, all expected conditions met ===");
</ins><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function layerMutations(oldLayers, newLayers)
</span><span class="lines">@@ -157,20 +157,20 @@
</span><span class="cx"> return value;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorTest.log("\n" + JSON.stringify(layers, replacer, " "));
</del><ins>+ ProtocolTest.log("\n" + JSON.stringify(layers, replacer, " "));
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function step(test)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + test.name + " ===\n")
- InspectorTest.sendCommand(test.command, test.parameters, function(messageObject) {
</del><ins>+ ProtocolTest.log("\n=== " + test.name + " ===\n")
+ InspectorProtocol.sendCommand(test.command, test.parameters, function(messageObject) {
</ins><span class="cx"> if (messageObject.hasOwnProperty("error")) {
</span><del>- InspectorTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.log("PASS");
</del><ins>+ ProtocolTest.log("PASS");
</ins><span class="cx"> test.callback(messageObject.result);
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="lines">@@ -178,9 +178,9 @@
</span><span class="cx"> function assert(name, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (expected === actual)
</span><del>- InspectorTest.log("PASS: " + name + ".");
</del><ins>+ ProtocolTest.log("PASS: " + name + ".");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</del><ins>+ ProtocolTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorlayerslayersgeneratedcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/layers/layers-generated-content.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/layers/layers-generated-content.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/layers/layers-generated-content.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> var nodes;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = setChildNodes;
</ins><span class="cx">
</span><span class="cx"> enableLayerTreeAgent();
</span><span class="cx">
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> assert("Generating node has id", node.attributes[0], "id");
</span><span class="cx"> assert("Generating node has expected id", node.attributes[1], "generator");
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function setChildNodes (messageObject) {
</span><span class="lines">@@ -104,20 +104,20 @@
</span><span class="cx">
</span><span class="cx"> function logTestName(name)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + name + " ===\n");
</del><ins>+ ProtocolTest.log("\n=== " + name + " ===\n");
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function runCommand(command)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand(command.command, command.parameters, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand(command.command, command.parameters, function(messageObject) {
</ins><span class="cx"> if (messageObject.hasOwnProperty("error")) {
</span><del>- InspectorTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (command.name)
</span><del>- InspectorTest.log("PASS");
</del><ins>+ ProtocolTest.log("PASS");
</ins><span class="cx">
</span><span class="cx"> if (command.callback)
</span><span class="cx"> command.callback(messageObject.result);
</span><span class="lines">@@ -127,9 +127,9 @@
</span><span class="cx"> function assert(name, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (expected === actual)
</span><del>- InspectorTest.log("PASS: " + name + ".");
</del><ins>+ ProtocolTest.log("PASS: " + name + ".");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</del><ins>+ ProtocolTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorlayerslayersreflectedcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/layers/layers-reflected-content.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/layers/layers-reflected-content.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/layers/layers-reflected-content.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> var nodes;
</span><span class="cx">
</span><del>- InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes;
</del><ins>+ InspectorProtocol.eventHandler["DOM.setChildNodes"] = setChildNodes;
</ins><span class="cx">
</span><span class="cx"> enableLayerTreeAgent();
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> assert("Node has CSS class", node.attributes[0], "class");
</span><span class="cx"> assert("Node has expected CSS class", node.attributes[1], "reflected composited");
</span><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function setChildNodes (messageObject) {
</span><span class="lines">@@ -88,20 +88,20 @@
</span><span class="cx">
</span><span class="cx"> function logTestName(name)
</span><span class="cx"> {
</span><del>- InspectorTest.log("\n=== " + name + " ===\n");
</del><ins>+ ProtocolTest.log("\n=== " + name + " ===\n");
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function runCommand(command)
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand(command.command, command.parameters, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand(command.command, command.parameters, function(messageObject) {
</ins><span class="cx"> if (messageObject.hasOwnProperty("error")) {
</span><del>- InspectorTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAIL: " + messageObject.error.message + " (" + messageObject.error.code + ")");
+ ProtocolTest.completeTest();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (command.name)
</span><del>- InspectorTest.log("PASS");
</del><ins>+ ProtocolTest.log("PASS");
</ins><span class="cx">
</span><span class="cx"> if (command.callback)
</span><span class="cx"> command.callback(messageObject.result);
</span><span class="lines">@@ -111,9 +111,9 @@
</span><span class="cx"> function assert(name, actual, expected)
</span><span class="cx"> {
</span><span class="cx"> if (expected === actual)
</span><del>- InspectorTest.log("PASS: " + name + ".");
</del><ins>+ ProtocolTest.log("PASS: " + name + ".");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</del><ins>+ ProtocolTest.log("FAIL: " + name + ". Expected " + expected + " but got " + actual);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorpagearchivehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/page/archive.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/page/archive.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/page/archive.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -4,17 +4,17 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Page.enable", {});
- InspectorTest.sendCommand("Page.archive", {}, function(event) {
</del><ins>+ InspectorProtocol.sendCommand("Page.enable", {});
+ InspectorProtocol.sendCommand("Page.archive", {}, function(event) {
</ins><span class="cx"> var data = event.result.data;
</span><span class="cx"> if (!data)
</span><del>- InspectorTest.log("FAIL: no data");
</del><ins>+ ProtocolTest.log("FAIL: no data");
</ins><span class="cx"> else if (data.length < 1000)
</span><del>- InspectorTest.log("FAIL: unexpectedly short data. A serialized archive should be pretty large.");
</del><ins>+ ProtocolTest.log("FAIL: unexpectedly short data. A serialized archive should be pretty large.");
</ins><span class="cx"> else
</span><del>- InspectorTest.log("PASS: Received archive data.");
</del><ins>+ ProtocolTest.log("PASS: Received archive data.");
</ins><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorpageframeScheduledNavigationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/page/frameScheduledNavigation.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/page/frameScheduledNavigation.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/page/frameScheduledNavigation.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -10,29 +10,29 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Page.frameScheduledNavigation"] = onScheduled;
- InspectorTest.eventHandler["Page.frameStartedLoading"] = onStarted;
- InspectorTest.eventHandler["Page.frameClearedScheduledNavigation"] = onCleared;
- InspectorTest.sendCommand("Page.enable", {});
</del><ins>+ InspectorProtocol.eventHandler["Page.frameScheduledNavigation"] = onScheduled;
+ InspectorProtocol.eventHandler["Page.frameStartedLoading"] = onStarted;
+ InspectorProtocol.eventHandler["Page.frameClearedScheduledNavigation"] = onCleared;
+ InspectorProtocol.sendCommand("Page.enable", {});
</ins><span class="cx">
</span><span class="cx"> function onScheduled(msg)
</span><span class="cx"> {
</span><del>- InspectorTest.log("Scheduled navigation with delay " + msg.params.delay);
</del><ins>+ ProtocolTest.log("Scheduled navigation with delay " + msg.params.delay);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onStarted(msg)
</span><span class="cx"> {
</span><span class="cx"> // This event should be received before the scheduled navigation is cleared.
</span><del>- InspectorTest.log("Started loading");
</del><ins>+ ProtocolTest.log("Started loading");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onCleared(msg)
</span><span class="cx"> {
</span><del>- InspectorTest.log("Cleared scheduled navigation");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Cleared scheduled navigation");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "load()" });
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "load()" });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorpageframeStartedLoadinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/page/frameStartedLoading.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/page/frameStartedLoading.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/page/frameStartedLoading.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -12,21 +12,21 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Page.frameStartedLoading"] = onStart;
- InspectorTest.eventHandler["Page.frameStoppedLoading"] = onStop;
- InspectorTest.sendCommand("Page.enable", {});
</del><ins>+ InspectorProtocol.eventHandler["Page.frameStartedLoading"] = onStart;
+ InspectorProtocol.eventHandler["Page.frameStoppedLoading"] = onStop;
+ InspectorProtocol.sendCommand("Page.enable", {});
</ins><span class="cx">
</span><span class="cx"> function onStart()
</span><span class="cx"> {
</span><del>- InspectorTest.log("Started loading");
</del><ins>+ ProtocolTest.log("Started loading");
</ins><span class="cx"> }
</span><span class="cx"> function onStop()
</span><span class="cx"> {
</span><del>- InspectorTest.log("Stopped loading");
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("Stopped loading");
+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "load()" });
</del><ins>+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "load()" });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorpagejavascriptDialogEventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/page/javascriptDialogEvents.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/page/javascriptDialogEvents.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/page/javascriptDialogEvents.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -13,27 +13,27 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.eventHandler["Page.javascriptDialogOpening"] = onOpening;
- InspectorTest.eventHandler["Page.javascriptDialogClosed"] = onClosed;
- InspectorTest.sendCommand("Page.enable", {});
</del><ins>+ InspectorProtocol.eventHandler["Page.javascriptDialogOpening"] = onOpening;
+ InspectorProtocol.eventHandler["Page.javascriptDialogClosed"] = onClosed;
+ InspectorProtocol.sendCommand("Page.enable", {});
</ins><span class="cx">
</span><span class="cx"> function onOpening(event)
</span><span class="cx"> {
</span><del>- InspectorTest.log("Opening with message: " + event.params.message);
</del><ins>+ ProtocolTest.log("Opening with message: " + event.params.message);
</ins><span class="cx"> }
</span><span class="cx"> function onClosed()
</span><span class="cx"> {
</span><del>- InspectorTest.log("Closed");
</del><ins>+ ProtocolTest.log("Closed");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorTest.sendCommand("Page.navigate", { "url": "nosuchurl" });
- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "alert('alert')" });
- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "confirm('confirm')" });
- InspectorTest.sendCommand("Runtime.evaluate", { "expression": "prompt('prompt')" }, onDone);
</del><ins>+ InspectorProtocol.sendCommand("Page.navigate", { "url": "nosuchurl" });
+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "alert('alert')" });
+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "confirm('confirm')" });
+ InspectorProtocol.sendCommand("Runtime.evaluate", { "expression": "prompt('prompt')" }, onDone);
</ins><span class="cx">
</span><span class="cx"> function onDone()
</span><span class="cx"> {
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorpagesetEmulatedMediahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/page/setEmulatedMedia.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/page/setEmulatedMedia.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/page/setEmulatedMedia.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- InspectorTest.sendCommand("Page.enable", {});
- InspectorTest.sendCommand("Page.setEmulatedMedia", {"media": "print"}, function(messageObject) {
</del><ins>+ InspectorProtocol.sendCommand("Page.enable", {});
+ InspectorProtocol.sendCommand("Page.setEmulatedMedia", {"media": "print"}, function(messageObject) {
</ins><span class="cx"> if (messageObject.error)
</span><del>- InspectorTest.log("FAILED: " + messageObject.error.message);
- InspectorTest.sendCommand("Page.disable", {});
- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.log("FAILED: " + messageObject.error.message);
+ InspectorProtocol.sendCommand("Page.disable", {});
+ ProtocolTest.completeTest();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorruntimegetPropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/runtime/getProperties.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/runtime/getProperties.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/runtime/getProperties.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- var suite = new InspectorTest.AsyncTestSuite("Runtime.getProperties");
</del><ins>+ var suite = new ProtocolTest.AsyncTestSuite("Runtime.getProperties");
</ins><span class="cx">
</span><span class="cx"> addGetPropertiesTestCase({
</span><span class="cx"> name: "CheckPropertiesOfWrapperObject",
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> name,
</span><span class="cx"> description,
</span><span class="cx"> test: function(resolve, reject) {
</span><del>- InspectorTest.log("Evaluating expression: " + expression);
- InspectorTest.awaitCommand({
</del><ins>+ ProtocolTest.log("Evaluating expression: " + expression);
+ InspectorProtocol.awaitCommand({
</ins><span class="cx"> method: "Runtime.evaluate",
</span><span class="cx"> params: {expression}
</span><span class="cx"> })
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> if (objectId === undefined)
</span><span class="cx"> throw new Error("objectId is expected");
</span><span class="cx">
</span><del>- return InspectorTest.awaitCommand({
</del><ins>+ return InspectorProtocol.awaitCommand({
</ins><span class="cx"> method: "Runtime.getProperties",
</span><span class="cx"> params: {objectId, ownProperties: true}
</span><span class="cx"> });
</span><span class="lines">@@ -61,14 +61,14 @@
</span><span class="cx"> function dumpGetPropertiesResult(protocolResult) {
</span><span class="cx"> var properties = protocolResult.result;
</span><span class="cx"> if (properties) {
</span><del>- InspectorTest.log("Properties:");
</del><ins>+ ProtocolTest.log("Properties:");
</ins><span class="cx"> properties.sort(NamedThingComparator);
</span><span class="cx"> properties.map(dumpSingleProperty);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var internalProperties = protocolResult.internalProperties;
</span><span class="cx"> if (internalProperties) {
</span><del>- InspectorTest.log("Internal properties:");
</del><ins>+ ProtocolTest.log("Internal properties:");
</ins><span class="cx"> internalProperties.sort(NamedThingComparator);
</span><span class="cx"> internalProperties.map(dumpSingleProperty);
</span><span class="cx"> }
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx"> function dumpSingleProperty(property) {
</span><span class="cx"> var {name, value} = property;
</span><span class="cx"> if (value)
</span><del>- InspectorTest.log(" " + name + " " + value.type + " " + (value.value || value.description));
</del><ins>+ ProtocolTest.log(" " + name + " " + value.type + " " + (value.value || value.description));
</ins><span class="cx"> else
</span><del>- InspectorTest.log(" " + name);
</del><ins>+ ProtocolTest.log(" " + name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function NamedThingComparator(o1, o2) {
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsasynctestsuitehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/async-test-suite.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/async-test-suite.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/unit-tests/async-test-suite.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -6,60 +6,60 @@
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> try {
</span><del>- new InspectorTest.AsyncTestSuite();
- InspectorTest.log("FAIL: instantiating AsyncTestSuite requires name argument.");
</del><ins>+ new ProtocolTest.AsyncTestSuite();
+ ProtocolTest.log("FAIL: instantiating AsyncTestSuite requires name argument.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: instantiating AsyncTestSuite requires name argument.");
</del><ins>+ ProtocolTest.log("PASS: instantiating AsyncTestSuite requires name argument.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- new InspectorTest.AsyncTestSuite({});
- InspectorTest.log("FAIL: instantiating AsyncTestSuite requires string name argument.");
</del><ins>+ new ProtocolTest.AsyncTestSuite({});
+ ProtocolTest.log("FAIL: instantiating AsyncTestSuite requires string name argument.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: instantiating AsyncTestSuite requires string name argument.");
</del><ins>+ ProtocolTest.log("PASS: instantiating AsyncTestSuite requires string name argument.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var badArgsSuite = new InspectorTest.AsyncTestSuite("dummy");
</del><ins>+ var badArgsSuite = new ProtocolTest.AsyncTestSuite("dummy");
</ins><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase();
</span><del>- InspectorTest.log("FAIL: should not be able to add empty test case.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to add empty test case.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to add empty test case.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to add empty test case.");
</ins><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase("string");
</span><del>- InspectorTest.log("FAIL: should not be able to add non-object test case.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to add non-object test case.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to add non-object test case.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to add non-object test case.");
</ins><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase({
</span><span class="cx"> name: {},
</span><span class="cx"> test: function() {},
</span><span class="cx"> });
</span><del>- InspectorTest.log("FAIL: test case should require string name.");
</del><ins>+ ProtocolTest.log("FAIL: test case should require string name.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: test case should require string name.");
</del><ins>+ ProtocolTest.log("PASS: test case should require string name.");
</ins><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase({
</span><span class="cx"> name: "foo",
</span><span class="cx"> test: null,
</span><span class="cx"> });
</span><del>- InspectorTest.log("FAIL: test case should require test function.");
</del><ins>+ ProtocolTest.log("FAIL: test case should require test function.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: test case should require test function.");
</del><ins>+ ProtocolTest.log("PASS: test case should require test function.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var runEmptySuite = new InspectorTest.AsyncTestSuite("AsyncTestSuite.RunEmptySuite");
</del><ins>+ var runEmptySuite = new ProtocolTest.AsyncTestSuite("AsyncTestSuite.RunEmptySuite");
</ins><span class="cx"> try {
</span><span class="cx"> runEmptySuite.runTestCases();
</span><del>- InspectorTest.log("FAIL: should not be able to run empty test suite.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to run empty test suite.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to run empty test suite.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to run empty test suite.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var runTwiceSuite = new InspectorTest.AsyncTestSuite("AsyncTestSuite.RunTwiceSuite");
</del><ins>+ var runTwiceSuite = new ProtocolTest.AsyncTestSuite("AsyncTestSuite.RunTwiceSuite");
</ins><span class="cx"> runTwiceSuite.addTestCase({
</span><span class="cx"> name: "DummyTest0",
</span><span class="cx"> description: "Check that a suite can't run more than once.",
</span><span class="lines">@@ -73,15 +73,15 @@
</span><span class="cx"> // Test cases won't run in this event loop; this call should still throw.
</span><span class="cx"> // Later tests are chained to this suite to avoid nondeterminism.
</span><span class="cx"> runTwiceSuite.runTestCases();
</span><del>- InspectorTest.log("FAIL: should not be able to run a test suite twice.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to run a test suite twice.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to run a test suite twice.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to run a test suite twice.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var rejectToken = {"token": 666};
</span><span class="cx"> var thrownError = new Error(rejectToken);
</span><span class="cx">
</span><del>- var sequentialExecutionSuite = new InspectorTest.AsyncTestSuite("AsyncTestSuite.SequentialExecution");
</del><ins>+ var sequentialExecutionSuite = new ProtocolTest.AsyncTestSuite("AsyncTestSuite.SequentialExecution");
</ins><span class="cx"> sequentialExecutionSuite.addTestCase({
</span><span class="cx"> name: "DummyTest1",
</span><span class="cx"> description: "Check test case execution order.",
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- var abortOnFailureSuite = new InspectorTest.AsyncTestSuite("AsyncTestSuite.AbortOnFailure");
</del><ins>+ var abortOnFailureSuite = new ProtocolTest.AsyncTestSuite("AsyncTestSuite.AbortOnFailure");
</ins><span class="cx"> abortOnFailureSuite.addTestCase({
</span><span class="cx"> name: "PassingTest5",
</span><span class="cx"> description: "This test is a dummy.",
</span><span class="lines">@@ -136,41 +136,41 @@
</span><span class="cx">
</span><span class="cx"> result = result.then(function() {
</span><span class="cx"> var promise = sequentialExecutionSuite.runTestCases();
</span><del>- InspectorTest.assert(result instanceof Promise, "AsyncTestSuite.RunTestCases() should return a Promise.");
</del><ins>+ ProtocolTest.assert(result instanceof Promise, "AsyncTestSuite.RunTestCases() should return a Promise.");
</ins><span class="cx"> return promise;
</span><span class="cx"> });
</span><span class="cx"> result = result.then(function resolved() {
</span><del>- InspectorTest.log("FAIL: Promise from sequentialExecutionSuite.runTestCases() should reject when a test case fails.");
</del><ins>+ ProtocolTest.log("FAIL: Promise from sequentialExecutionSuite.runTestCases() should reject when a test case fails.");
</ins><span class="cx"> return Promise.resolve(); // Continue this test.
</span><span class="cx"> }, function rejected(e) {
</span><del>- InspectorTest.log("PASS: Promise from sequentialExecutionSuite.runTestCases() should reject when a test case fails.");
- InspectorTest.assert(e === thrownError, "Promise from sequentialExecutionSuite.runTestCases() should reject without altering its result value.");
</del><ins>+ ProtocolTest.log("PASS: Promise from sequentialExecutionSuite.runTestCases() should reject when a test case fails.");
+ ProtocolTest.assert(e === thrownError, "Promise from sequentialExecutionSuite.runTestCases() should reject without altering its result value.");
</ins><span class="cx">
</span><del>- InspectorTest.assert(sequentialExecutionSuite.runCount === 4, "sequentialExecutionSuite should have executed four tests.");
- InspectorTest.assert(sequentialExecutionSuite.passCount === 3, "sequentialExecutionSuite should have passed three tests.");
- InspectorTest.assert(sequentialExecutionSuite.failCount === 1, "sequentialExecutionSuite should have failed 1 test.");
- InspectorTest.assert(sequentialExecutionSuite.skipCount === 0, "sequentialExecutionSuite should have skipped zero tests.");
</del><ins>+ ProtocolTest.assert(sequentialExecutionSuite.runCount === 4, "sequentialExecutionSuite should have executed four tests.");
+ ProtocolTest.assert(sequentialExecutionSuite.passCount === 3, "sequentialExecutionSuite should have passed three tests.");
+ ProtocolTest.assert(sequentialExecutionSuite.failCount === 1, "sequentialExecutionSuite should have failed 1 test.");
+ ProtocolTest.assert(sequentialExecutionSuite.skipCount === 0, "sequentialExecutionSuite should have skipped zero tests.");
</ins><span class="cx"> return Promise.resolve(); // Continue this test.
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> result = result.then(function() {
</span><span class="cx"> return abortOnFailureSuite.runTestCases();
</span><span class="cx"> }).then(function resolved() {
</span><del>- InspectorTest.log("FAIL: Promise from abortOnFailureSuite.runTestCases() should reject when a test case fails.");
</del><ins>+ ProtocolTest.log("FAIL: Promise from abortOnFailureSuite.runTestCases() should reject when a test case fails.");
</ins><span class="cx"> return Promise.resolve(); // Continue this test.
</span><span class="cx"> }, function rejected(e) {
</span><del>- InspectorTest.log("PASS: Promise from abortOnFailureSuite.runTestCases() should reject when a test case fails.");
- InspectorTest.assert(e === rejectToken, "Promise from abortOnFailureSuite.runTestCases() should reject without altering its result value.");
- InspectorTest.assert(abortOnFailureSuite.runCount === 2, "abortOnFailureSuite should have executed two tests.");
- InspectorTest.assert(abortOnFailureSuite.passCount === 1, "abortOnFailureSuite should have passed one test.");
- InspectorTest.assert(abortOnFailureSuite.failCount === 1, "abortOnFailureSuite should have failed one test.");
- InspectorTest.assert(abortOnFailureSuite.skipCount === 1, "abortOnFailureSuite should have skipped one test.");
</del><ins>+ ProtocolTest.log("PASS: Promise from abortOnFailureSuite.runTestCases() should reject when a test case fails.");
+ ProtocolTest.assert(e === rejectToken, "Promise from abortOnFailureSuite.runTestCases() should reject without altering its result value.");
+ ProtocolTest.assert(abortOnFailureSuite.runCount === 2, "abortOnFailureSuite should have executed two tests.");
+ ProtocolTest.assert(abortOnFailureSuite.passCount === 1, "abortOnFailureSuite should have passed one test.");
+ ProtocolTest.assert(abortOnFailureSuite.failCount === 1, "abortOnFailureSuite should have failed one test.");
+ ProtocolTest.assert(abortOnFailureSuite.skipCount === 1, "abortOnFailureSuite should have skipped one test.");
</ins><span class="cx">
</span><span class="cx"> return Promise.resolve(); // Continue this test.
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // This will finish the test whether the chain was resolved or rejected.
</span><del>- result = result.then(function() { InspectorTest.completeTest(); });
</del><ins>+ result = result.then(function() { ProtocolTest.completeTest(); });
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestssynctestsuitehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/sync-test-suite.html (188266 => 188267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/sync-test-suite.html 2015-08-11 18:26:54 UTC (rev 188266)
+++ trunk/LayoutTests/inspector/unit-tests/sync-test-suite.html 2015-08-11 18:28:31 UTC (rev 188267)
</span><span class="lines">@@ -6,60 +6,60 @@
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> try {
</span><del>- new InspectorTest.SyncTestSuite();
- InspectorTest.log("FAIL: instantiating SyncTestSuite requires name argument.");
</del><ins>+ new ProtocolTest.SyncTestSuite();
+ ProtocolTest.log("FAIL: instantiating SyncTestSuite requires name argument.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: instantiating SyncTestSuite requires name argument.");
</del><ins>+ ProtocolTest.log("PASS: instantiating SyncTestSuite requires name argument.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- new InspectorTest.SyncTestSuite({});
- InspectorTest.log("FAIL: instantiating SyncTestSuite requires string name argument.");
</del><ins>+ new ProtocolTest.SyncTestSuite({});
+ ProtocolTest.log("FAIL: instantiating SyncTestSuite requires string name argument.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: instantiating SyncTestSuite requires string name argument.");
</del><ins>+ ProtocolTest.log("PASS: instantiating SyncTestSuite requires string name argument.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var badArgsSuite = new InspectorTest.SyncTestSuite("dummy");
</del><ins>+ var badArgsSuite = new ProtocolTest.SyncTestSuite("dummy");
</ins><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase();
</span><del>- InspectorTest.log("FAIL: should not be able to add empty test case.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to add empty test case.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to add empty test case.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to add empty test case.");
</ins><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase("string");
</span><del>- InspectorTest.log("FAIL: should not be able to add non-object test case.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to add non-object test case.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to add non-object test case.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to add non-object test case.");
</ins><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase({
</span><span class="cx"> name: {},
</span><span class="cx"> test: function() { return true; },
</span><span class="cx"> });
</span><del>- InspectorTest.log("FAIL: test case should require string name.");
</del><ins>+ ProtocolTest.log("FAIL: test case should require string name.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: test case should require string name.");
</del><ins>+ ProtocolTest.log("PASS: test case should require string name.");
</ins><span class="cx"> }
</span><span class="cx"> try {
</span><span class="cx"> badArgsSuite.addTestCase({
</span><span class="cx"> name: "foo",
</span><span class="cx"> test: null,
</span><span class="cx"> });
</span><del>- InspectorTest.log("FAIL: test case should require test function.");
</del><ins>+ ProtocolTest.log("FAIL: test case should require test function.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: test case should require test function.");
</del><ins>+ ProtocolTest.log("PASS: test case should require test function.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var runEmptySuite = new InspectorTest.SyncTestSuite("SyncTestSuite.RunEmptySuite");
</del><ins>+ var runEmptySuite = new ProtocolTest.SyncTestSuite("SyncTestSuite.RunEmptySuite");
</ins><span class="cx"> try {
</span><span class="cx"> runEmptySuite.runTestCases();
</span><del>- InspectorTest.log("FAIL: should not be able to run empty test suite.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to run empty test suite.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to run empty test suite.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to run empty test suite.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var runTwiceSuite = new InspectorTest.SyncTestSuite("SyncTestSuite.RunTwiceSuite");
</del><ins>+ var runTwiceSuite = new ProtocolTest.SyncTestSuite("SyncTestSuite.RunTwiceSuite");
</ins><span class="cx"> runTwiceSuite.addTestCase({
</span><span class="cx"> name: "DummyTest0",
</span><span class="cx"> description: "Check that a suite can't run more than once.",
</span><span class="lines">@@ -68,17 +68,17 @@
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> var result = runTwiceSuite.runTestCases();
</span><del>- InspectorTest.assert(result === true, "Return value of runTwiceSuite.runTestCases() should be true when all tests pass.");
</del><ins>+ ProtocolTest.assert(result === true, "Return value of runTwiceSuite.runTestCases() should be true when all tests pass.");
</ins><span class="cx">
</span><span class="cx"> runTwiceSuite.runTestCases(); // Try to trigger an error.
</span><del>- InspectorTest.log("FAIL: should not be able to run a test suite twice.");
</del><ins>+ ProtocolTest.log("FAIL: should not be able to run a test suite twice.");
</ins><span class="cx"> } catch (e) {
</span><del>- InspectorTest.log("PASS: should not be able to run a test suite twice.");
</del><ins>+ ProtocolTest.log("PASS: should not be able to run a test suite twice.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var thrownError = new Error({"token": 666});
</span><span class="cx">
</span><del>- var sequentialExecutionSuite = new InspectorTest.SyncTestSuite("SyncTestSuite.SequentialExecution");
</del><ins>+ var sequentialExecutionSuite = new ProtocolTest.SyncTestSuite("SyncTestSuite.SequentialExecution");
</ins><span class="cx"> sequentialExecutionSuite.addTestCase({
</span><span class="cx"> name: "DummyTest1",
</span><span class="cx"> description: "Check test case execution order.",
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> var result = sequentialExecutionSuite.runTestCases();
</span><del>- InspectorTest.assert(result === false, "Return value of sequentialExecutionSuite.runTestCases() should be false when a test case fails.");
- InspectorTest.assert(sequentialExecutionSuite.runCount === 4, "sequentialExecutionSuite should have executed four tests.");
- InspectorTest.assert(sequentialExecutionSuite.passCount === 3, "sequentialExecutionSuite should have passed three tests.");
- InspectorTest.assert(sequentialExecutionSuite.failCount === 1, "sequentialExecutionSuite should have failed 1 test.");
- InspectorTest.assert(sequentialExecutionSuite.skipCount === 0, "sequentialExecutionSuite should have skipped zero tests.");
</del><ins>+ ProtocolTest.assert(result === false, "Return value of sequentialExecutionSuite.runTestCases() should be false when a test case fails.");
+ ProtocolTest.assert(sequentialExecutionSuite.runCount === 4, "sequentialExecutionSuite should have executed four tests.");
+ ProtocolTest.assert(sequentialExecutionSuite.passCount === 3, "sequentialExecutionSuite should have passed three tests.");
+ ProtocolTest.assert(sequentialExecutionSuite.failCount === 1, "sequentialExecutionSuite should have failed 1 test.");
+ ProtocolTest.assert(sequentialExecutionSuite.skipCount === 0, "sequentialExecutionSuite should have skipped zero tests.");
</ins><span class="cx">
</span><del>- var abortOnFailureSuite = new InspectorTest.SyncTestSuite("SyncTestSuite.AbortOnFailure");
</del><ins>+ var abortOnFailureSuite = new ProtocolTest.SyncTestSuite("SyncTestSuite.AbortOnFailure");
</ins><span class="cx"> abortOnFailureSuite.addTestCase({
</span><span class="cx"> name: "PassingTest5",
</span><span class="cx"> description: "This test is a dummy.",
</span><span class="lines">@@ -125,13 +125,13 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> abortOnFailureSuite.runTestCases();
</span><del>- InspectorTest.assert(result === false, "Return value of abortOnFailureSuite.runTestCases() should be false when a test case fails.");
- InspectorTest.assert(abortOnFailureSuite.runCount === 2, "abortOnFailureSuite should have executed two tests.");
- InspectorTest.assert(abortOnFailureSuite.passCount === 1, "abortOnFailureSuite should have passed one test.");
- InspectorTest.assert(abortOnFailureSuite.failCount === 1, "abortOnFailureSuite should have failed one test.");
- InspectorTest.assert(abortOnFailureSuite.skipCount === 1, "abortOnFailureSuite should have skipped one test.");
</del><ins>+ ProtocolTest.assert(result === false, "Return value of abortOnFailureSuite.runTestCases() should be false when a test case fails.");
+ ProtocolTest.assert(abortOnFailureSuite.runCount === 2, "abortOnFailureSuite should have executed two tests.");
+ ProtocolTest.assert(abortOnFailureSuite.passCount === 1, "abortOnFailureSuite should have passed one test.");
+ ProtocolTest.assert(abortOnFailureSuite.failCount === 1, "abortOnFailureSuite should have failed one test.");
+ ProtocolTest.assert(abortOnFailureSuite.skipCount === 1, "abortOnFailureSuite should have skipped one test.");
</ins><span class="cx">
</span><del>- InspectorTest.completeTest();
</del><ins>+ ProtocolTest.completeTest();
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre>
</div>
</div>
</body>
</html>