Upgrading tests with unittest deprecations

tests/isolate/message_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.
 
 // Dart test program for testing serialization of messages.
 // VMOptions=--enable_type_checks --enable_asserts
 
 library MessageTest;
 import 'dart:isolate';
 import 'dart:async';
@@ skipping 81 matching lines @@
   ReceivePort receivePort = new ReceivePort();
   port.send([message, receivePort.sendPort]);
   return receivePort.first;
 }
 
 void main([args, port]) {
   if (testRemote(main, port)) return;
   test("send objects and receive them back", () {
     ReceivePort port = new ReceivePort();
     Isolate.spawn(pingPong, port.sendPort);
-    port.first.then(expectAsync1((remote) {
+    port.first.then(expectAsync((remote) {
       // Send objects and receive them back.
       for (int i = 0; i < MessageTest.elms.length; i++) {
         var sentObject = MessageTest.elms[i];
-        remoteCall(remote, sentObject).then(expectAsync1((var receivedObject) {
+        remoteCall(remote, sentObject).then(expectAsync((var receivedObject) {
           MessageTest.VerifyObject(i, receivedObject);
         }));
       }
 
       // Send recursive objects and receive them back.
       List local_list1 = ["Hello", "World", "Hello", 0xffffffffff];
       List local_list2 = [null, local_list1, local_list1 ];
       List local_list3 = [local_list2, 2.0, true, false, 0xffffffffff];
       List sendObject = new List(5);
       sendObject[0] = local_list1;
       sendObject[1] = sendObject;
       sendObject[2] = local_list2;
       sendObject[3] = sendObject;
       sendObject[4] = local_list3;
       remoteCall(remote, sendObject).then((var replyObject) {
         expect(sendObject, isList);
         expect(replyObject, isList);
         expect(sendObject.length, equals(replyObject.length));
         expect(replyObject[1], same(replyObject));
         expect(replyObject[3], same(replyObject));
         expect(replyObject[0], same(replyObject[2][1]));
         expect(replyObject[0], same(replyObject[2][2]));
         expect(replyObject[2], same(replyObject[4][0]));
         expect(replyObject[0][0], same(replyObject[0][2]));
         // Bigint literals are not canonicalized so do a == check.
         expect(replyObject[0][3], equals(replyObject[4][4]));
       });
 
       // Shutdown the MessageServer.
-      remoteCall(remote, -1).then(expectAsync1((int message) {
+      remoteCall(remote, -1).then(expectAsync((int message) {
           expect(message, MessageTest.elms.length + 1);
       }));
     }));
   });
 }