aChange all asyncTest/callbackDone style tests to use the new expectAsync/

tests/html/indexeddb_1_test.dart

Index: tests/html/indexeddb_1_test.dart
===================================================================
--- tests/html/indexeddb_1_test.dart	(revision 7823)
+++ tests/html/indexeddb_1_test.dart	(working copy)
@@ -14,8 +14,9 @@
   var db;
 
   fail(e) {
-    callbackDone();
-    Expect.fail('IndexedDB failure');
+    guardAsync(() {
+      Expect.fail('IndexedDB failure');
+    });
   }
 
   createObjectStore() {
@@ -23,21 +24,20 @@
     Expect.isNotNull(store);
   }
 
-  step2() {
+  step2(e) {
     var transaction = db.transaction(storeName, IDBTransaction.READ_ONLY);
     var request = transaction.objectStore(storeName).getObject(key);
-    request.on.success.add((e) {
-        var object = e.target.result;
-        check(value, object);
-        callbackDone();
-      });
+    request.on.success.add(expectAsync1((e) {
+      var object = e.target.result;
+      check(value, object);
+    }));
     request.on.error.add(fail);
   }
 
   step1() {
     var transaction = db.transaction([storeName], IDBTransaction.READ_WRITE);
     var request = transaction.objectStore(storeName).put(value, key);
-    request.on.success.add((e) { step2(); });
+    request.on.success.add(expectAsync1(step2));
     request.on.error.add(fail);
   }
 
@@ -48,7 +48,12 @@
       // open call and listening to onversionchange.  Can we feature-detect the
       // difference and make it work?
       var request = db.setVersion(version);
-      request.on.success.add((e) { createObjectStore(); step1(); });
+      request.on.success.add(
+        expectAsync1((e) {
+          createObjectStore();
+          step1();
+        })
+      );
       request.on.error.add(fail);
     } else {
       step1();
@@ -57,7 +62,7 @@
 
   var request = window.webkitIndexedDB.open(dbName);
   Expect.isNotNull(request);
-  request.on.success.add(initDb);
+  request.on.success.add(expectAsync1(initDb));
   request.on.error.add(fail);
 };
 
@@ -68,8 +73,9 @@
   IDBDatabase db;
 
   fail(e) {
-    callbackDone();
-    Expect.fail('IndexedDB failure');
+    guardAsync(() {
+      Expect.fail('IndexedDB failure');
+    });
   }
 
   createObjectStore() {
@@ -77,15 +83,14 @@
     Expect.isNotNull(store);
   }
 
-  step2() {
+  step2(e) {
     IDBTransaction transaction =
        db.transaction(storeName, IDBTransaction.READ_ONLY);
     IDBRequest request = transaction.objectStore(storeName).getObject(key);
-    request.on.success.add((e) {
-        var object = e.target.result;
-        check(value, object);
-        callbackDone();
-      });
+    request.on.success.add(expectAsync1((e) {
+      var object = e.target.result;
+      check(value, object);
+    }));
     request.on.error.add(fail);
   }
 
@@ -93,7 +98,7 @@
     IDBTransaction transaction =
     db.transaction([storeName], IDBTransaction.READ_WRITE);
     IDBRequest request = transaction.objectStore(storeName).put(value, key);
-    request.on.success.add((e) { step2(); });
+    request.on.success.add(expectAsync1(step2));
     request.on.error.add(fail);
   }
 
@@ -101,7 +106,12 @@
     db = e.target.result;
     if (version != db.version) {
       IDBRequest request = db.setVersion(version);
-      request.request.on.success.add((e) { createObjectStore(); step1(); });
+      request.on.success.add(
+        expectAsync1((e) {
+          createObjectStore();
+           step1();
+        })
+      );
       request.on.error.add(fail);
     } else {
       step1();
@@ -110,22 +120,22 @@
 
   IDBRequest request = window.webkitIndexedDB.open(dbName);
   Expect.isNotNull(request);
-  request.on.success.add(initDb);
+  request.on.success.add(expectAsync1(initDb));
   request.on.error.add(fail);
 };
 
 tests_dynamic() {
-  asyncTest('test1', 1, testReadWrite(123, 'Hoot!', Expect.equals));
-  asyncTest('test2', 1, testReadWrite(123, 12345, Expect.equals));
-  asyncTest('test3', 1, testReadWrite(123, [1,2,3], Expect.listEquals));
-  asyncTest('test4', 1, testReadWrite(123, const [2, 3, 4], Expect.listEquals));
+  test('test1', testReadWrite(123, 'Hoot!', Expect.equals));
+  test('test2', testReadWrite(123, 12345, Expect.equals));
+  test('test3', testReadWrite(123, [1,2,3], Expect.listEquals));
+  test('test4', testReadWrite(123, const [2, 3, 4], Expect.listEquals));
 }
 
 tests_typed() {
-  asyncTest('test1', 1, testReadWriteTyped(123, 'Hoot!', Expect.equals));
-  asyncTest('test2', 1, testReadWriteTyped(123, 12345, Expect.equals));
-  asyncTest('test3', 1, testReadWriteTyped(123, [1,2,3], Expect.listEquals));
-  asyncTest('test4', 1,
+  test('test1', testReadWriteTyped(123, 'Hoot!', Expect.equals));
+  test('test2', testReadWriteTyped(123, 12345, Expect.equals));
+  test('test3', testReadWriteTyped(123, [1,2,3], Expect.listEquals));
+  test('test4',
             testReadWriteTyped(123, const [2, 3, 4], Expect.listEquals));
 }