NRWT results.html page should show a count of the number of tests in each category

https://bugs.webkit.org/show_bug.cgi?id=64215

Reviewed by Ojan Vafai.

* fast/harness/resources/results-test.js:
* fast/harness/results-expected.txt:
* fast/harness/results.html:
* platform/chromium-win/fast/harness/results-expected.txt: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e65edbc..25a81bc 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2012-05-22  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
+
+        NRWT results.html page should show a count of the number of tests in each category
+        https://bugs.webkit.org/show_bug.cgi?id=64215
+
+        Reviewed by Ojan Vafai.
+
+        * fast/harness/resources/results-test.js:
+        * fast/harness/results-expected.txt:
+        * fast/harness/results.html:
+        * platform/chromium-win/fast/harness/results-expected.txt: Removed.
+
 2012-05-22  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL] Remaining duplicated test in Skipped and test_expectations.txt after r117932

diff --git a/LayoutTests/fast/harness/resources/results-test.js b/LayoutTests/fast/harness/resources/results-test.js
index 5615ebf..f3bf84b 100644 (file)
--- a/LayoutTests/fast/harness/resources/results-test.js
+++ b/LayoutTests/fast/harness/resources/results-test.js
@@ -684,6 +684,25 @@ function runTests()
         }
     });
 
+    results = mockResults();
+    var subtree = results.tests['foo'] = {}
+    subtree['bar.html'] = mockExpectation('TEXT', 'PASS');
+    subtree['bar-1.html'] = mockExpectation('TEXT', 'CRASH');
+    subtree['bar-2.html'] = mockExpectation('PASS', 'IMAGE');
+    subtree['bar-3.html'] = mockExpectation('PASS', 'TEXT');
+    subtree['bar-4.html'] = mockExpectation('TEXT', 'TEXT');
+    subtree['bar-5.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
+    subtree['bar-missing.html'] = mockExpectation('TEXT', 'MISSING');
+    subtree['bar-missing.html'].is_missing_text = true;
+    runTest(results, function() {
+        var titles = document.getElementsByTagName('h1');
+        assertTrue(titles[0].textContent == 'Tests that crashed (1):');
+        assertTrue(titles[1].textContent == 'Tests where results did not match expected results (3):');
+        assertTrue(titles[2].textContent =='Tests that had no expected results (probably new) (1):');
+        assertTrue(titles[3].textContent =='Tests expected to fail but passed (1):');
+        logPass('PASS');
+    });
+
     document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
 }
 

diff --git a/LayoutTests/fast/harness/results-expected.txt b/LayoutTests/fast/harness/results-expected.txt
index adbe85a..e0e94e4 100644 (file)
--- a/LayoutTests/fast/harness/results-expected.txt
+++ b/LayoutTests/fast/harness/results-expected.txt
@@ -219,3 +219,8 @@ TEST-40: PASS
 TEST-40: PASS
 TEST-40: PASS
 TEST-40: PASS
+TEST-41: PASS
+TEST-41: PASS
+TEST-41: PASS
+TEST-41: PASS
+TEST-41: PASS

diff --git a/LayoutTests/fast/harness/results.html b/LayoutTests/fast/harness/results.html
index f657d2d..f90c937 100644 (file)
--- a/LayoutTests/fast/harness/results.html
+++ b/LayoutTests/fast/harness/results.html
@@ -642,7 +642,7 @@ function testList(tests, header, tableId)
 {
     tests.sort();
 
-    var html = '<h1>' + header + ':</h1><table id="' + tableId + '"';
+    var html = '<h1>' + header + ' (' + tests.length + '):</h1><table id="' + tableId + '"';
     if (!hasUnexpected(tests))
         html += ' class=expected';
     html += '>';
@@ -1214,15 +1214,19 @@ function failingTestsTable(tests, title, id)
     if (!tests.length)
         return '';
 
+    var numberofUnexpectedFailures = 0;
     var tableRowHtml = '';
-    for (var i = 0; i < tests.length; i++)
+    for (var i = 0; i < tests.length; i++){
         tableRowHtml += tableRow(tests[i]);
+        if (!tests[i].isExpected)
+            numberofUnexpectedFailures++;
+    }
 
     var header = '<div';
     if (!hasUnexpected(tests))
         header += ' class=expected';
 
-    header += '><h1>' + title + ':</h1>' +
+    header += '><h1>' + title + ' (' + numberofUnexpectedFailures + '):</h1>' +
         '<table id="' + id + '"><thead><tr>' +
         '<th>test</th>' +
         '<th id="text-results-header">results</th>' +

diff --git a/LayoutTests/platform/chromium-win/fast/harness/results-expected.txt b/LayoutTests/platform/chromium-win/fast/harness/results-expected.txt
deleted file mode 100644 (file)
index adbe85a..0000000
--- a/LayoutTests/platform/chromium-win/fast/harness/results-expected.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-You should see a serios of PASS lines.
-TEST-1: PASS
-TEST-1: PASS
-TEST-1: PASS
-TEST-2: PASS
-TEST-2: PASS
-TEST-2: PASS
-TEST-2: PASS
-TEST-2: PASS
-TEST-3: PASS
-TEST-3: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-4: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-5: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-6: PASS
-TEST-7: PASS
-TEST-8: PASS
-TEST-8: PASS
-TEST-8: PASS
-TEST-8: PASS
-TEST-8: PASS
-TEST-8: PASS
-TEST-9: PASS
-TEST-9: PASS
-TEST-9: PASS
-TEST-9: PASS
-TEST-9: PASS
-TEST-9: PASS
-TEST-10: PASS
-TEST-10: PASS
-TEST-10: PASS
-TEST-10: PASS
-TEST-10: PASS
-TEST-10: PASS
-TEST-11: PASS
-TEST-11: PASS
-TEST-11: PASS
-TEST-11: PASS
-TEST-11: PASS
-TEST-11: PASS
-TEST-12: PASS
-TEST-12: PASS
-TEST-12: PASS
-TEST-12: PASS
-TEST-12: PASS
-TEST-12: PASS
-TEST-13: PASS
-TEST-13: PASS
-TEST-13: PASS
-TEST-13: PASS
-TEST-13: PASS
-TEST-13: PASS
-TEST-14: PASS
-TEST-14: PASS
-TEST-14: PASS
-TEST-14: PASS
-TEST-14: PASS
-TEST-14: PASS
-TEST-15: PASS
-TEST-15: PASS
-TEST-15: PASS
-TEST-15: PASS
-TEST-15: PASS
-TEST-15: PASS
-TEST-16: PASS
-TEST-16: PASS
-TEST-16: PASS
-TEST-16: PASS
-TEST-16: PASS
-TEST-16: PASS
-TEST-17: PASS
-TEST-18: PASS
-TEST-18: PASS
-TEST-18: PASS
-TEST-18: PASS
-TEST-18: PASS
-TEST-18: PASS
-TEST-19: PASS
-TEST-20: PASS
-TEST-20: PASS
-TEST-20: PASS
-TEST-21: PASS
-TEST-21: PASS
-TEST-21: PASS
-TEST-22: PASS
-TEST-22: PASS
-TEST-22: PASS
-TEST-22: PASS
-TEST-23: PASS
-TEST-23: PASS
-TEST-24: PASS
-TEST-24: PASS
-TEST-24: PASS
-TEST-24: PASS
-TEST-24: PASS
-TEST-25: PASS
-TEST-25: PASS
-TEST-26: PASS
-TEST-26: PASS
-TEST-27: PASS
-TEST-28: PASS
-TEST-28: PASS
-TEST-29: PASS
-TEST-30: PASS
-TEST-31: PASS
-TEST-32: PASS
-TEST-32: PASS
-TEST-32: PASS
-TEST-33: PASS
-TEST-33: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-34: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-35: PASS
-TEST-36: PASS
-TEST-36: PASS
-TEST-36: PASS
-TEST-36: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-37: PASS
-TEST-38: PASS
-TEST-38: PASS
-TEST-38: PASS
-TEST-39: PASS
-TEST-39: PASS
-TEST-39: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS
-TEST-40: PASS