Upgrading tests with unittest deprecations

tests/html/canvasrenderingcontext2d_test.dart

 // 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.
 
 library canvas_rendering_context_2d_test; import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
 import 'dart:math';
 
 // Some rounding errors in the browsers.
@@ skipping 321 matching lines @@
   });
 
   group('drawImage_image_element', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
     // Draw an image to the canvas from an image element.
     test('with 3 params', () {
       var dataUrl = otherCanvas.toDataUrl('image/gif');
       var img = new ImageElement();
 
-      img.onLoad.listen(expectAsync1((_) {
+      img.onLoad.listen(expectAsync((_) {
         context.drawImage(img, 50, 50);
 
         expectPixelFilled(50, 50);
         expectPixelFilled(55, 55);
         expectPixelFilled(59, 59);
         expectPixelUnfilled(60, 60);
         expectPixelUnfilled(0, 0);
         expectPixelUnfilled(70, 70);
       }));
       img.onError.listen((_) {
         guardAsync(() {
           fail('URL failed to load.');
         });
       });
       img.src = dataUrl;
     });
 
     // Draw an image to the canvas from an image element and scale it.
     test('with 5 params', () {
       var dataUrl = otherCanvas.toDataUrl('image/gif');
       var img = new ImageElement();
 
-      img.onLoad.listen(expectAsync1((_) {
+      img.onLoad.listen(expectAsync((_) {
         context.drawImageToRect(img, new Rectangle(50, 50, 20, 20));
 
         expectPixelFilled(50, 50);
         expectPixelFilled(55, 55);
         expectPixelFilled(59, 59);
         expectPixelFilled(60, 60);
         expectPixelFilled(69, 69);
         expectPixelUnfilled(70, 70);
         expectPixelUnfilled(0, 0);
         expectPixelUnfilled(80, 80);
       }));
       img.onError.listen((_) {
         guardAsync(() {
           fail('URL failed to load.');
         });
       });
       img.src = dataUrl;
     });
 
     // Draw an image to the canvas from an image element and scale it.
     test('with 9 params', () {
       otherContext.fillStyle = "blue";
       otherContext.fillRect(5, 5, 5, 5);
       var dataUrl = otherCanvas.toDataUrl('image/gif');
       var img = new ImageElement();
 
-      img.onLoad.listen(expectAsync1((_) {
+      img.onLoad.listen(expectAsync((_) {
         // This will take a 6x6 square from the first canvas from position 2,2
         // and then scale it to a 20x20 square and place it to the second
         // canvas at 50,50.
         context.drawImageToRect(img, new Rectangle(50, 50, 20, 20),
           sourceRect: new Rectangle(2, 2, 6, 6));
 
         checkPixel(readPixel(50, 50), [255, 0, 0, 255]);
         checkPixel(readPixel(55, 55), [255, 0, 0, 255]);
         checkPixel(readPixel(60, 50), [255, 0, 0, 255]);
         checkPixel(readPixel(65, 65), [0, 0, 255, 255]);
@@ skipping 72 matching lines @@
       'Smxbp5EiYhAVAAAAAAAABZUrmsBAAAAAAAAR64BAAAAAAAAPteBAXPFgQGcgQAitZyDd'
       'W5khoVWX1ZQOIOBASPjg4QCYloA4AEAAAAAAAASsIEIuoEIVLCBCFS6gQhUsoEDH0O2d'
       'QEAAAAAAABZ54EAo72BAACA8AIAnQEqCAAIAABHCIWFiIWEiAICAnWqA/gD+gINTRgA/'
       'v0hRf/kb+PnRv/I4//8WE8DijI//FRAo5WBACgAsQEAARAQABgAGFgv9AAIAAAcU7trA'
       'QAAAAAAAA67jLOBALeH94EB8YIBfw==';
   group('drawImage_video_element', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
 
     test('with 3 params', () {
-      video.onCanPlay.listen(expectAsync1((_) {
+      video.onCanPlay.listen(expectAsync((_) {
         context.drawImage(video, 50, 50);
 
         expectPixelFilled(50, 50);
         expectPixelFilled(54, 54);
         expectPixelFilled(57, 57);
         expectPixelUnfilled(58, 58);
         expectPixelUnfilled(0, 0);
         expectPixelUnfilled(70, 70);
       }));
 
       video.onError.listen((_) {
         guardAsync(() {
           fail('URL failed to load.');
         });
       });
 
       if(video.canPlayType('video/webm; codecs="vp8.0, vorbis"', '') != '') {
         video.src = webmVideoUrl;
       } else if(video.canPlayType('video/mp4; codecs="avc1.4D401E, mp4a.40.2"',
             null) != '') {
         video.src = mp4VideoUrl;
       } else {
         window.console.log('Video is not supported on this system.');
       }
     });
 
     test('with 5 params', () {
-      video.onCanPlay.listen(expectAsync1((_) {
+      video.onCanPlay.listen(expectAsync((_) {
         context.drawImageToRect(video, new Rectangle(50, 50, 20, 20));
 
         expectPixelFilled(50, 50);
         expectPixelFilled(55, 55);
         expectPixelFilled(59, 59);
         expectPixelFilled(60, 60);
         expectPixelFilled(69, 69);
         expectPixelUnfilled(70, 70);
         expectPixelUnfilled(0, 0);
         expectPixelUnfilled(80, 80);
       }));
       video.onError.listen((_) {
         guardAsync(() {
           fail('URL failed to load.');
         });
       });
 
       if(video.canPlayType('video/webm; codecs="vp8.0, vorbis"', '') != '') {
         video.src = webmVideoUrl;
       } else if(video.canPlayType('video/mp4; codecs="avc1.4D401E, mp4a.40.2"',
             null) != '') {
         video.src = mp4VideoUrl;
       } else {
         // TODO(amouravski): Better fallback?
         window.console.log('Video is not supported on this system.');
       }
     });
 
     test('with 9 params', () {
-      video.onCanPlay.listen(expectAsync1((_) {
+      video.onCanPlay.listen(expectAsync((_) {
         context.drawImageToRect(video, new Rectangle(50, 50, 20, 20),
           sourceRect: new Rectangle(2, 2, 6, 6));
 
         expectPixelFilled(50, 50);
         expectPixelFilled(55, 55);
         expectPixelFilled(59, 59);
         expectPixelFilled(60, 60);
         expectPixelFilled(69, 69);
         expectPixelUnfilled(70, 70);
         expectPixelUnfilled(0, 0);
@@ skipping 17 matching lines @@
     });
   });
 
   group('drawImage_video_element_dataUrl', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
 
     test('with 9 params', () {
       video = new VideoElement();
       canvas = new CanvasElement();
-      video.onCanPlay.listen(expectAsync1((_) {
+      video.onCanPlay.listen(expectAsync((_) {
         context.drawImageToRect(video, new Rectangle(50, 50, 20, 20),
           sourceRect: new Rectangle(2, 2, 6, 6));
 
         expectPixelFilled(50, 50);
         expectPixelFilled(55, 55);
         expectPixelFilled(59, 59);
         expectPixelFilled(60, 60);
         expectPixelFilled(69, 69);
         expectPixelUnfilled(70, 70);
         expectPixelUnfilled(0, 0);
@@ skipping 146 matching lines @@
 
       // The box does not draw after 20 pixels.
       expectPixelUnfilled(x - 10, y);
       expectPixelUnfilled(x + maxWidth + 1, y);
       expectPixelUnfilled(x + maxWidth + 20, y);
       expectPixelFilled(x, y);
       expectPixelFilled(x + 10, y);
     });
   });
 }