Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(623)

Side by Side Diff: tests/html/indexeddb_2_test.dart

Issue 10412015: aChange all asyncTest/callbackDone style tests to use the new expectAsync/ (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #library('IndexedDB1Test'); 1 #library('IndexedDB1Test');
2 #import('../../lib/unittest/unittest.dart'); 2 #import('../../lib/unittest/unittest.dart');
3 #import('../../lib/unittest/html_config.dart'); 3 #import('../../lib/unittest/html_config.dart');
4 #import('dart:html'); 4 #import('dart:html');
5 #import('dart:coreimpl'); 5 #import('dart:coreimpl');
6 #import('utils.dart'); 6 #import('utils.dart');
7 7
8 // Write and re-read Maps: simple Maps; Maps with DAGs; Maps with cycles. 8 // Write and re-read Maps: simple Maps; Maps with DAGs; Maps with cycles.
9 9
10 final String DB_NAME = 'Test'; 10 final String DB_NAME = 'Test';
11 final String STORE_NAME = 'TEST'; 11 final String STORE_NAME = 'TEST';
12 final String VERSION = '1'; 12 final String VERSION = '1';
13 13
14 testReadWrite(key, value, check, 14 testReadWrite(key, value, check,
15 [dbName = DB_NAME, 15 [dbName = DB_NAME,
16 storeName = STORE_NAME, 16 storeName = STORE_NAME,
17 version = VERSION]) => () { 17 version = VERSION]) => () {
18 var db; 18 var db;
19 19
20 fail(e) { 20 fail(e) {
21 callbackDone(); 21 guardAsync(() {
22 Expect.fail('IndexedDB failure'); 22 Expect.fail('IndexedDB failure');
23 });
23 } 24 }
24 25
25 createObjectStore() { 26 createObjectStore() {
26 var store = db.createObjectStore(storeName); 27 var store = db.createObjectStore(storeName);
27 Expect.isNotNull(store); 28 Expect.isNotNull(store);
28 } 29 }
29 30
30 step2() { 31 step2(e) {
31 var transaction = db.transaction(storeName, IDBTransaction.READ_ONLY); 32 var transaction = db.transaction(storeName, IDBTransaction.READ_ONLY);
32 var request = transaction.objectStore(storeName).getObject(key); 33 var request = transaction.objectStore(storeName).getObject(key);
33 request.on.success.add((e) { 34 request.on.success.add(expectAsync1((e) {
34 var object = e.target.result; 35 var object = e.target.result;
35 check(value, object); 36 check(value, object);
36 callbackDone(); 37 })
37 }); 38 );
38 request.on.error.add(fail); 39 request.on.error.add(fail);
39 } 40 }
40 41
41 step1() { 42 step1() {
42 var transaction = db.transaction([storeName], IDBTransaction.READ_WRITE); 43 var transaction = db.transaction([storeName], IDBTransaction.READ_WRITE);
43 var request = transaction.objectStore(storeName).put(value, key); 44 var request = transaction.objectStore(storeName).put(value, key);
44 request.on.success.add((e) { step2(); }); 45 request.on.success.add(expectAsync1(step2));
45 request.on.error.add(fail); 46 request.on.error.add(fail);
46 } 47 }
47 48
48 initDb(e) { 49 initDb(e) {
49 db = e.target.result; 50 db = e.target.result;
50 if (version != db.version) { 51 if (version != db.version) {
51 // TODO. Some browsers do this the w3 way - passing the version to the 52 // TODO. Some browsers do this the w3 way - passing the version to the
52 // open call and listening to onversionchange. Can we feature-detect the 53 // open call and listening to onversionchange. Can we feature-detect the
53 // difference and make it work? 54 // difference and make it work?
54 var request = db.setVersion(version); 55 var request = db.setVersion(version);
55 request.on.success.add((e) { createObjectStore(); step1(); }); 56 request.on.success.add(
57 expectAsync1((e) {
58 createObjectStore();
59 step1();
60 })
61 );
56 request.on.error.add(fail); 62 request.on.error.add(fail);
57 } else { 63 } else {
58 step1(); 64 step1();
59 } 65 }
60 } 66 }
61 67
62 var request = window.webkitIndexedDB.open(dbName); 68 var request = window.webkitIndexedDB.open(dbName);
63 Expect.isNotNull(request); 69 Expect.isNotNull(request);
64 request.on.success.add(initDb); 70 request.on.success.add(expectAsync1(initDb));
65 request.on.error.add(fail); 71 request.on.error.add(fail);
66 }; 72 };
67 73
68 74
69 tests_dynamic() { 75 tests_dynamic() {
70 var obj1 = {'a': 100, 'b': 's'}; 76 var obj1 = {'a': 100, 'b': 's'};
71 var obj2 = {'x': obj1, 'y': obj1}; // DAG. 77 var obj2 = {'x': obj1, 'y': obj1}; // DAG.
72 78
73 var obj3 = {}; 79 var obj3 = {};
74 obj3['a'] = 100; 80 obj3['a'] = 100;
75 obj3['b'] = obj3; // Cycle. 81 obj3['b'] = obj3; // Cycle.
76 82
77 var obj4 = new SplayTreeMap<String, Dynamic>(); // Different implementation. 83 var obj4 = new SplayTreeMap<String, Dynamic>(); // Different implementation.
78 obj4['a'] = 100; 84 obj4['a'] = 100;
79 obj4['b'] = 's'; 85 obj4['b'] = 's';
80 86
81 asyncTest('test_simple', 1, testReadWrite(123, obj1, verifyGraph)); 87 test('test_simple', testReadWrite(123, obj1, verifyGraph));
82 asyncTest('test_DAG', 1, testReadWrite(123, obj2, verifyGraph)); 88 test('test_DAG', testReadWrite(123, obj2, verifyGraph));
83 asyncTest('test_cycle', 1, testReadWrite(123, obj3, verifyGraph)); 89 test('test_cycle', testReadWrite(123, obj3, verifyGraph));
84 asyncTest('test_simple_splay', 1, testReadWrite(123, obj4, verifyGraph)); 90 test('test_simple_splay', testReadWrite(123, obj4, verifyGraph));
85 } 91 }
86 92
87 main() { 93 main() {
88 useHtmlConfiguration(); 94 useHtmlConfiguration();
89 95
90 tests_dynamic(); 96 tests_dynamic();
91 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698