Title: [97060] trunk/LayoutTests
Revision
97060
Author
podivi...@chromium.org
Date
2011-10-10 07:06:25 -0700 (Mon, 10 Oct 2011)

Log Message

2011-10-10  Pavel Podivilov  <podivi...@chromium.org>

        Unreviewed, fix test after r97056.

        * inspector/debugger/script-formatter-expected.txt:
        * inspector/debugger/script-formatter.html:
        * platform/chromium/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (97059 => 97060)


--- trunk/LayoutTests/ChangeLog	2011-10-10 13:24:59 UTC (rev 97059)
+++ trunk/LayoutTests/ChangeLog	2011-10-10 14:06:25 UTC (rev 97060)
@@ -1,3 +1,11 @@
+2011-10-10  Pavel Podivilov  <podivi...@chromium.org>
+
+        Unreviewed, fix test after r97056.
+
+        * inspector/debugger/script-formatter-expected.txt:
+        * inspector/debugger/script-formatter.html:
+        * platform/chromium/test_expectations.txt:
+
 2011-10-06  Pavel Podivilov  <podivi...@chromium.org>
 
         Web Inspector: saving _javascript_ after live edit resets scroller position.

Modified: trunk/LayoutTests/inspector/debugger/script-formatter-expected.txt (97059 => 97060)


--- trunk/LayoutTests/inspector/debugger/script-formatter-expected.txt	2011-10-10 13:24:59 UTC (rev 97059)
+++ trunk/LayoutTests/inspector/debugger/script-formatter-expected.txt	2011-10-10 14:06:25 UTC (rev 97060)
@@ -18,18 +18,12 @@
 
 Running: testBreakpointsInOriginalAndFormattedSource
 Script execution paused.
-Call stack:
-    0) f1 (script-formatter.html:12)
-    1)  (script-formatter.html:1)
 Script execution resumed.
 Page reloaded.
 Navigated to test-navigation.html
 Page reloaded.
 Navigated back to test page.
 Script execution paused.
-Call stack:
-    0) f2 (script-formatter.html:17)
-    1)  (script-formatter.html:1)
 Script execution resumed.
 
 Running: testConsoleMessagesForFormattedScripts

Modified: trunk/LayoutTests/inspector/debugger/script-formatter.html (97059 => 97060)


--- trunk/LayoutTests/inspector/debugger/script-formatter.html	2011-10-10 13:24:59 UTC (rev 97059)
+++ trunk/LayoutTests/inspector/debugger/script-formatter.html	2011-10-10 14:06:25 UTC (rev 97060)
@@ -54,12 +54,12 @@
             InspectorTest.showScriptSource("obfuscated.js", didShowScriptSource);
             function didShowScriptSource(sourceFrame)
             {
-                formatter.formatContent("text/_javascript_", sourceFrame._content, didFormatContent);
+                formatter.formatContent("text/_javascript_", sourceFrame._textModel.text, didFormatContent);
             }
 
             function didFormatContent(content, mapping)
             {
-                var source = WebInspector.panels.scripts.visibleView._content;
+                var source = WebInspector.panels.scripts.visibleView._textModel.text;
                 var formattedSource = content;
 
                 function testMapping(string)
@@ -125,7 +125,7 @@
 
             function pausedInF1(callFrames)
             {
-                InspectorTest.captureStackTrace(callFrames);
+                InspectorTest.assertEquals("f1", callFrames[0].functionName);
                 InspectorTest.resumeExecution(resumed);
             }
 
@@ -163,7 +163,7 @@
 
             function pausedInF2(callFrames)
             {
-                InspectorTest.captureStackTrace(callFrames);
+                InspectorTest.assertEquals("f2", callFrames[0].functionName);
                 panel._toggleFormatSource();
                 InspectorTest.resumeExecution(next);
             }

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (97059 => 97060)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-10-10 13:24:59 UTC (rev 97059)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-10-10 14:06:25 UTC (rev 97060)
@@ -156,7 +156,6 @@
 WONTFIX SKIP : http/tests/eventsource/workers = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/websocket/tests/hixie76/workers/ = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/websocket/tests/hybi/workers/ = PASS TIMEOUT FAIL
-WONTFIX SKIP : inspector/debugger/script-formatter.html = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/inspector/network/network-shared-worker.html = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/inspector/network/network-worker.html = PASS TIMEOUT FAIL
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to