| Index: tests/dom/indexeddb_1_test.dart
|
| diff --git a/tests/dom/indexeddb_1_test.dart b/tests/dom/indexeddb_1_test.dart
|
| index 604e3613e4070878f38b3638022718ce44c8d6ef..a1de7ecbe12f1b962a713d90abcfc54efcd366b1 100644
|
| --- a/tests/dom/indexeddb_1_test.dart
|
| +++ b/tests/dom/indexeddb_1_test.dart
|
| @@ -1,7 +1,7 @@
|
| #library('IndexedDB1Test');
|
| #import('../../lib/unittest/unittest.dart');
|
| -#import('../../lib/unittest/dom_config.dart');
|
| -#import('dart:dom');
|
| +#import('../../lib/unittest/html_config.dart');
|
| +#import('dart:html');
|
|
|
| final String DB_NAME = 'Test';
|
| final String STORE_NAME = 'TEST';
|
| @@ -26,19 +26,19 @@ testReadWrite(key, value, check,
|
| step2() {
|
| var transaction = db.transaction(storeName, IDBTransaction.READ_ONLY);
|
| var request = transaction.objectStore(storeName).getObject(key);
|
| - request.addEventListener('success', (e) {
|
| + request.on.success.add((e) {
|
| var object = e.target.result;
|
| check(value, object);
|
| callbackDone();
|
| });
|
| - request.addEventListener('error', fail);
|
| + request.on.error.add(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('error', fail);
|
| + request.on.success.add((e) { step2(); });
|
| + request.on.error.add(fail);
|
| }
|
|
|
| initDb(e) {
|
| @@ -48,9 +48,8 @@ testReadWrite(key, value, check,
|
| // 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) { createObjectStore(); step1(); });
|
| - request.addEventListener('error', fail);
|
| + request.on.success.add((e) { createObjectStore(); step1(); });
|
| + request.on.error.add(fail);
|
| } else {
|
| step1();
|
| }
|
| @@ -58,8 +57,8 @@ testReadWrite(key, value, check,
|
|
|
| var request = window.webkitIndexedDB.open(dbName);
|
| Expect.isNotNull(request);
|
| - request.addEventListener('success', initDb);
|
| - request.addEventListener('error', fail);
|
| + request.on.success.add(initDb);
|
| + request.on.error.add(fail);
|
| };
|
|
|
| testReadWriteTyped(key, value, check,
|
| @@ -82,29 +81,28 @@ testReadWriteTyped(key, value, check,
|
| IDBTransaction transaction =
|
| db.transaction(storeName, IDBTransaction.READ_ONLY);
|
| IDBRequest request = transaction.objectStore(storeName).getObject(key);
|
| - request.addEventListener('success', (e) {
|
| + request.on.success.add((e) {
|
| var object = e.target.result;
|
| check(value, object);
|
| callbackDone();
|
| });
|
| - request.addEventListener('error', fail);
|
| + request.on.error.add(fail);
|
| }
|
|
|
| step1() {
|
| IDBTransaction transaction =
|
| db.transaction([storeName], IDBTransaction.READ_WRITE);
|
| IDBRequest request = transaction.objectStore(storeName).put(value, key);
|
| - request.addEventListener('success', (e) { step2(); });
|
| - request.addEventListener('error', fail);
|
| + request.on.success.add((e) { step2(); });
|
| + request.on.error.add(fail);
|
| }
|
|
|
| initDb(e) {
|
| db = e.target.result;
|
| if (version != db.version) {
|
| IDBRequest request = db.setVersion(version);
|
| - request.addEventListener('success',
|
| - (e) { createObjectStore(); step1(); });
|
| - request.addEventListener('error', fail);
|
| + request.request.on.success.add((e) { createObjectStore(); step1(); });
|
| + request.on.error.add(fail);
|
| } else {
|
| step1();
|
| }
|
| @@ -112,8 +110,8 @@ testReadWriteTyped(key, value, check,
|
|
|
| IDBRequest request = window.webkitIndexedDB.open(dbName);
|
| Expect.isNotNull(request);
|
| - request.addEventListener('success', initDb);
|
| - request.addEventListener('error', fail);
|
| + request.on.success.add(initDb);
|
| + request.on.error.add(fail);
|
| };
|
|
|
| tests_dynamic() {
|
| @@ -132,7 +130,7 @@ tests_typed() {
|
| }
|
|
|
| main() {
|
| - useDomConfiguration();
|
| + useHtmlConfiguration();
|
|
|
| tests_dynamic();
|
| tests_typed();
|
|
|