Changeset 97613 in webkit

Timestamp:

Oct 17, 2011 6:39:06 AM (13 years ago)

Author:

yurys@chromium.org

Message:

[Chromium] Web Inspector: don't check for debugger pause details in interactive ui tests
​https://bugs.webkit.org/show_bug.cgi?id=70228

Removed debugger pause details validation. The only check left is that debugger pause event is fired when expected.

Reviewed by Pavel Feldman.

• src/js/Tests.js:

(.TestSuite.prototype.testPauseWhenLoadingDevTools):
(.TestSuite.prototype.testPauseWhenScriptIsRunning.didEvaluateInConsole):
(.TestSuite.prototype.testPauseWhenScriptIsRunning.testScriptPause):
(.TestSuite.prototype.testPauseWhenScriptIsRunning):
(.TestSuite.prototype.testPauseInSharedWorkerInitialization):
(.TestSuite.prototype._waitForScriptPause):

Location:

trunk/Source/WebKit/chromium

Files:

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-10-17  Yury Semikhatsky  <yurys@chromium.org>
+
+        [Chromium] Web Inspector: don't check for debugger pause details in interactive ui tests
+        https://bugs.webkit.org/show_bug.cgi?id=70228
+
+        Removed debugger pause details validation. The only check left is that debugger pause event is fired when expected.
+
+        Reviewed by Pavel Feldman.
+
+        * src/js/Tests.js:
+        (.TestSuite.prototype.testPauseWhenLoadingDevTools):
+        (.TestSuite.prototype.testPauseWhenScriptIsRunning.didEvaluateInConsole):
+        (.TestSuite.prototype.testPauseWhenScriptIsRunning.testScriptPause):
+        (.TestSuite.prototype.testPauseWhenScriptIsRunning):
+        (.TestSuite.prototype.testPauseInSharedWorkerInitialization):
+        (.TestSuite.prototype._waitForScriptPause):
+
 2011-10-17  Mikhail Naganov  <mnaganov@chromium.org>
 

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

@@ -355 +355 @@
 {
     this.showPanel("scripts");
-    var test = this;
-
-    var expectations = {
-            functionsOnStack: ["callDebugger"],
-            lineNumber: 8,
-            lineText: "  debugger;"
-        };
-
 
     // Script execution can already be paused.
-    if (WebInspector.currentPanel().paused) {
-        var callFrame = WebInspector.currentPanel()._presentationModel.selectedCallFrame;
-        this.assertEquals(expectations.functionsOnStack[0], callFrame._callFrame.functionName);
-        var callbackInvoked = false;
-        this._checkSourceFrameWhenLoaded(expectations, function() {
-                callbackInvoked = true;
-                if (test.controlTaken_)
-                    test.releaseControl();
-            });
-        if (!callbackInvoked) {
-            test.takeControl();
-        }
+    if (WebInspector.debuggerModel.debuggerPausedDetails)
         return;
-    }
-
-    this._waitForScriptPause(
-        {
-            functionsOnStack: ["callDebugger"],
-            lineNumber: 8,
-            lineText: "  debugger;"
-        },
-        function() {
-            test.releaseControl();
-        });
+
+    this._waitForScriptPause(this.releaseControl.bind(this));
     this.takeControl();
 };
@@ -398 +370 @@
 {
     this.showPanel("scripts");
-    var test = this;
-
-    test.evaluateInConsole_(
+
+    this.evaluateInConsole_(
         'setTimeout("handleClick()" , 0)',
-        function(resultText) {
-          test.assertTrue(!isNaN(resultText), "Failed to get timer id: " + resultText);
-          testScriptPauseAfterDelay();
-        });
-
-    // Wait for some time to make sure that inspected page is running the
-    // infinite loop.
-    function testScriptPauseAfterDelay() {
-        setTimeout(testScriptPause, 300);
+        didEvaluateInConsole.bind(this));
+
+    function didEvaluateInConsole(resultText) {
+        this.assertTrue(!isNaN(resultText), "Failed to get timer id: " + resultText);
+        // Wait for some time to make sure that inspected page is running the
+        // infinite loop.
+        setTimeout(testScriptPause.bind(this), 300);
     }
 
@@ -418 +387 @@
         WebInspector.panels.scripts.pauseButton.click();
 
-        test._waitForScriptPause(
-            {
-                functionsOnStack: ["handleClick", ""],
-                lineNumber: 5,
-                lineText: "  while(true) {"
-            },
-            function() {
-                test.releaseControl();
-            });
+        this._waitForScriptPause(this.releaseControl.bind(this));
     }
 
@@ -586 +547 @@
     if (WebInspector.debuggerModel.debuggerPausedDetails)
         return;
-    this._waitForScriptPause(
-        {
-            functionsOnStack: [""],
-            lineNumber: 1,
-            lineText: "debugger;"
-        },
-        this.releaseControl.bind(this));
+    this._waitForScriptPause(this.releaseControl.bind(this));
     this.takeControl();
 };
@@ -685 +640 @@
 
 /**
- * Checks current execution line against expectations.
- * @param {WebInspector.SourceFrame} sourceFrame
- * @param {number} lineNumber Expected line number
- * @param {string} lineContent Expected line text
- */
-TestSuite.prototype._checkExecutionLine = function(sourceFrame, lineNumber, lineContent)
-{
-    this.assertEquals(lineNumber, sourceFrame._executionLineNumber + 1, "Unexpected execution line number.");
-    this.assertEquals(lineContent, sourceFrame._textModel.line(lineNumber - 1), "Unexpected execution line text.");
-}
-
-
-/**
  * Checks that all expected scripts are present in the scripts list
  * in the Scripts panel.
@@ -726 +668 @@
 /**
  * Waits for script pause, checks expectations, and invokes the callback.
- * @param {Object} expectations  Dictionary of expectations
  * @param {function():void} callback
  */
-TestSuite.prototype._waitForScriptPause = function(expectations, callback)
+TestSuite.prototype._waitForScriptPause = function(callback)
 {
     function pauseListener(event) {
-        var callFrames = event.data.callFrames;
-        var functionsOnStack = [];
-        for (var i = 0; i < callFrames.length; i++)
-            functionsOnStack.push(callFrames[i].functionName);
-
-        this.assertEquals(expectations.functionsOnStack.join(","), functionsOnStack.join(","), "Unexpected stack.");
-
-        // Check that execution line where the script is paused is
-        // expected one.
-        this._checkSourceFrameWhenLoaded(expectations, callback);
-
         WebInspector.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, pauseListener, this);
+        callback();
     }
     WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, pauseListener, this);
-};
-
-
-/**
- * Waits for current source frame to load, checks expectations, and invokes
- * the callback.
- * @param {Object} expectations  Dictionary of expectations
- * @param {function():void} callback
- */
-TestSuite.prototype._checkSourceFrameWhenLoaded = function(expectations, callback)
-{
-    var test = this;
-
-    var frame = WebInspector.currentPanel().visibleView;
-
-    if (frame._textViewer)
-        checkExecLine();
-    else {
-        setTimeout(function() {
-            test._checkSourceFrameWhenLoaded(expectations, callback);
-        }, 100);
-    }
-    function checkExecLine() {
-        test._checkExecutionLine(frame, expectations.lineNumber, expectations.lineText);
-        callback();
-    }
 };