| Index: tests/html/request_animation_frame_test.dart
|
| diff --git a/tests/html/request_animation_frame_test.dart b/tests/html/request_animation_frame_test.dart
|
| index 32e22c8e37b2aa95d1195fbdf69c90a0fa2a9dd2..00f1d8a582070c48d8e4c3db24bafe0a73a88589 100644
|
| --- a/tests/html/request_animation_frame_test.dart
|
| +++ b/tests/html/request_animation_frame_test.dart
|
| @@ -3,6 +3,7 @@
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| library RequestAnimationFrameTest;
|
| +
|
| import 'package:unittest/unittest.dart';
|
| import 'package:unittest/html_config.dart';
|
| import 'dart:html';
|
| @@ -11,45 +12,36 @@ main() {
|
| useHtmlConfiguration();
|
|
|
| test('oneShot', () {
|
| - var frame = window.requestAnimationFrame(
|
| - expectAsync((timestamp) { }));
|
| - });
|
| + var frame = window.requestAnimationFrame(expectAsync((timestamp) {}));
|
| + });
|
|
|
| test('twoShot', () {
|
| - var frame = window.requestAnimationFrame(
|
| - expectAsync((timestamp1) {
|
| - window.requestAnimationFrame(
|
| - expectAsync((timestamp2) {
|
| - // Not monotonic on Safari and IE.
|
| - // expect(timestamp2, greaterThan(timestamp1),
|
| - // reason: 'timestamps ordered');
|
| - }));
|
| - }));
|
| - });
|
| -
|
| + var frame = window.requestAnimationFrame(expectAsync((timestamp1) {
|
| + window.requestAnimationFrame(expectAsync((timestamp2) {
|
| + // Not monotonic on Safari and IE.
|
| + // expect(timestamp2, greaterThan(timestamp1),
|
| + // reason: 'timestamps ordered');
|
| + }));
|
| + }));
|
| + });
|
|
|
| // How do we test that a callback is never called? We can't wrap the uncalled
|
| // callback with 'expectAsync'. Will request several frames and try
|
| // cancelling the one that is not the last.
|
| test('cancel1', () {
|
| - var frame1 = window.requestAnimationFrame(
|
| - (timestamp1) {
|
| - throw new Exception('Should have been cancelled');
|
| - });
|
| - var frame2 = window.requestAnimationFrame(
|
| - expectAsync((timestamp2) { }));
|
| - window.cancelAnimationFrame(frame1);
|
| + var frame1 = window.requestAnimationFrame((timestamp1) {
|
| + throw new Exception('Should have been cancelled');
|
| });
|
| + var frame2 = window.requestAnimationFrame(expectAsync((timestamp2) {}));
|
| + window.cancelAnimationFrame(frame1);
|
| + });
|
|
|
| test('cancel2', () {
|
| - var frame1 = window.requestAnimationFrame(
|
| - expectAsync((timestamp1) { }));
|
| - var frame2 = window.requestAnimationFrame(
|
| - (timestamp2) {
|
| - throw new Exception('Should have been cancelled');
|
| - });
|
| - var frame3 = window.requestAnimationFrame(
|
| - expectAsync((timestamp3) { }));
|
| - window.cancelAnimationFrame(frame2);
|
| + var frame1 = window.requestAnimationFrame(expectAsync((timestamp1) {}));
|
| + var frame2 = window.requestAnimationFrame((timestamp2) {
|
| + throw new Exception('Should have been cancelled');
|
| });
|
| + var frame3 = window.requestAnimationFrame(expectAsync((timestamp3) {}));
|
| + window.cancelAnimationFrame(frame2);
|
| + });
|
| }
|
|
|