| Index: tests/dom/indexeddb_2_test.dart
|
| ===================================================================
|
| --- tests/dom/indexeddb_2_test.dart (revision 7823)
|
| +++ tests/dom/indexeddb_2_test.dart (working copy)
|
| @@ -18,8 +18,9 @@
|
| var db;
|
|
|
| fail(e) {
|
| - callbackDone();
|
| - Expect.fail('IndexedDB failure');
|
| + guardAsync(() {
|
| + Expect.fail('IndexedDB failure');
|
| + });
|
| }
|
|
|
| createObjectStore() {
|
| @@ -27,21 +28,20 @@
|
| Expect.isNotNull(store);
|
| }
|
|
|
| - step2() {
|
| + step2(e) {
|
| var transaction = db.transaction(storeName, IDBTransaction.READ_ONLY);
|
| var request = transaction.objectStore(storeName).getObject(key);
|
| - request.addEventListener('success', (e) {
|
| - var object = e.target.result;
|
| - check(value, object);
|
| - callbackDone();
|
| - });
|
| + request.addEventListener('success', expectAsync1((e) {
|
| + var object = e.target.result;
|
| + check(value, object);
|
| + }));
|
| request.addEventListener('error', fail);
|
| }
|
|
|
| step1() {
|
| var transaction = db.transaction([storeName], IDBTransaction.READ_WRITE);
|
| var request = transaction.objectStore(storeName).put(value, key);
|
| - request.addEventListener('success', (e) { step2(); });
|
| + request.addEventListener('success', expectAsync1(step2));
|
| request.addEventListener('error', fail);
|
| }
|
|
|
| @@ -53,7 +53,11 @@
|
| // difference and make it work?
|
| var request = db.setVersion(version);
|
| request.addEventListener('success',
|
| - (e) { createObjectStore(); step1(); });
|
| + expectAsync1((e) {
|
| + createObjectStore();
|
| + step1();
|
| + })
|
| + );
|
| request.addEventListener('error', fail);
|
| } else {
|
| step1();
|
| @@ -62,7 +66,7 @@
|
|
|
| var request = window.webkitIndexedDB.open(dbName);
|
| Expect.isNotNull(request);
|
| - request.addEventListener('success', initDb);
|
| + request.addEventListener('success', expectAsync1(initDb));
|
| request.addEventListener('error', fail);
|
| };
|
|
|
| @@ -79,10 +83,10 @@
|
| obj4['a'] = 100;
|
| obj4['b'] = 's';
|
|
|
| - asyncTest('test_simple', 1, testReadWrite(123, obj1, verifyGraph));
|
| - asyncTest('test_DAG', 1, testReadWrite(123, obj2, verifyGraph));
|
| - asyncTest('test_cycle', 1, testReadWrite(123, obj3, verifyGraph));
|
| - asyncTest('test_simple_splay', 1, testReadWrite(123, obj4, verifyGraph));
|
| + test('test_simple', testReadWrite(123, obj1, verifyGraph));
|
| + test('test_DAG', testReadWrite(123, obj2, verifyGraph));
|
| + test('test_cycle', testReadWrite(123, obj3, verifyGraph));
|
| + test('test_simple_splay', testReadWrite(123, obj4, verifyGraph));
|
| }
|
|
|
| main() {
|
|
|