| Index: tests/standalone/src/TimerCancelTest.dart
|
| diff --git a/tests/standalone/src/TimerCancelTest.dart b/tests/standalone/src/TimerCancelTest.dart
|
| index 5de524dac58c8a87e98b2d3357a1c64ca745afc5..48f461ff2fa4fc6cf4cfa219e4dc8d64fc7dfc99 100644
|
| --- a/tests/standalone/src/TimerCancelTest.dart
|
| +++ b/tests/standalone/src/TimerCancelTest.dart
|
| @@ -1,43 +1,42 @@
|
| -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
|
| +// Copyright (c) 2012, 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:io");
|
|
|
| -class TimerCancelTest {
|
| +void testSimpleTimer() {
|
| + Timer cancelTimer;
|
| + int repeatTimer;
|
|
|
| - static void testSimpleTimer() {
|
| -
|
| - 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);
|
| - }
|
| + void timeoutHandlerUnreachable(Timer timer) {
|
| + Expect.equals(true, false);
|
| + }
|
|
|
| - cancelTimer = new Timer(timeoutHandlerUnreachable, 1000);
|
| - cancelTimer.cancel();
|
| - new Timer(timeoutHandler, 1000);
|
| - cancelTimer = new Timer(timeoutHandlerUnreachable, 2000);
|
| - repeatTimer = 0;
|
| - new Timer.repeating(timeoutHandlerRepeat, 1500);
|
| + void timeoutHandler(Timer timer) {
|
| + cancelTimer.cancel();
|
| }
|
|
|
| - static void testMain() {
|
| - testSimpleTimer();
|
| + void timeoutHandlerRepeat(Timer timer) {
|
| + repeatTimer++;
|
| + timer.cancel();
|
| + Expect.equals(true, repeatTimer == 1);
|
| }
|
|
|
| - static Timer cancelTimer;
|
| - static int repeatTimer;
|
| + cancelTimer = new Timer(timeoutHandlerUnreachable, 1000);
|
| + cancelTimer.cancel();
|
| + new Timer(timeoutHandler, 1000);
|
| + cancelTimer = new Timer(timeoutHandlerUnreachable, 2000);
|
| + repeatTimer = 0;
|
| + new Timer.repeating(timeoutHandlerRepeat, 1500);
|
| +}
|
| +
|
| +void testCancelTimerWithSameTime() {
|
| + var t2;
|
| + var t1 = new Timer((t) => t2.cancel(), 0);
|
| + t2 = new Timer((t) => t1.cancel(), 0);
|
| }
|
|
|
| main() {
|
| - TimerCancelTest.testMain();
|
| + testSimpleTimer();
|
| + testCancelTimerWithSameTime();
|
| }
|
|
|