unittest step 3 and 4: remove TestFramework.dart, make test.dart use

lib/unittest/html_print.dart

Index: lib/unittest/html_print.dart
diff --git a/lib/unittest/html_print.dart b/lib/unittest/html_print.dart
index 89e2f5cbf35fd963fd5040870d6fb75f8329644c..ea43545dd9c3161a5449bae1cfe0fbc35f42ddb9 100644
--- a/lib/unittest/html_print.dart
+++ b/lib/unittest/html_print.dart
@@ -5,14 +5,14 @@
 /** This file is sourced by both dom_config.dart and html_config.dart. */
 
 /** Creates a table showing tests results in HTML. */
-void _showResultsInPage(int testsPassed, int testsFailed, int testsErrors,
-    List<TestCase> results, isLayoutTest) {
-  if (isLayoutTest && (testsPassed == results.length)) {
+void _showResultsInPage(int passed, int failed, int errors,

[Bob Nystrom, 2012/04/20 22:31:36]

If we keep adding arguments here, eventually we may want to consider lumping
them all into a TestResults object.

[Siggi Cherem (dart-lang), 2012/04/21 00:03:43]

agreed - I was thinking of getting rid of the first 3, since they are redundant
with what the list contains.

[Bob Nystrom, 2012/04/23 17:34:07]

I do like that this code doesn't have to loop and count the successes because
that seems like boilerplate that every result handler will do. I would just
consider lumping this all into a single class where delivering these results is
its core concern.

+    List<TestCase> results, bool isLayoutTest, String uncaughtError) {
+  if (isLayoutTest && (passed == results.length) && uncaughtError == null) {
     document.body.innerHTML = "PASS";
   } else {
     var newBody = new StringBuffer();
     newBody.add("<table class='unittest-table'><tbody>");
-    newBody.add(testsPassed == results.length
+    newBody.add(passed == results.length && uncaughtError == null
         ? "<tr><td colspan='3' class='unittest-pass'>PASS</td></tr>"
         : "<tr><td colspan='3' class='unittest-fail'>FAIL</td></tr>");
 
@@ -20,17 +20,26 @@ void _showResultsInPage(int testsPassed, int testsFailed, int testsErrors,
       newBody.add(_toHtml(test_));
     }
 
-    if (testsPassed == results.length) {
+    if (uncaughtError != null) {
+        newBody.add('''<tr>
+          <td>--</td>
+          <td class="unittest-error">ERROR</td>
+          <td>Uncaught error: $uncaughtError</td>
+        </tr>''');
+    }
+
+    if (passed == results.length && uncaughtError == null) {
       newBody.add("""
           <tr><td colspan='3' class='unittest-pass'>
-            All ${testsPassed} tests passed
+            All ${passed} tests passed
           </td></tr>""");
     } else {
       newBody.add("""
           <tr><td colspan='3'>Total
-            <span class='unittest-pass'>${testsPassed} passed</span>,
-            <span class='unittest-fail'>${testsFailed} failed</span>
-            <span class='unittest-error'>${testsErrors} errors</span>
+            <span class='unittest-pass'>${passed} passed</span>,
+            <span class='unittest-fail'>${failed} failed</span>
+            <span class='unittest-error'>
+            ${errors + (uncaughtError == null ? 0 : 1)} errors</span>
           </td></tr>""");
     }
     newBody.add("</tbody></table>");