Upgrading tests with unittest deprecations

tests/html/xhr_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 XHRTest;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:html';
 import 'dart:typed_data';
 import 'package:unittest/html_individual_config.dart';
@@ skipping 58 matching lines @@
 
     test('XHR file', () {
       var loadEndCalled = false;
 
       var xhr = new HttpRequest();
       xhr.open('GET', url, async: true);
       xhr.onReadyStateChange.listen(expectAsyncUntil1((e) {
         if (xhr.readyState == HttpRequest.DONE) {
           validate200Response(xhr);
 
-          Timer.run(expectAsync0(() {
+          Timer.run(expectAsync(() {
             expect(loadEndCalled, HttpRequest.supportsLoadEndEvent);
           }));
         }
       }, () => xhr.readyState == HttpRequest.DONE));
 
       xhr.onLoadEnd.listen((ProgressEvent e) {
         loadEndCalled = true;
       });
       xhr.send();
     });
 
     test('XHR.request No file', () {
       HttpRequest.request('NonExistingFile').then(
         (_) { fail('Request should not have succeeded.'); },
-        onError: expectAsync1((error) {
+        onError: expectAsync((error) {
           var xhr = error.target;
           expect(xhr.readyState, equals(HttpRequest.DONE));
           validate404(xhr);
         }));
     });
 
     test('XHR.request file', () {
-      HttpRequest.request(url).then(expectAsync1((xhr) {
+      HttpRequest.request(url).then(expectAsync((xhr) {
         expect(xhr.readyState, equals(HttpRequest.DONE));
         validate200Response(xhr);
       }));
     });
 
     test('XHR.request onProgress', () {
       var progressCalled = false;
       HttpRequest.request(url,
         onProgress: (_) {
           progressCalled = true;
-        }).then(expectAsync1(
+        }).then(expectAsync(
           (xhr) {
             expect(xhr.readyState, equals(HttpRequest.DONE));
             expect(progressCalled, HttpRequest.supportsProgressEvent);
             validate200Response(xhr);
           }));
     });
 
     test('XHR.request withCredentials No file', () {
       HttpRequest.request('NonExistingFile', withCredentials: true).then(
         (_) { fail('Request should not have succeeded.'); },
-        onError: expectAsync1((error) {
+        onError: expectAsync((error) {
           var xhr = error.target;
           expect(xhr.readyState, equals(HttpRequest.DONE));
           validate404(xhr);
         }));
     });
 
     test('XHR.request withCredentials file', () {
-      HttpRequest.request(url, withCredentials: true).then(expectAsync1((xhr) {
+      HttpRequest.request(url, withCredentials: true).then(expectAsync((xhr) {
         expect(xhr.readyState, equals(HttpRequest.DONE));
         validate200Response(xhr);
       }));
     });
 
     test('XHR.getString file', () {
-      HttpRequest.getString(url).then(expectAsync1((str) {}));
+      HttpRequest.getString(url).then(expectAsync((str) {}));
     });
 
     test('XHR.getString No file', () {
       HttpRequest.getString('NonExistingFile').then(
         (_) { fail('Succeeded for non-existing file.'); },
-        onError: expectAsync1((error) {
+        onError: expectAsync((error) {
           validate404(error.target);
         }));
     });
 
     test('XHR.request responseType arraybuffer', () {
       if (Platform.supportsTypedData) {
         HttpRequest.request(url, responseType: 'arraybuffer',
           requestHeaders: {'Content-Type': 'text/xml'}).then(
-          expectAsync1((xhr) {
+          expectAsync((xhr) {
             expect(xhr.status, equals(200));
             var byteBuffer = xhr.response;
             expect(byteBuffer, new isInstanceOf<ByteBuffer>());
             expect(byteBuffer, isNotNull);
           }));
       }
     });
 
     test('overrideMimeType', () {
       var expectation =
@@ skipping 67 matching lines @@
       var data = {
         'key': 'value',
         'a': 'b',
         'one': 2,
       };
 
       HttpRequest.request(url,
           method: 'POST',
           sendData: JSON.encode(data),
           responseType: 'json').then(
-          expectAsync1((xhr) {
+          expectAsync((xhr) {
             expect(xhr.status, equals(200));
             var json = xhr.response;
             expect(json, equals(data));
           }));
     });
   });
 
   group('headers', () {
     test('xhr responseHeaders', () {
       return HttpRequest.request(url).then(
         (xhr) {
           var serverHeader = xhr.responseHeaders['server'];
           expect(serverHeader, isNotNull);
           // Should be like: 'Dart/0.1 (dart:io)'
           expect(serverHeader.startsWith('Dart/'), isTrue);
         });
     });
   });
 }