Changeset 83978 in webkit

Timestamp:

Apr 15, 2011 8:42:18 AM (13 years ago)

Author:

ojan@chromium.org

Message:

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

Reviewed by Eric Seidel.

fix sorting in new results file
​https://bugs.webkit.org/show_bug.cgi?id=58616

-Fix the custom sort to return -1, 0, 1 instead of true/false.
-Secondary sort by test name when sort values are equal.
-Sort by test name by default.

• 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) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-15  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        fix sorting in new results file
+        https://bugs.webkit.org/show_bug.cgi?id=58616
+
+        -Fix the custom sort to return -1, 0, 1 instead of true/false.
+        -Secondary sort by test name when sort values are equal.
+        -Sort by test name by default.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+
 2011-04-15  Dmitry Lomov  <dslomov@google.com>
 

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

@@ -182 +182 @@
         var aText = a.childNodes[sortColumn].textContent;
         var bText = b.childNodes[sortColumn].textContent;
+        
+        // Forward sort equal values by test name.
+        if (sortColumn && aText == bText) {
+            var aTestName = a.childNodes[0].textContent;
+            var bTestName = b.childNodes[0].textContent;
+            if (aTestName == bTestName)
+                return 0;
+            return aTestName < bTestName ? -1 : 1;
+        }
+
         if (reversed)
-            return aText < bText;
+            return aText < bText ? 1 : -1;
         else
-            return bText < aText;
+            return aText < bText ? -1 : 1;
     });
 
     for (var i = 0; i < rows.length; i++)
         tbody.appendChild(rows[i]);
+}
+
+TableSorter.sortColumn = function(columnNumber)
+{
+    var newHeader = document.querySelector('table').querySelectorAll('th')[columnNumber];
+    TableSorter._sort(newHeader);
 }
 
@@ -197 +213 @@
     if (newHeader.localName != 'th')
         return;
-    
+    TableSorter._sort(newHeader);
+}
+
+TableSorter._sort = function(newHeader)
+{
     TableSorter._updateHeaderClassNames(newHeader);
     
@@ -208 +228 @@
 
 document.querySelector('table').addEventListener('click', TableSorter.handleClick, false);
+TableSorter.sortColumn(0);
 
 var unexpectedStyleNode = document.createElement('style');