Title: [89347] trunk/LayoutTests
Revision
89347
Author
pfeld...@chromium.org
Date
2011-06-21 05:29:02 -0700 (Tue, 21 Jun 2011)

Log Message

2011-06-20  Joseph Pecoraro  <joep...@webkit.org>

        Reviewed by Pavel Feldman.

        Web Inspector: Chromium layout test failure after r89317
        https://bugs.webkit.org/show_bug.cgi?id=63031

        Event Listener sidebar output prints out the full path
        to the source file in the sourceName property. For testing
        purposes, since the path will be different per system,
        clip the early part of the path and leave the expected part.

        * http/tests/inspector/elements-test.js:
        (initialize_ElementTest.InspectorTest.dumpSelectedElementEventListeners):
        (initialize_ElementTest.InspectorTest.dumpObjectPropertySection):
        * platform/chromium/inspector/elements/event-listener-sidebar-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (89346 => 89347)


--- trunk/LayoutTests/ChangeLog	2011-06-21 10:30:11 UTC (rev 89346)
+++ trunk/LayoutTests/ChangeLog	2011-06-21 12:29:02 UTC (rev 89347)
@@ -1,3 +1,20 @@
+2011-06-20  Joseph Pecoraro  <joep...@webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Chromium layout test failure after r89317
+        https://bugs.webkit.org/show_bug.cgi?id=63031
+
+        Event Listener sidebar output prints out the full path
+        to the source file in the sourceName property. For testing
+        purposes, since the path will be different per system,
+        clip the early part of the path and leave the expected part.
+
+        * http/tests/inspector/elements-test.js:
+        (initialize_ElementTest.InspectorTest.dumpSelectedElementEventListeners):
+        (initialize_ElementTest.InspectorTest.dumpObjectPropertySection):
+        * platform/chromium/inspector/elements/event-listener-sidebar-expected.txt:
+
 2011-06-17  Pavel Podivilov  <podivi...@chromium.org>
 
         Reviewed by Pavel Feldman.

Modified: trunk/LayoutTests/http/tests/inspector/elements-test.js (89346 => 89347)


--- trunk/LayoutTests/http/tests/inspector/elements-test.js	2011-06-21 10:30:11 UTC (rev 89346)
+++ trunk/LayoutTests/http/tests/inspector/elements-test.js	2011-06-21 12:29:02 UTC (rev 89347)
@@ -146,6 +146,11 @@
 
 InspectorTest.dumpSelectedElementEventListeners = function(callback)
 {
+    function formatSourceNameProperty(value)
+    {
+        return "[clipped-for-test]/" + value.replace(/(.*?\/)LayoutTests/, "LayoutTests");
+    }
+
     var eventListenerSections = WebInspector.panels.elements.sidebarPanes.eventListeners.sections;
     for (var i = 0; i < eventListenerSections.length; ++i) {
         var section = eventListenerSections[i];
@@ -155,14 +160,16 @@
         var eventBarChildren = section.eventBars.children;
         for (var j = 0; j < eventBarChildren.length; ++j) {
             var objectPropertiesSection = eventBarChildren[j]._section;
-            InspectorTest.dumpObjectPropertySection(objectPropertiesSection);
+            InspectorTest.dumpObjectPropertySection(objectPropertiesSection, {
+                sourceName: formatSourceNameProperty
+            });
         }
     }
 
     callback();
 }
 
-InspectorTest.dumpObjectPropertySection = function(section)
+InspectorTest.dumpObjectPropertySection = function(section, formatters)
 {
     var expandedSubstring = section.expanded ? "[expanded]" : "[collapsed]";
     InspectorTest.addResult(expandedSubstring + " " + section.titleElement.textContent + " " + section.subtitleAsTextForTest);
@@ -173,6 +180,8 @@
         var property = section.propertiesForTest[i];
         var key = property.name;
         var value = property.value._description;
+        if (key in formatters)
+            value = formatters[key](value);
         InspectorTest.addResult("    " + key + ": " + value);
     }
 }

Modified: trunk/LayoutTests/platform/chromium/inspector/elements/event-listener-sidebar-expected.txt (89346 => 89347)


--- trunk/LayoutTests/platform/chromium/inspector/elements/event-listener-sidebar-expected.txt	2011-06-21 10:30:11 UTC (rev 89346)
+++ trunk/LayoutTests/platform/chromium/inspector/elements/event-listener-sidebar-expected.txt	2011-06-21 12:29:02 UTC (rev 89347)
@@ -8,7 +8,7 @@
     lineNumber: 19
     listenerBody: function (event) { console.log("click - document - capturing"); }
     node: HTMLDocument
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: click
     useCapture: true
 [expanded] button#node event-listener-sidebar.html:15
@@ -16,7 +16,7 @@
     lineNumber: 15
     listenerBody: function (event) { console.log("click - button - capturing"); }
     node: HTMLButtonElement
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: click
     useCapture: true
 [expanded] button#node event-listener-sidebar.html:12
@@ -24,7 +24,7 @@
     lineNumber: 12
     listenerBody: function clickHandler(event) { console.log("click - button - bubbling (registered before attribute)"); }
     node: HTMLButtonElement
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: click
     useCapture: false
 [expanded] button#node event-listener-sidebar.html:16
@@ -32,7 +32,7 @@
     lineNumber: 16
     listenerBody: function (event) { console.log("click - button - attribute"); }
     node: HTMLButtonElement
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: click
     useCapture: false
 [expanded] button#node event-listener-sidebar.html:17
@@ -40,7 +40,7 @@
     lineNumber: 17
     listenerBody: function (event) { console.log("click - button - bubbling (registered after attribute)"); }
     node: HTMLButtonElement
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: click
     useCapture: false
 [expanded] document event-listener-sidebar.html:6
@@ -48,7 +48,7 @@
     lineNumber: 6
     listenerBody: function documentClickHandler(event) { console.log("click - document - attribute"); }
     node: HTMLDocument
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: click
     useCapture: false
 
@@ -58,7 +58,7 @@
     lineNumber: 14
     listenerBody: function hoverHandler(event) { console.log("hover - button - bubbling"); }
     node: HTMLButtonElement
-    sourceName: file:///mnt/git/webkit-commit-queue/LayoutTests/inspector/elements/event-listener-sidebar.html
+    sourceName: [clipped-for-test]/LayoutTests/inspector/elements/event-listener-sidebar.html
     type: hover
     useCapture: false
 

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (89346 => 89347)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-06-21 10:30:11 UTC (rev 89346)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-06-21 12:29:02 UTC (rev 89347)
@@ -4011,8 +4011,6 @@
 BUGCR86714 MAC GPU : media/video-controls-rendering.html = CRASH
 BUGCR86714 MAC GPU : media/video-zoom.html = CRASH
 
-BUGWK63031 WIN LINUX DEBUG SLOW : inspector/elements/event-listener-sidebar.html = TEXT
-BUGWK63031 WIN LINUX RELEASE : inspector/elements/event-listener-sidebar.html = TEXT
 BUGWK63033 : svg/custom/absolute-root-position-masking.xhtml = IMAGE
 BUGWK63036 MAC : svg/dom/SVGTransformList-basics.xhtml = IMAGE
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to