unittest step 3 and 4: remove TestFramework.dart, make test.dart use

tests/isolate/src/NestedSpawn2Test.dart

 // Copyright (c) 2011, 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 that isolates can spawn other isolates and
 // that the nested isolates can communicate with the main once the spawner has
 // disappeared.
 
 #library('NestedSpawn2Test');
 #import("dart:isolate");
-#import('TestFramework.dart');
+#import('../../../lib/unittest/unittest.dart');
 
 class IsolateA extends Isolate {
   IsolateA() : super.heavy();
 
   void main() {
     this.port.receive((msg, replyTo) {
       Expect.equals("launch nested!", msg);
       new IsolateB().spawn().then((SendPort p) {
         p.send(replyTo, null);
         this.port.close();
@@ skipping 34 matching lines @@
           _call(replyTo, msg4, ((msg, replyTo) {
             Expect.equals("5", msg[0]);
             replyTo.send(msg6, null);
           }));
         }));
       }));
     });
   }
 }
 
-test(TestExpectation expect) {
-  expect.completes(new IsolateA().spawn()).then((SendPort port) {
-    _call(port, "launch nested!", expect.runs2((msg, replyTo) {
-      Expect.equals("0", msg[0]);
-      _call(replyTo, msg1, expect.runs2((msg, replyTo) {
-        Expect.equals("2", msg[0]);
-        _call(replyTo, msg3, expect.runs2((msg, replyTo) {
-          Expect.equals("4", msg[0]);
-          _call(replyTo, msg5, expect.runs2((msg, replyTo) {
-            Expect.equals("6", msg[0]);
-            expect.succeeded();
+main() {
+  test("spawned isolate can spawn other isolates", () {
+    new IsolateA().spawn().then(expectAsync1((SendPort port) {
+      _call(port, "launch nested!", expectAsync2((msg, replyTo) {
+        Expect.equals("0", msg[0]);
+        _call(replyTo, msg1, expectAsync2((msg, replyTo) {
+          Expect.equals("2", msg[0]);
+          _call(replyTo, msg3, expectAsync2((msg, replyTo) {
+            Expect.equals("4", msg[0]);
+            _call(replyTo, msg5, expectAsync2((msg, replyTo) {
+              Expect.equals("6", msg[0]);
+            }));
           }));
         }));
       }));
     }));
   });
 }
-
-main() {
-  runTests([test]);
-}