Cleanup for pkg/observe and pkg/polymer

pkg/observe/test/observe_test.dart

 // 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.
 
 import 'dart:async';
 import 'package:logging/logging.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/src/dirty_check.dart' as dirty_check;
 import 'package:unittest/unittest.dart';
 import 'observe_test_utils.dart';
@@ skipping 25 matching lines @@
     });
 
     tearDown(() {
       subscription.cancel();
     });
 
     test('logs debug information', () {
       var maxNumIterations = dirty_check.MAX_DIRTY_CHECK_CYCLES;
 
       var x = new WatcherModel(0);
-      var sub = x.changes.listen(expectAsync1((_) { x.value++; },
+      var sub = x.changes.listen(expectAsync((_) { x.value++; },
           count: maxNumIterations));
       x.value = 1;
       Observable.dirtyCheck();
       expect(x.value, maxNumIterations + 1);
       expect(messages.length, 2);
 
       expect(messages[0], contains('Possible loop'));
       expect(messages[1], contains('index 0'));
       expect(messages[1], contains('object: $x'));
 
@@ skipping 18 matching lines @@
 
   tearDown(() {
     for (var sub in subs) sub.cancel();
     return new Future(() {
       expect(dirty_check.allObservablesCount, initialObservers,
           reason: 'Observable object leaked');
     });
   });
 
   test('handle future result', () {
-    var callback = expectAsync0((){});
+    var callback = expectAsync((){});
     return new Future(callback);
   });
 
   test('no observers', () {
     var t = createModel(123);
     expect(t.value, 123);
     t.value = 42;
     expect(t.value, 42);
     expect(t.hasObservers, false);
   });
 
   test('listen adds an observer', () {
     var t = createModel(123);
     expect(t.hasObservers, false);
 
     subs.add(t.changes.listen((n) {}));
     expect(t.hasObservers, true);
   });
 
   test('changes delived async', () {
     var t = createModel(123);
     int called = 0;
 
-    subs.add(t.changes.listen(expectAsync1((records) {
+    subs.add(t.changes.listen(expectAsync((records) {
       called++;
       expectPropertyChanges(records, watch ? 1 : 2);
     })));
 
     t.value = 41;
     t.value = 42;
     expect(called, 0);
   });
 
   test('cause changes in handler', () {
     var t = createModel(123);
     int called = 0;
 
-    subs.add(t.changes.listen(expectAsync1((records) {
+    subs.add(t.changes.listen(expectAsync((records) {
       called++;
       expectPropertyChanges(records, 1);
       if (called == 1) {
         // Cause another change
         t.value = 777;
       }
     }, count: 2)));
 
     t.value = 42;
   });
 
   test('multiple observers', () {
     var t = createModel(123);
 
     verifyRecords(records) {
       expectPropertyChanges(records, watch ? 1 : 2);
     };
 
-    subs.add(t.changes.listen(expectAsync1(verifyRecords)));
-    subs.add(t.changes.listen(expectAsync1(verifyRecords)));
+    subs.add(t.changes.listen(expectAsync(verifyRecords)));
+    subs.add(t.changes.listen(expectAsync(verifyRecords)));
 
     t.value = 41;
     t.value = 42;
   });
 
   test('async processing model', () {
     var t = createModel(123);
     var records = [];
     subs.add(t.changes.listen((r) { records.addAll(r); }));
     t.value = 41;
@@ skipping 12 matching lines @@
 
       // Has no effect if there are no changes
       Observable.dirtyCheck();
       expectPropertyChanges(records, 1);
     });
   });
 
   test('cancel listening', () {
     var t = createModel(123);
     var sub;
-    sub = t.changes.listen(expectAsync1((records) {
+    sub = t.changes.listen(expectAsync((records) {
       expectPropertyChanges(records, 1);
       sub.cancel();
       t.value = 777;
       scheduleMicrotask(Observable.dirtyCheck);
     }));
     t.value = 42;
   });
 
   test('cancel and reobserve', () {
     var t = createModel(123);
     var sub;
-    sub = t.changes.listen(expectAsync1((records) {
+    sub = t.changes.listen(expectAsync((records) {
       expectPropertyChanges(records, 1);
       sub.cancel();
 
-      scheduleMicrotask(expectAsync0(() {
-        subs.add(t.changes.listen(expectAsync1((records) {
+      scheduleMicrotask(expectAsync(() {
+        subs.add(t.changes.listen(expectAsync((records) {
           expectPropertyChanges(records, 1);
         })));
         t.value = 777;
         scheduleMicrotask(Observable.dirtyCheck);
       }));
     }));
     t.value = 42;
   });
 
   test('cannot modify changes list', () {
@@ skipping 58 matching lines @@
   @observable T value;
 
   WatcherModel([T initialValue]) : value = initialValue;
 
   String toString() => '#<$runtimeType value: $value>';
 }
 
 class ModelSubclass<T> extends WatcherModel<T> {
   ModelSubclass([T initialValue]) : super(initialValue);
 }