Converting tests over to using event streams.

pkg/unittest/lib/html_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.
  */
 library unittest_html_config;
 
+import 'dart:async';
 import 'dart:html';
 import 'unittest.dart';
 
 /** Creates a table showing tests results in HTML. */
 void _showResultsInPage(int passed, int failed, int errors,
     List<TestCase> results, bool isLayoutTest, String uncaughtError) {
   if (isLayoutTest && (passed == results.length) && uncaughtError == null) {
     document.body.innerHtml = "PASS";
   } else {
     var newBody = new StringBuffer();
@@ skipping 62 matching lines @@
   return string.replaceAll('&', '&amp;')
                .replaceAll('<','&lt;')
                .replaceAll('>','&gt;');
 }
 
 class HtmlConfiguration extends Configuration {
   /** Whether this is run within dartium layout tests. */
   final bool _isLayoutTest;
   HtmlConfiguration(this._isLayoutTest);
 
-  // TODO(rnystrom): Get rid of this if we get canonical closures for methods.
-  EventListener _onErrorClosure;
-  EventListener _onMessageClosure;
+  StreamSubscription<Event> _onErrorSubscription;
+  StreamSubscription<Event> _onMessageSubscription;
 
   void _installHandlers() {
-    if (_onErrorClosure == null) {
-      _onErrorClosure =
-          (e) => handleExternalError(e, '(DOM callback has errors)');
-      // Listen for uncaught errors.
-      window.on.error.add(_onErrorClosure);
+    if (_onErrorSubscription == null) {
+      _onErrorSubscription = window.onError.listen(
+        (e) => handleExternalError(e, '(DOM callback has errors)'));
     }
-    if (_onMessageClosure == null) {
-      _onMessageClosure = (e) => processMessage(e);
-      // Listen for errors from JS.
-      window.on.message.add(_onMessageClosure);
+    if (_onMessageSubscription == null) {
+      _onMessageSubscription = window.onMessage.listen(
+        (e) => processMessage(e));
     }
   }
 
   void _uninstallHandlers() {
-    if (_onErrorClosure != null) {
-      window.on.error.remove(_onErrorClosure);
-      _onErrorClosure = null;
+    if (_onErrorSubscription != null) {
+      _onErrorSubscription.cancel();
+      _onErrorSubscription = null;
     }
-    if (_onMessageClosure != null) {
-      window.on.message.remove(_onMessageClosure);
-      _onMessageClosure = null;
+    if (_onMessageSubscription != null) {
+      _onMessageSubscription.cancel();
+      _onMessageSubscription = null;
     }
   }
 
   void processMessage(e) {
     if ('unittest-suite-external-error' == e.data) {
       handleExternalError('<unknown>', '(external error detected)');
     }
   }
 
   void onInit() {
@@ skipping 12 matching lines @@
   void onDone(bool success) {
     _uninstallHandlers();
     window.postMessage('unittest-suite-done', '*');
   }
 }
 
 void useHtmlConfiguration([bool isLayoutTest = false]) {
   if (config != null) return;
   configure(new HtmlConfiguration(isLayoutTest));
 }