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

tests/isolate/src/MixedTest.dart

Index: tests/isolate/src/MixedTest.dart
diff --git a/tests/isolate/src/MixedTest.dart b/tests/isolate/src/MixedTest.dart
index eafdf6773e427080d44833586998ab94c35be57d..e2870f282fe094104213f088ec1cc713bb4421ed 100644
--- a/tests/isolate/src/MixedTest.dart
+++ b/tests/isolate/src/MixedTest.dart
@@ -6,7 +6,7 @@
 
 #library('MixedTest');
 #import("dart:isolate");
-#import('../../../lib/unittest/unittest.dart');
+#import('TestFramework.dart');
 
 class IsolateA extends Isolate {
   IsolateA() : super.heavy();
@@ -37,12 +37,15 @@ class IsolateB extends Isolate {
   }
 }
 
-main() {
-  test("light isolate can spawn heavy isolate", () {
-    new IsolateA().spawn().then(expectAsync1((SendPort port) {
-      port.call("launch nested!").then(expectAsync1((msg) {
-        Expect.equals(499, msg);
-      }));
+test(TestExpectation expect) {
+  expect.completes(new IsolateA().spawn()).then((SendPort port) {
+    port.call("launch nested!").then(expect.runs1((msg) {
+      Expect.equals(499, msg);
+      expect.succeeded();
     }));
   });
 }
+
+main() {
+  runTests([test]);
+}