pkg/unittest: fixed deprecations in alt configs

pkg/unittest/lib/interactive_html_config.dart

-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2013, 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.
 
 /**
  * This configuration can be used to rerun selected tests, as well
  * as see diagnostic output from tests. It runs each test in its own
  * IFrame, so the configuration consists of two parts - a 'parent'
  * config that manages all the tests, and a 'child' config for the
  * IFrame that runs the individual tests.
  */
 library unittest_interactive_html_config;
 
 // TODO(gram) - add options for: remove IFrame on done/keep
 // IFrame for failed tests/keep IFrame for all tests.
 
 import 'dart:html';
+import 'dart:async';
 import 'dart:math';
 import 'unittest.dart';
 
 /** The messages exchanged between parent and child. */
 
 class _Message {
   static const START = 'start';
   static const LOG = 'log';
   static const STACK = 'stack';
   static const PASS = 'pass';
@@ skipping 18 matching lines @@
     elapsed = int.parse(msg.substring(idx, idx2));
     ++idx2;
     body = msg.substring(idx2);
   }
 
   String toString() => text(messageType, elapsed, body);
 }
 
 
 class HtmlConfiguration extends Configuration {
-  // TODO(rnystrom): Get rid of this if we get canonical closures for methods.
-  EventListener _onErrorClosure;
+  StreamSubscription _errorSubscription;
 
   void _installErrorHandler() {
-    if (_onErrorClosure == null) {
-      _onErrorClosure =
-          (e) => handleExternalError(e, '(DOM callback has errors)');
-      // Listen for uncaught errors.
-      window.on.error.add(_onErrorClosure);
+    if (_errorSubscription == null) {
+      _errorSubscription = window.onError.listen((e) {
+        handleExternalError(e, '(DOM callback has errors)');
+      });
     }
   }
 
   void _uninstallErrorHandler() {
-    if (_onErrorClosure != null) {
-      window.on.error.remove(_onErrorClosure);
-      _onErrorClosure = null;
+    if (_errorSubscription != null) {
+      _errorSubscription.cancel();
+      _errorSubscription = null;
     }
   }
 }
 
 /**
  * The child configuration that is used to run individual tests in
  * an IFrame and post the results back to the parent. In principle
  * this can run more than one test in the IFrame but currently only
  * one is used.
  */
 class ChildInteractiveHtmlConfiguration extends HtmlConfiguration {
 
   /** The window to which results must be posted. */
-  Window parentWindow;
+  WindowBase parentWindow;
 
   /** The time at which tests start. */
   Map<int,DateTime> _testStarts;
 
   ChildInteractiveHtmlConfiguration() :
       _testStarts = new Map<int,DateTime>();
 
   /** Don't start running tests automatically. */
   get autoStart => false;
 
   void onInit() {
     _installErrorHandler();
 
     /**
      *  The parent posts a 'start' message to kick things off,
      *  which is handled by this handler. It saves the parent
      *  window, gets the test ID from the query parameter in the
      *  IFrame URL, sets that as a solo test and starts test execution.
      */
-    window.on.message.add((MessageEvent e) {
+    window.onMessage.listen((MessageEvent e) {
       // Get the result, do any logging, then do a pass/fail.
       var m = new _Message.fromString(e.data);
       if (m.messageType == _Message.START) {
         parentWindow = e.source;
         String search = window.location.search;
         int pos = search.indexOf('t=');
         String ids = search.substring(pos+2);
         int id = int.parse(ids);
         setSoloTest(id);
         runTests();
@@ skipping 65 matching lines @@
   String _stack;
 
   int _testTime;
   /**
    * Whether or not we have already wrapped the TestCase test functions
    * in new closures that instead create an IFrame and get it to run the
    * test.
    */
   bool _doneWrap = false;
 
-  /**
-   * We use this to make a single closure from _handleMessage so we
-   * can remove the handler later.
-   */
-  Function _messageHandler;
+  StreamSubscription _messageSubscription;
 
   ParentInteractiveHtmlConfiguration() :
       _testStarts = new Map<int,DateTime>();
 
   // We need to block until the test is done, so we make a
   // dummy async callback that we will use to flag completion.
   Function completeTest = null;
 
   wrapTest(TestCase testCase) {
     String baseUrl = window.location.toString();
     String url = '${baseUrl}?t=${testCase.id}';
     return () {
       // Rebuild the child IFrame.
       Element childDiv = document.query('#child');
       childDiv.nodes.clear();
       IFrameElement child = new Element.html("""
           <iframe id='childFrame${testCase.id}' src='$url' style='display:none'>
           </iframe>""");
       childDiv.nodes.add(child);
       completeTest = expectAsync0((){ });
       // Kick off the test when the IFrame is loaded.
-      child.on.load.add((e) {
+      child.onLoad.listen((e) {
         child.contentWindow.postMessage(_Message.text(_Message.START), '*');
       });
     };
   }
 
   void _handleMessage(MessageEvent e) {
     // Get the result, do any logging, then do a pass/fail.
     var msg = new _Message.fromString(e.data);
     if (msg.messageType == _Message.LOG) {
       logMessage(e.data);
     } else if (msg.messageType == _Message.STACK) {
       _stack = msg.body;
     } else {
       _testTime = msg.elapsed;
       logMessage(_Message.text(_Message.LOG, _testTime, 'Complete'));
       if (msg.messageType == _Message.PASS) {
         currentTestCase.pass();
       } else if (msg.messageType == _Message.FAIL) {
         currentTestCase.fail(msg.body, _stack);
       } else if (msg.messageType == _Message.ERROR) {
         currentTestCase.error(msg.body, _stack);
       }
       completeTest();
     }
   }
 
   void onInit() {
     _installErrorHandler();
-    _messageHandler = _handleMessage; // We need to make just one closure.
     document.query('#group-divs').innerHtml = "";
   }
 
   void onStart() {
     _installErrorHandler();
     if (!_doneWrap) {
       _doneWrap = true;
       for (int i = 0; i < testCases.length; i++) {
         testCases[i].test = wrapTest(testCases[i]);
         testCases[i].setUp = null;
         testCases[i].tearDown = null;
       }
     }
-    window.on.message.add(_messageHandler);
+    assert(_messageSubscription == null);
+    _messageSubscription = window.onMessage.listen(_handleMessage);
   }
 
   static final _notAlphaNumeric = new RegExp('[^a-z0-9A-Z]');
 
   String _stringToDomId(String s) {
     if (s.length == 0) {
       return '-None-';
     }
     return s.trim().replaceAll(_notAlphaNumeric, '-');
   }
@@ skipping 19 matching lines @@
       groupDiv = new Element.html("""
           <div class='test-describe' id='$groupId'>
             <h2>
               <input type='checkbox' checked='true' class='groupselect'>
               Group: ${testCase.currentGroup}
             </h2>
             <ul class='tests'>
             </ul>
           </div>""");
       document.query('#group-divs').nodes.add(groupDiv);
-      groupDiv.query('.groupselect').on.click.add((e) {
+      groupDiv.query('.groupselect').onClick.listen((e) {
         var parent = document.query('#$groupId');
         InputElement cb = parent.query('.groupselect');
         var state = cb.checked;
         var tests = parent.query('.tests');
-        for (Element t in tests.elements) {
+        for (Element t in tests.children) {
           cb = t.query('.testselect') as InputElement;
           cb.checked = state;
           var testId = int.parse(t.id.substring(_testIdPrefix.length));
           if (state) {
             enableTest(testId);
           } else {
             disableTest(testId);
           }
         }
       });
@@ skipping 12 matching lines @@
                 <span class='timer-result test-timer-result'></span>
                 <span class='test-name closed'>${testCase.description}</span>
                 </span>
               </p>
             </div>
             <div class='scrollpane'>
               <ol class='test-actions' id='$_actionIdPrefix$id'></ol>
             </div>
           </li>""");
       list.nodes.add(testItem);
-      testItem.query('#$_selectedIdPrefix$id').on.change.add((e) {
+      testItem.query('#$_selectedIdPrefix$id').onChange.listen((e) {
         InputElement cb = testItem.query('#$_selectedIdPrefix$id');
         testCase.enabled = cb.checked;
       });
-      testItem.query('.test-label').on.click.add((e) {
+      testItem.query('.test-label').onClick.listen((e) {
         var _testItem = document.query('#$_testIdPrefix$id');
         var _actions = _testItem.query('#$_actionIdPrefix$id');
         var _label = _testItem.query('.test-name');
         if (_actions.style.display == 'none') {
           _actions.style.display = 'table';
           _label.classes.remove('closed');
           _label.classes.add('open');
         } else {
           _actions.style.display = 'none';
           _label.classes.remove('open');
@@ skipping 54 matching lines @@
       e.classes.add(result);
     }
     actions.style.display = 'none';
   }
 
   void onSummary(int passed, int failed, int errors, List<TestCase> results,
       String uncaughtError) {
   }
 
   void onDone(bool success) {
-    window.on.message.remove(_messageHandler);
+    assert(_messageSubscription != null);
+    _messageSubscription.cancel();
+    _messageSubscription = null;
     _uninstallErrorHandler();
     document.query('#busy').style.display = 'none';
     InputElement startButton = document.query('#start');
     startButton.disabled = false;
   }
 }
 
 /**
  * Add the divs to the DOM if they are not present. We have a 'controls'
  * div for control, 'specs' div with test results, a 'busy' div for the
  * animated GIF used to indicate tests are running, and a 'child' div to
  * hold the iframe for the test.
  */
 void _prepareDom() {
   if (document.query('#control') == null) {
     // Use this as an opportunity for adding the CSS too.
     // I wanted to avoid having to include a css element explicitly
     // in the main html file. I considered moving all the styles
     // inline as attributes but that started getting very messy,
     // so we do it this way.
     document.body.nodes.add(new Element.html("<style>$_CSS</style>"));
     document.body.nodes.add(new Element.html(
         "<div id='control'>"
             "<input id='start' disabled='true' type='button' value='Run'>"
         "</div>"));
-    document.query('#start').on.click.add((e) {
+    document.query('#start').onClick.listen((e) {
       InputElement startButton = document.query('#start');
       startButton.disabled = true;
       rerunTests();
     });
   }
   if (document.query('#otherlogs') == null) {
     document.body.nodes.add(new Element.html(
         "<div id='otherlogs'></div>"));
   }
   if (document.query('#specs') == null) {
     document.body.nodes.add(new Element.html(
         "<div id='specs'><div id='group-divs'></div></div>"));
   }
   if (document.query('#busy') == null) {
     document.body.nodes.add(new Element.html(
         "<div id='busy' style='display:none'><img src='googleballs.gif'>"
         "</img></div>"));
   }
   if (document.query('#child') == null) {
     document.body.nodes.add(new Element.html("<div id='child'></div>"));
   }
 }
 
 /**
  * Allocate a Configuration. We allocate either a parent or
- * child, depedning on whether the URL has a search part.
+ * child, depending on whether the URL has a search part.
  */
 void useInteractiveHtmlConfiguration() {
   if (config != null) return;
   if (window.location.search == '') { // This is the parent.
     _prepareDom();
     configure(new ParentInteractiveHtmlConfiguration());
   } else {
     configure(new ChildInteractiveHtmlConfiguration());
   }
 }
@@ skipping 190 matching lines @@
 display: block;
 list-style-type: disc;
 -webkit-margin-before: 1em;
 -webkit-margin-after: 1em;
 -webkit-margin-start: 0px;
 -webkit-margin-end: 0px;
 -webkit-padding-start: 40px;
 }
 
   """;