diff options
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/devtools_host_stub.js | 4 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/tests.js | 32 |
3 files changed, 31 insertions, 7 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index bff09a2..bb38583 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { // Tests set breakpoint. // http://crbug.com/16767 -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestSetBreakpoint) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestSetBreakpoint) { RunTest("testSetBreakpoint", kDebuggerTestPage); } diff --git a/webkit/glue/devtools/js/devtools_host_stub.js b/webkit/glue/devtools/js/devtools_host_stub.js index 5142bbe..2f3da60 100644 --- a/webkit/glue/devtools/js/devtools_host_stub.js +++ b/webkit/glue/devtools/js/devtools_host_stub.js @@ -170,6 +170,10 @@ RemoteToolsAgentStub.prototype.ExecuteUtilityFunction = function(callId, }; +RemoteToolsAgentStub.prototype.ExecuteVoidJavaScript = function() { +}; + + RemoteToolsAgentStub.prototype.SetResourceTrackingEnabled = function(enabled, always) { RemoteToolsAgent.SetResourcesPanelEnabled(enabled); if (enabled) { diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js index 7ee57ee..d4bbf59 100644 --- a/webkit/glue/devtools/js/tests.js +++ b/webkit/glue/devtools/js/tests.js @@ -398,11 +398,31 @@ TestSuite.prototype.testSetBreakpoint = function() { this.addSniffer(devtools.DebuggerAgent.prototype, 'handleScriptsResponse_', function(msg) { var scriptSelect = document.getElementById('scripts-files'); - var scriptResource = - scriptSelect.options[scriptSelect.selectedIndex].representedObject; + var options = scriptSelect.options; + + // There should be console API source (see + // InjectedScript._ensureCommandLineAPIInstalled) and the page script. + test.assertEquals(2, options.length, 'Unexpected number of scripts.'); + test.assertEquals(0, scriptSelect.selectedIndex); + + // Select page's script if it's not current option. + var scriptResource; + if (options[scriptSelect.selectedIndex].text == + 'debugger_test_page.html') { + scriptResource = + options[scriptSelect.selectedIndex].representedObject; + } else { + var pageScriptIndex = (1 - scriptSelect.selectedIndex); + test.assertEquals('debugger_test_page.html', + options[pageScriptIndex].text); + scriptResource = options[pageScriptIndex].representedObject; + // Current panel is 'Scripts'. + WebInspector.currentPanel._showScriptOrResource(scriptResource); + } - test.assertTrue(scriptResource instanceof WebInspector.Resource); - test.assertTrue(!!scriptResource.url); + test.assertTrue(scriptResource instanceof WebInspector.Resource, + 'Unexpected resource class.'); + test.assertTrue(!!scriptResource.url, 'Resource URL is null.'); test.assertTrue( scriptResource.url.search(/debugger_test_page.html$/) != -1, 'Main HTML resource should be selected.'); @@ -419,12 +439,12 @@ TestSuite.prototype.testSetBreakpoint = function() { test.addSniffer(view, '_sourceFrameSetupFinished', function(event) { view._addBreakpoint(breakpointLine); // Force v8 execution. - devtools.tools.evaluateJavaScript('javascript:void(0)'); + RemoteToolsAgent.ExecuteVoidJavaScript(); }); } else { view._addBreakpoint(breakpointLine); // Force v8 execution. - devtools.tools.evaluateJavaScript('javascript:void(0)'); + RemoteToolsAgent.ExecuteVoidJavaScript(); } }); |