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

lib/unittest/html_enhanced_config.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * A simple unit test library for running tests in a browser.
  *
  * Provides enhanced HTML output with collapsible group headers
  * and other at-a-glance information about the test results.
  */
@@ skipping 20 matching lines @@
       document.head.elements.add(new Element.html(
           '<style id="${_CSSID}"></style>'));
       cssElement = document.head.query('#${_CSSID}');
     }
 
     cssElement.innerHTML = _htmlTestCSS;
 
     _onErrorClosure = (e) {
       // TODO(vsm): figure out how to expose the stack trace here
       // Currently e.message works in dartium, but not in dartc.
-      reportTestError('(DOM callback has errors) Caught ${e}', '');
+      notifyError('(DOM callback has errors) Caught ${e}', '');
     };
   }
 
   void onStart() {
     window.postMessage('unittest-suite-wait-for-done', '*');
     // Listen for uncaught errors.
     window.on.error.add(_onErrorClosure);
   }
 
   void onTestResult(TestCase testCase) {}
 
-  void onDone(int passed, int failed, int errors, List<TestCase> results,
-      String uncaughtError) {
+  void onDone(int passed, int failed, int errors, List<TestCase> results) {
     window.on.error.remove(_onErrorClosure);
 
     _showInteractiveResultsInPage(passed, failed, errors, results,
-        _isLayoutTest, uncaughtError);
+        _isLayoutTest);
 
     window.postMessage('unittest-suite-done', '*');
   }
 
   void _showInteractiveResultsInPage(int passed, int failed, int errors,
-      List<TestCase> results, bool isLayoutTest, String uncaughtError) {
+      List<TestCase> results, bool isLayoutTest){
     if (isLayoutTest && passed == results.length) {
       document.body.innerHTML = "PASS";
     } else {
       // changed the StringBuffer to an Element fragment
       Element te = new Element.html('<div class="unittest-table"></div>');
 
       te.elements.add(new Element.html(passed == results.length
           ? "<div class='unittest-overall unittest-pass'>PASS</div>"
           : "<div class='unittest-overall unittest-fail'>FAIL</div>"));
 
       // moved summary to the top since web browsers
       // don't auto-scroll to the bottom like consoles typically do.
-      if (passed == results.length && uncaughtError == null) {
+      if (passed == results.length) {
         te.elements.add(new Element.html("""
           <div class='unittest-pass'>All ${passed} tests passed</div>"""));
       } else {
 
-        if (uncaughtError != null) {
-          te.elements.add(new Element.html("""
-            <div class='unittest-summary'>
-              <span class='unittest-error'>Uncaught error: $uncaughtError</span>
-            </div>"""));
-        }
-
         te.elements.add(new Element.html("""
-          <div class='unittest-summary'>
-            <span class='unittest-pass'>Total ${passed} passed</span>,
-            <span class='unittest-fail'>${failed} failed</span>,
-            <span class='unittest-error'>
-            ${errors + (uncaughtError == null ? 0 : 1)} errors</span>
-          </div>"""));
+        <div class='unittest-summary'>
+          <span class='unittest-pass'>Total ${passed} passed</span>,
+          <span class='unittest-fail'>${failed} failed</span>,
+          <span class='unittest-error'>${errors} errors</span>
+        </div>"""));
       }
 
       te.elements.add(new Element.html("""
         <div><button id='btnCollapseAll'>Collapse All</button></div>
        """));
 
       // handle the click event for the collapse all button
       te.query('#btnCollapseAll').on.click.add((_){
         document
           .queryAll('.unittest-row')
@@ skipping 257 matching lines @@
   .unittest-row-description
   {
   }
 
   ''';
 }
 
 void useHtmlEnhancedConfiguration([bool isLayoutTest = false]) {
   configure(new HtmlEnhancedConfiguration(isLayoutTest));
 }