Changeset 75938 in webkit

Timestamp:

Jan 17, 2011 6:25:50 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-01-17 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Chromium: updated DevTools tests.

• src/js/Tests.js: (.TestSuite.prototype._waitForScriptPause): (.TestSuite.prototype._waitUntilScriptsAreParsed.waitForAllScripts): (.TestSuite.prototype._waitUntilScriptsAreParsed):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/js/Tests.js (modified) (5 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-17  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium: updated DevTools tests.
+
+        * src/js/Tests.js:
+        (.TestSuite.prototype._waitForScriptPause):
+        (.TestSuite.prototype._waitUntilScriptsAreParsed.waitForAllScripts):
+        (.TestSuite.prototype._waitUntilScriptsAreParsed):
+
 2011-01-17  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/src/js/Tests.js

@@ -216 +216 @@
 
 
+TestSuite.prototype.testEnableResourcesTab = function()
+{
+    // FIXME once reference is removed downstream.
+}
+
+TestSuite.prototype.testCompletionOnPause = function()
+{
+    // FIXME once reference is removed downstream.
+}
+
 // UI Tests
-
-
-/**
- * Tests that resources tab is enabled when corresponding item is selected.
- */
-TestSuite.prototype.testEnableResourcesTab = function()
-{
-    this.showPanel("resources");
-
-    var test = this;
-    this.addSniffer(WebInspector, "updateResource",
-        function(payload) {
-            test.assertEquals("simple_page.html", payload.lastPathComponent);
-            WebInspector.panels.resources.refresh();
-            WebInspector.panels.resources.revealAndSelectItem(WebInspector.resources[payload.id]);
-
-            test.releaseControl();
-        });
-
-    // Following call should lead to reload that we capture in the
-    // addResource override.
-    WebInspector.panels.resources._enableResourceTracking();
-
-    // We now have some time to report results to controller.
-    this.takeControl();
-};
 
 
@@ -626 +610 @@
 
 /**
- * Tests that console auto completion works when script execution is paused.
- */
-TestSuite.prototype.testCompletionOnPause = function()
-{
-    this.showPanel("scripts");
-    var test = this;
-    this._executeCodeWhenScriptsAreParsed("handleClick()", ["completion_on_pause.html"]);
-
-    this._waitForScriptPause(
-        {
-            functionsOnStack: ["innerFunction", "handleClick", ""],
-            lineNumber: 9,
-            lineText: "    debugger;"
-        },
-        showConsole);
-
-    function showConsole() {
-        if (WebInspector.currentFocusElement === WebInspector.console.promptElement)
-            testLocalsCompletion();
-        else {
-            test.addSniffer(WebInspector.console, "afterShow", testLocalsCompletion);
-            WebInspector.showConsole();
-        }
-    }
-
-    function testLocalsCompletion() {
-        checkCompletions("th", ["parameter1", "closureLocal", "p", "createClosureLocal"], testThisCompletion);
-    }
-
-    function testThisCompletion() {
-        checkCompletions("this.", ["field1", "field2", "m"], testFieldCompletion);
-    }
-
-    function testFieldCompletion() {
-        checkCompletions("this.field1.", ["id", "name"], function() { test.releaseControl(); });
-    }
-
-    function checkCompletions(expression, expectedProperties, callback) {
-        test.addSniffer(WebInspector.console, "_reportCompletions",
-            function(bestMatchOnly, completionsReadyCallback, dotNotation, bracketNotation, prefix, result, isException) {
-                test.assertTrue(!isException, "Exception while collecting completions");
-                for (var i = 0; i < expectedProperties.length; i++) {
-                    var name = expectedProperties[i];
-                    test.assertTrue(result[name], "Name " + name + " not found among the completions: " + JSON.stringify(result));
-                }
-                setTimeout(callback, 0);
-            });
-      WebInspector.console.prompt.text = expression;
-      WebInspector.console.prompt.autoCompleteSoon();
-    }
-
-    this.takeControl();
-};
-
-
-/**
  * Checks current execution line against expectations.
  * @param {WebInspector.SourceFrame} sourceFrame
@@ -732 +660 @@
     test.addSniffer(
         WebInspector.debuggerModel,
-        "pausedScript",
+        "_pausedScript",
         function(details) {
             var callFrames = details.callFrames;
@@ -806 +734 @@
             callback();
         else
-            test.addSniffer(WebInspector.debuggerModel, "parsedScriptSource", waitForAllScripts);
+            test.addSniffer(WebInspector.debuggerModel, "_parsedScriptSource", waitForAllScripts);
     }
 
@@ -840 +768 @@
 
 /**
- * Tests "Pause" button will pause debugger when a snippet is evaluated.
- */
-TestSuite.prototype.testPauseInEval = function()
-{
-    this.showPanel("scripts");
-
-    var test = this;
-
-    var pauseButton = document.getElementById("scripts-pause");
-    pauseButton.click();
-
-    devtools.tools.evaluateJavaScript("fib(10)");
-
-    this.addSniffer(WebInspector.debuggerModel, "pausedScript",
-        function() {
-            test.releaseControl();
-        });
-
-    test.takeControl();
-};
-
-
-/**
  * Key event with given key identifier.
  */