Changeset 84420 in webkit

Timestamp:

Apr 20, 2011 2:45:30 PM (13 years ago)

Author:

ojan@chromium.org

Message:

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

Reviewed by Eric Seidel.

move page generation into a single function
​https://bugs.webkit.org/show_bug.cgi?id=59027

Now executing the script doesn't create any state. We should then
be able to write tests for this by setting custom results data.

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

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/json_results.html (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-20  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        move page generation into a single function
+        https://bugs.webkit.org/show_bug.cgi?id=59027
+
+        Now executing the script doesn't create any state. We should then
+        be able to write tests for this by setting custom results data.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+
+2011-04-20  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        move global state into a shared object
+        https://bugs.webkit.org/show_bug.cgi?id=59023
+
+        This makes the code more testable.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+
 2011-04-20  Ojan Vafai  <ojan@chromium.org>
 

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

@@ -107 +107 @@
 }
 </style>
+<style id="unexpected-style"></style>
 
 <script>
@@ -334 +335 @@
 }
 
-var html = '<div id=options>' +
-    '<a href="javascript:void()" class="expand-all" onclick="expandAllExpectations()">expand all</a> ' +
-    '<a href="javascript:void()" class="collapse-all" onclick="collapseAllExpectations()">collapse all</a>';
-
-if (globalState().results.uses_expectations_file)
-    html += '<label><input class="unexpected-results" type=checkbox checked onchange="updateExpectedResults()">Only show unexpected results</label>';
-
-html += '</div>';
-
-var tableRowsHtml = tableRows();
-
-if (tableRowsHtml) {
-    html += '<p>Tests where results did not match expected results:</p>' +
-        '<table id="results-table"><thead><tr>' +
-        '<th>test</th>' +
-        '<th id="text-results-header">text results</th>' +
-        '<th id="image-results-header">image results</th>' +
-        '<th>failure type</th>';
-        
-    if (globalState().results.uses_expectations_file)
-        html += '<th>expected failure type</th>';
-
-    html += '</tr></thead>' + tableRowsHtml + '</table>';
-}
-
-function appendTestList(tests, header, tableId, fileSuffix, linkName)
+function testList(tests, header, tableId, fileSuffix, linkName)
 {
     tests.sort();
 
-    html += '<p>' + header + '</p><table id="' + tableId + '">';
+    var html = '<p>' + header + '</p><table id="' + tableId + '">';
     for (var i = 0; i < tests.length; i++) {
         var test = tests[i];
@@ -382 +358 @@
         html += '</td></tr></tbody>';
     }
-    html += '</table>'
-}
-
-if (globalState().newTests.length)
-    appendTestList(globalState().newTests, 'Tests that had no expected results (probably new):', 'new-tests-table', '-actual.txt', 'result');
-
-if (globalState().testsWithStderr.length)
-    appendTestList(globalState().testsWithStderr, 'Tests that had stderr output:', 'stderr-table', '-stderr.txt', 'stderr');
-
-if (globalState().hasHttpTests) {
-    html += '<p>httpd access log: <a href="access_log.txt">access_log.txt</a></p>' +
-        '<p>httpd error log: <a href="error_log.txt">error_log.txt</a></p>';
-}
-
-document.write(html);
+    html += '</table>';
+    return html;
+}
 
 function toArray(nodeList)
@@ -502 +466 @@
 }
 
-if (document.getElementById('results-table'))
-    document.getElementById('results-table').addEventListener('click', TableSorter.handleClick, false);
-TableSorter.sortColumn(0);
-
 var PixelZoomer = {};
 
@@ -566 +526 @@
 }
 
-document.body.addEventListener('mousemove', PixelZoomer.handleMouseMove, false);
-
-
-var unexpectedStyleNode = document.createElement('style');
-document.body.appendChild(unexpectedStyleNode);
+document.addEventListener('mousemove', PixelZoomer.handleMouseMove, false);
 
 function updateExpectedResults()
 {
     var checkBox = document.querySelector('.unexpected-results');
-    if (!checkBox || checkBox.checked)
-        unexpectedStyleNode.innerText = '.expected { display: none; }';
-    else
-        unexpectedStyleNode.innerText = '';
-}
-
-updateExpectedResults();
-
-if (!globalState().hasTextFailures)
-  document.body.getElementById('text-results-header').textContent = '';
-if (!globalState().hasImageFailures)
-  document.body.getElementById('image-results-header').textContent = '';
+    document.getElementById('unexpected-style').innerText = (!checkBox || checkBox.checked) ?
+        '.expected { display: none; }' : '';
+}
+
+function generatePage()
+{
+    var html = '<div id=options>' +
+        '<a href="javascript:void()" class="expand-all" onclick="expandAllExpectations()">expand all</a> ' +
+        '<a href="javascript:void()" class="collapse-all" onclick="collapseAllExpectations()">collapse all</a>';
+
+    if (globalState().results.uses_expectations_file)
+        html += '<label><input class="unexpected-results" type=checkbox checked onchange="updateExpectedResults()">Only show unexpected results</label>';
+
+    html += '</div>';
+
+    var tableRowsHtml = tableRows();
+
+    if (tableRowsHtml) {
+        html += '<p>Tests where results did not match expected results:</p>' +
+            '<table id="results-table"><thead><tr>' +
+            '<th>test</th>' +
+            '<th id="text-results-header">text results</th>' +
+            '<th id="image-results-header">image results</th>' +
+            '<th>failure type</th>';
+
+        if (globalState().results.uses_expectations_file)
+            html += '<th>expected failure type</th>';
+
+        html += '</tr></thead>' + tableRowsHtml + '</table>';
+    }
+
+    if (globalState().newTests.length)
+        html += testList(globalState().newTests, 'Tests that had no expected results (probably new):', 'new-tests-table', '-actual.txt', 'result');
+
+    if (globalState().testsWithStderr.length)
+        html += testList(globalState().testsWithStderr, 'Tests that had stderr output:', 'stderr-table', '-stderr.txt', 'stderr');
+
+    if (globalState().hasHttpTests) {
+        html += '<p>httpd access log: <a href="access_log.txt">access_log.txt</a></p>' +
+            '<p>httpd error log: <a href="error_log.txt">error_log.txt</a></p>';
+    }
+
+    document.body.innerHTML = html;
+
+    if (document.getElementById('results-table'))
+        document.getElementById('results-table').addEventListener('click', TableSorter.handleClick, false);
+    TableSorter.sortColumn(0);
+    
+    updateExpectedResults();
+
+    if (!globalState().hasTextFailures)
+      document.body.getElementById('text-results-header').textContent = '';
+    if (!globalState().hasImageFailures)
+      document.body.getElementById('image-results-header').textContent = '';
+}
 </script>
+<body onload="generatePage()"></body>