Changeset 84518 in webkit

Timestamp:

Apr 21, 2011 10:43:24 AM (13 years ago)

Author:

ojan@chromium.org

Message:

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

Reviewed by Tony Chang.

put unexpected passes into their own table
​https://bugs.webkit.org/show_bug.cgi?id=59016

• 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) (6 diffs)
• Scripts/webkitpy/layout_tests/layout_package/json_results_test.js (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-20  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        put unexpected passes into their own table
+        https://bugs.webkit.org/show_bug.cgi?id=59016
+
+        * 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

@@ -9 +9 @@
 }
 
-tr:first-of-type:hover {
+tbody tr:first-of-type:hover {
     opacity: 0.7
 }
@@ -120 +120 @@
             newTests: [],
             results: {},
-            testsWithStderr: []
+            testsWithStderr: [],
+            unexpectedPassTests: []
         }
     }
@@ -270 +271 @@
 
         var expected = globalState().results.tests[test].expected || 'PASS';
-        if (actual == 'PASS' && (!globalState().results.uses_expectations_file || expected == 'PASS'))
-          continue;
+        var isExpected = actual == 'SKIP';
+        if (!isExpected && globalState().results.uses_expectations_file) {
+            var expectedArray = expected.split(' ');
+            if (expectedArray.indexOf(actual) != -1)
+                isExpected = true;
+            else if (expectedArray.indexOf('FAIL') != -1)
+                isExpected = actual == 'IMAGE' || actual == 'TEXT' || actual == 'IMAGE+TEXT';
+        }
+
+        if (actual == 'PASS') {
+            if (!isExpected && expected != 'PASS')
+                globalState().unexpectedPassTests.push(test);            
+            continue;
+        }
 
         // FIXME: put unexpected passes in a separate table.
@@ -322 +335 @@
           row += '<td>' + expected + '</td>';
 
-        var isExpected = actual == 'SKIP';
-        if (!isExpected && globalState().results.uses_expectations_file) {
-            var expectedArray = expected.split(' ');
-            if (expectedArray.indexOf(actual) != -1)
-                isExpected = true;
-            else if (expectedArray.indexOf('FAIL') != -1)
-                isExpected = actual == 'IMAGE' || actual == 'TEXT' || actual == 'IMAGE+TEXT';
-        }
         html += '<tbody class="' + (isExpected ? 'expected' : '') + '"><tr>' + row + '</tr></tbody>';
     }
@@ -335 +340 @@
 }
 
-function testList(tests, header, tableId, fileSuffix, linkName)
+function testList(tests, header, tableId)
 {
     tests.sort();
 
     var html = '<p>' + header + '</p><table id="' + tableId + '">';
+
+    if (tableId == 'passes-table')
+        html += '<thead><th>test</th><th>expected failure type</th>';
+
     for (var i = 0; i < tests.length; i++) {
         var test = tests[i];
         html += '<tbody><tr><td>' + testLink(test) + '</td><td>';
         
-        if (fileSuffix.indexOf('actual') == -1)
-            html += resultLink(stripExtension(test), fileSuffix, linkName);
-        else {
+        if (tableId == 'stderr-table')
+            html += resultLink(stripExtension(test), '-stderr.txt', 'stderr');
+        else if (tableId == 'passes-table')
+            html += globalState().results.tests[test].expected;
+        else if (tableId == 'new-tests-table') {
             var testObject = globalState().results.tests[test];
             if (testObject.is_missing_audio)
                 html += resultLink(stripExtension(test), '-actual.wav', 'audio result');
             if (testObject.is_missing_text)
-                html += resultLink(stripExtension(test), fileSuffix, linkName);
+                html += resultLink(stripExtension(test), '-actual.txt', 'result');
             if (testObject.is_missing_image)
                 html += resultLink(stripExtension(test), '-actual.png', 'png result');
@@ -563 +574 @@
 
     if (globalState().newTests.length)
-        html += testList(globalState().newTests, 'Tests that had no expected results (probably new):', 'new-tests-table', '-actual.txt', 'result');
+        html += testList(globalState().newTests, 'Tests that had no expected results (probably new):', 'new-tests-table');
 
     if (globalState().testsWithStderr.length)
-        html += testList(globalState().testsWithStderr, 'Tests that had stderr output:', 'stderr-table', '-stderr.txt', 'stderr');
+        html += testList(globalState().testsWithStderr, 'Tests that had stderr output:', 'stderr-table');
+
+    if (globalState().unexpectedPassTests.length)
+        html += testList(globalState().unexpectedPassTests, 'Tests expected to fail but passed:', 'passes-table');
 
     if (globalState().hasHttpTests) {

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

@@ -100 +100 @@
     });
 
+    results = mockResults();
+    results.tests['foo/bar.html'] = mockExpectation('TEXT', 'PASS');
+    results.tests['foo/bar1.html'] = mockExpectation('CRASH', 'PASS');
+    results.tests['foo/bar2.html'] = mockExpectation('IMAGE', 'PASS');
+    runTest(results, function() {
+        assertTrue(!document.getElementById('results-table'));
+
+        var testLinks = document.querySelectorAll('#passes-table .test-link');
+        assertTrue(testLinks[0].textContent == 'foo/bar.html');
+        assertTrue(testLinks[1].textContent == 'foo/bar1.html');
+        assertTrue(testLinks[2].textContent == 'foo/bar2.html');
+
+        var expectationTypes = document.querySelectorAll('#passes-table td:last-of-type');
+        assertTrue(expectationTypes[0].textContent == 'TEXT');
+        assertTrue(expectationTypes[1].textContent == 'CRASH');
+        assertTrue(expectationTypes[2].textContent == 'IMAGE');
+
+    });
+
     document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
 }