Fix timer tests: timer tests were not using expectAsync to wait for

tests/isolate/timer_cancel_test.dart

Index: tests/isolate/timer_cancel_test.dart
diff --git a/tests/isolate/timer_cancel_test.dart b/tests/isolate/timer_cancel_test.dart
index 408b2ac7bd902cf60cc643e8f2b3abec597ea1bc..1c7bc7cc3c15555bd51ffe6425995a719d898ca9 100644
--- a/tests/isolate/timer_cancel_test.dart
+++ b/tests/isolate/timer_cancel_test.dart
@@ -5,40 +5,41 @@
 #library('timer_cancel_test');
 
 #import("dart:isolate");
-
-void testSimpleTimer() {
-  Timer cancelTimer;
-  int repeatTimer;
-
-  void timeoutHandlerUnreachable(Timer timer) {
-    Expect.equals(true, false);
-  }
-
-  void timeoutHandler(Timer timer) {
-    cancelTimer.cancel();
-  }
-
-  void timeoutHandlerRepeat(Timer timer) {
-    repeatTimer++;
-    timer.cancel();
-    Expect.equals(true, repeatTimer == 1);
-  }
-
-  cancelTimer = new Timer(1000, timeoutHandlerUnreachable);
-  cancelTimer.cancel();
-  new Timer(1000, timeoutHandler);
-  cancelTimer = new Timer(2000, timeoutHandlerUnreachable);
-  repeatTimer = 0;
-  new Timer.repeating(1500, timeoutHandlerRepeat);
-}
-
-void testCancelTimerWithSameTime() {
-  var t2;
-  var t1 = new Timer(0, (t) => t2.cancel());
-  t2 = new Timer(0, (t) => t1.cancel());
-}
+#import('../../pkg/unittest/unittest.dart');
 
 main() {
-  testSimpleTimer();
-  testCancelTimerWithSameTime();
+  test("simple timer", () {
+    Timer cancelTimer;
+    int repeatTimer;
+
+    void timeoutHandlerUnreachable(Timer timer) {
+      print("timeoutHandlerUnreachable");
+      expect(false, "should not be reached");
+    }
+
+    void timeoutHandler(Timer timer) {
+      print("timeoutHandler");
+      cancelTimer.cancel();
+    }
+
+    void timeoutHandlerRepeat(Timer timer) {
+      print("timeoutHandlerRepeat");
+      repeatTimer++;
+      timer.cancel();
+      Expect.equals(true, repeatTimer == 1);
+    }
+
+    cancelTimer = new Timer(1000, expectAsync1(timeoutHandlerUnreachable, count: 0));

[Siggi Cherem (dart-lang), 2012/10/08 21:50:07]

80 col, the name for the callbacks are quite verbose, it might be worth to
rename them:

timeoutHandlerUnreachable -> unreachableHandler
timeoutHandler -> handler
timeoutHandlerRepeate -> repeatHandler

[justinfagnani, 2012/10/08 22:12:48]

Done.

+    cancelTimer.cancel();
+    new Timer(1000, expectAsync1(timeoutHandler));
+    cancelTimer = new Timer(2000, expectAsync1(timeoutHandlerUnreachable, count: 0));
+    repeatTimer = 0;
+    new Timer.repeating(1500, expectAsync1(timeoutHandlerRepeat));
+  });
+  
+  test("cancel timer with same time", () {
+    var t2;
+    var t1 = new Timer(0, expectAsync1((t) => t2.cancel()));
+    t2 = new Timer(0, expectAsync1((t) => t1.cancel(), count: 0));
+  });
 }