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

tests/isolate/src/Message2Test.dart

Index: tests/isolate/src/Message2Test.dart
diff --git a/tests/isolate/src/Message2Test.dart b/tests/isolate/src/Message2Test.dart
index 3d6767412bc2556ab383dfc5dfa9a45e56f3bb8a..61dcaabd8db03fbfe674a09a543429a3501509a4 100644
--- a/tests/isolate/src/Message2Test.dart
+++ b/tests/isolate/src/Message2Test.dart
@@ -7,7 +7,8 @@
 
 #library('Message2Test');
 #import("dart:isolate");
-#import("TestFramework.dart");
+
+#import('../../../lib/unittest/unittest.dart');
 
 // ---------------------------------------------------------------------------
 // Message passing test 2.
@@ -57,21 +58,18 @@ class PingPongServer extends Isolate {
   }
 }
 
-void test(TestExpectation expect) {
-  expect.completes(new PingPongServer().spawn()).then((SendPort remote) {
-    Map m = new Map();
-    m[1] = "eins";
-    m[2] = "deux";
-    m[3] = "tre";
-    m[4] = "four";
-    remote.call(m).then(expect.runs1((var received) {
-      MessageTest.mapEqualsDeep(m, received);
-      remote.send(-1, null);
-      expect.succeeded();
+main() {
+  test("map is equal after it is sent back and forth", () {
+    new PingPongServer().spawn().then(expectAsync1((SendPort remote) {
+      Map m = new Map();
+      m[1] = "eins";
+      m[2] = "deux";
+      m[3] = "tre";
+      m[4] = "four";
+      remote.call(m).then(expectAsync1((var received) {
+        MessageTest.mapEqualsDeep(m, received);
+        remote.send(-1, null);
+      }));
     }));
   });
 }
-
-main() {
-  runTests([test]);
-}