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

tests/isolate/src/NestedSpawn2Test.dart

Index: tests/isolate/src/NestedSpawn2Test.dart
diff --git a/tests/isolate/src/NestedSpawn2Test.dart b/tests/isolate/src/NestedSpawn2Test.dart
index 9b1ae10308dfb367e0614057caa8bd45809db02e..38e525c94a80c66e4e8afd45b109316ce7f3f718 100644
--- a/tests/isolate/src/NestedSpawn2Test.dart
+++ b/tests/isolate/src/NestedSpawn2Test.dart
@@ -8,7 +8,7 @@
 
 #library('NestedSpawn2Test');
 #import("dart:isolate");
-#import('../../../lib/unittest/unittest.dart');
+#import('TestFramework.dart');
 
 class IsolateA extends Isolate {
   IsolateA() : super.heavy();
@@ -63,21 +63,24 @@ class IsolateB extends Isolate {
   }
 }
 
-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]);
-            }));
+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() {
+  runTests([test]);
+}