Changeset 84543 in webkit

Timestamp:

Apr 21, 2011 1:44:41 PM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-04-21 Ojan Vafai <​ojan@chromium.org>

Reviewed by Tony Chang.

only expand visible rows
​https://bugs.webkit.org/show_bug.cgi?id=59130

For the chromium port, where there are many expected failures,
expanding all of them is quite slow. Only expand the visible ones.
This makes the default case. Also, make the expanding async to
avoid totally killing the process.

• Scripts/webkitpy/layout_tests/layout_package/json_results.html:
• Scripts/webkitpy/layout_tests/layout_package/json_results_test.js:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/json_results.html (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/layout_package/json_results_test.js (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-21  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        only expand visible rows
+        https://bugs.webkit.org/show_bug.cgi?id=59130
+
+        For the chromium port, where there are many expected failures,
+        expanding all of them is quite slow. Only expand the visible ones.
+        This makes the default case. Also, make the expanding async to
+        avoid totally killing the process.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_test.js:
+
 2011-04-21  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results.html

@@ -223 +223 @@
 }
 
+function async(func, args)
+{
+    setTimeout(function() { func.apply(null, args); }, 100);
+}
+
+function visibleExpandLinks()
+{
+    if (onlyShowUnexpectedFailures())
+        return document.querySelectorAll('tbody:not(.expected) .expand-button-text');
+    else
+        return document.querySelectorAll('.expand-button-text');
+}
+
 function expandAllExpectations()
 {
-    var expandLinks = document.querySelectorAll('.expand-button-text');
+    var expandLinks = visibleExpandLinks();
     for (var i = 0, len = expandLinks.length; i < len; i++)
-        expandExpectations(expandLinks[i]);
+        async(expandExpectations, [expandLinks[i]]);
 }
 
 function collapseAllExpectations()
 {
-    var expandLinks = document.querySelectorAll('.expand-button-text');
+    var expandLinks = visibleExpandLinks();
     for (var i = 0, len = expandLinks.length; i < len; i++)
-        collapseExpectations(expandLinks[i]);
+        async(collapseExpectations, [expandLinks[i]]);
 }
 
@@ -539 +552 @@
 document.addEventListener('mousemove', PixelZoomer.handleMouseMove, false);
 
-function updateExpectedResults()
+function onlyShowUnexpectedFailures()
 {
     var checkBox = document.querySelector('.unexpected-results');
-    document.getElementById('unexpected-style').innerText = (!checkBox || checkBox.checked) ?
+    return !checkBox || checkBox.checked;
+}
+
+function updateExpectedFailures()
+{
+    document.getElementById('unexpected-style').innerText = onlyShowUnexpectedFailures() ?
         '.expected { display: none; }' : '';
 }
@@ -553 +571 @@
 
     if (globalState().results.uses_expectations_file)
-        html += '<label><input class="unexpected-results" type=checkbox checked onchange="updateExpectedResults()">Only show unexpected results</label>';
+        html += '<label><input class="unexpected-results" type=checkbox checked onchange="updateExpectedFailures()">Only show unexpected results</label>';
 
     html += '</div>';
@@ -598 +616 @@
     }
     
-    updateExpectedResults();
+    updateExpectedFailures();
 }
 </script>

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_test.js

@@ -5 +5 @@
 var g_log = ["You should see a serios of PASS lines."];
 var g_currentTestSucceeded;
+
+// Make async actually be sync for the sake of simpler testing.
+function async(func, args)
+{
+    func.apply(null, args);
+}
 
 function mockResults()
@@ -149 +155 @@
         assertTrue(expandLinks[1].textContent == '+');
     });
+    
+    results = mockResults();
+    results.tests['foo/bar.html'] = mockExpectation('PASS', 'TEXT');
+    results.tests['foo/bar-expected-fail.html'] = mockExpectation('TEXT', 'TEXT');
+    runTest(results, function() {
+        assertTrue(document.querySelectorAll('.expected').length == 1);
+        assertTrue(document.querySelector('.expected .test-link').textContent == 'foo/bar-expected-fail.html');
+
+        expandAllExpectations();
+        assertTrue(visibleExpandLinks().length == 1);
+        assertTrue(document.querySelectorAll('.results-row').length == 1);
+        
+        document.querySelector('.unexpected-results').checked = false;
+
+        assertTrue(visibleExpandLinks().length == 2);
+        assertTrue(document.querySelectorAll('.results-row').length == 1);
+        
+        expandAllExpectations();
+        assertTrue(document.querySelectorAll('.results-row').length == 2);
+    });
+    
     document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
 }