| Index: tests/dom/indexeddb_3_test.dart
|
| ===================================================================
|
| --- tests/dom/indexeddb_3_test.dart (revision 7823)
|
| +++ tests/dom/indexeddb_3_test.dart (working copy)
|
| @@ -16,7 +16,7 @@
|
| start() {
|
| var request = window.webkitIndexedDB.open(DB_NAME);
|
| Expect.isNotNull(request);
|
| - request.addEventListener('success', initDb);
|
| + request.addEventListener('success', expectAsync1(initDb));
|
| request.addEventListener('error', fail('open'));
|
| }
|
|
|
| @@ -26,14 +26,15 @@
|
| // open call and listening to onversionchange. Can we feature-detect the
|
| // difference and make it work?
|
| var request = db.setVersion(VERSION);
|
| - request.addEventListener('success', (e) {
|
| + request.addEventListener('success',
|
| + expectAsync1((e) {
|
| try {
|
| // Nuke object store if it already exists.
|
| db.deleteObjectStore(STORE_NAME);
|
| } catch (IDBDatabaseException e) { }
|
| db.createObjectStore(STORE_NAME);
|
| writeItems(0);
|
| - });
|
| + }));
|
| request.addEventListener('blocked', fail('setVersion blocked'));
|
| request.addEventListener('error', fail('setVersion error'));
|
| }
|
| @@ -43,16 +44,19 @@
|
| var transaction = db.transaction([STORE_NAME], IDBTransaction.READ_WRITE);
|
| var request = transaction.objectStore(STORE_NAME)
|
| .put('Item $index', index);
|
| - request.addEventListener('success', (e) { writeItems(index + 1); });
|
| + request.addEventListener('success',
|
| + expectAsync1((e) {
|
| + writeItems(index + 1);
|
| + })
|
| + );
|
| request.addEventListener('error', fail('put'));
|
| - } else {
|
| - callbackDone();
|
| }
|
| }
|
|
|
| fail(message) => (e) {
|
| - callbackDone();
|
| - Expect.fail('IndexedDB failure: $message');
|
| + guardAsync(() {
|
| + Expect.fail('IndexedDB failure: $message');
|
| + });
|
| };
|
|
|
| readAllViaCursor() {
|
| @@ -62,22 +66,21 @@
|
| int itemCount = 0;
|
| int sumKeys = 0;
|
| int lastKey = null;
|
| - cursorRequest.addEventListener("success", (e) {
|
| - var cursor = e.target.result;
|
| - if (cursor != null) {
|
| - lastKey = cursor.key;
|
| - itemCount += 1;
|
| - sumKeys += cursor.key;
|
| - Expect.equals('Item ${cursor.key.toStringAsFixed(0)}', cursor.value);
|
| - cursor.continueFunction();
|
| - } else {
|
| - // Done
|
| - Expect.equals(99, lastKey);
|
| - Expect.equals(100, itemCount);
|
| - Expect.equals((100 * 99) ~/ 2, sumKeys);
|
| - callbackDone();
|
| - }
|
| - });
|
| + cursorRequest.addEventListener("success", expectAsync1((e) {
|
| + var cursor = e.target.result;
|
| + if (cursor != null) {
|
| + lastKey = cursor.key;
|
| + itemCount += 1;
|
| + sumKeys += cursor.key;
|
| + Expect.equals('Item ${cursor.key.toStringAsFixed(0)}', cursor.value);
|
| + cursor.continueFunction();
|
| + } else {
|
| + // Done
|
| + Expect.equals(99, lastKey);
|
| + Expect.equals(100, itemCount);
|
| + Expect.equals((100 * 99) ~/ 2, sumKeys);
|
| + }
|
| + }, 101));
|
| cursorRequest.addEventListener('error', fail('openCursor'));
|
| }
|
|
|
| @@ -89,22 +92,21 @@
|
| int itemCount = 0;
|
| int sumKeys = 0;
|
| int lastKey = null;
|
| - cursorRequest.addEventListener("success", (e) {
|
| - var cursor = e.target.result;
|
| - if (cursor != null) {
|
| - lastKey = cursor.key;
|
| - itemCount += 1;
|
| - sumKeys += cursor.key;
|
| - Expect.equals('Item ${cursor.key}', cursor.value);
|
| - cursor.continueFunction();
|
| - } else {
|
| - // Done
|
| - Expect.equals(0, lastKey); // i.e. first key (scanned in reverse).
|
| - Expect.equals(100, itemCount);
|
| - Expect.equals((100 * 99) ~/ 2, sumKeys);
|
| - callbackDone();
|
| - }
|
| - });
|
| + cursorRequest.addEventListener("success", expectAsync1((e) {
|
| + var cursor = e.target.result;
|
| + if (cursor != null) {
|
| + lastKey = cursor.key;
|
| + itemCount += 1;
|
| + sumKeys += cursor.key;
|
| + Expect.equals('Item ${cursor.key}', cursor.value);
|
| + cursor.continueFunction();
|
| + } else {
|
| + // Done
|
| + Expect.equals(0, lastKey); // i.e. first key (scanned in reverse).
|
| + Expect.equals(100, itemCount);
|
| + Expect.equals((100 * 99) ~/ 2, sumKeys);
|
| + }
|
| + }, 101));
|
| cursorRequest.addEventListener('error', fail('openCursor'));
|
| }
|
| }
|
| @@ -112,8 +114,8 @@
|
| main() {
|
| useDomConfiguration();
|
|
|
| - var test = new Test();
|
| - asyncTest('prepare', 1, test.start);
|
| - asyncTest('readAll1', 1, test.readAllViaCursor);
|
| - asyncTest('readAll2', 1, test.readAllReversedViaCursor);
|
| + var test_ = new Test();
|
| + test('prepare', test_.start);
|
| + test('readAll1', test_.readAllViaCursor);
|
| + test('readAll2', test_.readAllReversedViaCursor);
|
| }
|
|
|