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

tests/isolate/src/MintMakerTest.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.
 
 // Things that should be "auto-generated" are between AUTO START and
 // AUTO END (or just AUTO if it's a single line).
 
 #library("MintMakerTest");
 #import("dart:isolate");
-
+#import('../../../lib/unittest/unittest.dart');
 
 class Mint {
   Mint() : registry_ = new Map<SendPort, Purse>() {
     // AUTO START
     ReceivePort mintPort = new ReceivePort();
     port = mintPort.toSendPort();
     serveMint(mintPort);
     // AUTO END
   }
 
@@ skipping 161 matching lines @@
       port.call(null).then((var message) {
         SendPort mint = message[0];
         handleMint(new MintWrapper(mint));
       });
     });
   }
 
   Future<SendPort> port_;
 }
 
+_checkBalance(PurseWrapper wrapper, expected) {
+  wrapper.queryBalance(later1((int balance) {
+    Expect.equals(expected, balance);

[Bob Nystrom, 2012/04/20 22:31:36]

expect(balance).equals(expected);

?

[Siggi Cherem (dart-lang), 2012/04/21 00:03:43]

Done.

+  }));
+}
 
-class MintMakerTest {
-  static void testMain() {
+main() {
+  test("creating purse, deposit, and query balance", () {
     MintMakerWrapper mintMaker = new MintMakerWrapper();
-    mintMaker.makeMint((MintWrapper mint) {
-      mint.createPurse(100, (PurseWrapper purse) {
-        purse.queryBalance((int balance) {
-          Expect.equals(100, balance);
-        });
-        purse.sproutPurse((PurseWrapper sprouted) {
-          sprouted.queryBalance((int balance) {
-            Expect.equals(0, balance);
-          });
+    mintMaker.makeMint(later1((MintWrapper mint) {
+      mint.createPurse(100, later1((PurseWrapper purse) {
+        _checkBalance(purse, 100);
+        purse.sproutPurse(later1((PurseWrapper sprouted) {
+          _checkBalance(sprouted, 0);
+          _checkBalance(purse, 100);
+
           sprouted.deposit(purse, 5);
-          sprouted.queryBalance((int balance) {
-            Expect.equals(0 + 5, balance);
-          });
-          purse.queryBalance((int balance) {
-            Expect.equals(100 - 5, balance);
-          });
+          _checkBalance(sprouted, 0 + 5);
+          _checkBalance(purse, 100 - 5);
+
           sprouted.deposit(purse, 42);
-          sprouted.queryBalance((int balance) {
-            Expect.equals(0 + 5 + 42, balance);
-          });
-          purse.queryBalance((int balance) {
-            Expect.equals(100 - 5 - 42, balance);
-          });
-        });
-      });
-    });
-  }
+          _checkBalance(sprouted, 0 + 5 + 42);
+          _checkBalance(purse, 100 - 5 - 42);
+        }));
+      }));
+    }));
+  });
 
   /* This is an attempt to show how the above code could look like if we had
    * better language support for asynchronous messages (deferred/asynccall).
    * The static helper methods like createPurse and queryBalance would also
    * have to be marked async.
 
   void run(port) {
     MintMakerWrapper mintMaker = spawnMintMaker();
     deferred {
       MintWrapper mint = asynccall mintMaker.createMint();
@@ skipping 27 matching lines @@
 
     sprouted...deposit(purse, 5);
     Expect.equals(0 + 5, sprouted.queryBalance());
     Expect.equals(100 - 5, purse.queryBalance());
 
     sprouted...deposit(purse, 42);
     Expect.equals(0 + 5 + 42, sprouted.queryBalance());
     Expect.equals(100 - 5 - 42, purse.queryBalance());
   }
   */
-
 }
-
-main() {
-  MintMakerTest.testMain();
-}