| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>IndexedDB: Test IDBObjectStore.getAll.</title> | 2 <title>IndexedDB: Test IDBObjectStore.getAllKeys.</title> |
| 3 <script src="../../resources/testharness.js"></script> | 3 <script src="../../resources/testharness.js"></script> |
| 4 <script src="../../resources/testharnessreport.js"></script> | 4 <script src="../../resources/testharnessreport.js"></script> |
| 5 <script> | 5 <script> |
| 6 | 6 |
| 7 var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split(''); |
| 8 |
| 7 function doSetup(dbName, dbVersion, onsuccess) { | 9 function doSetup(dbName, dbVersion, onsuccess) { |
| 8 var delete_request = indexedDB.deleteDatabase(dbName); | 10 var delete_request = indexedDB.deleteDatabase(dbName); |
| 9 delete_request.onerror = function() { | 11 delete_request.onerror = function() { |
| 10 assert_unreached('deleteDatabase should not fail'); | 12 assert_unreached('deleteDatabase should not fail'); |
| 11 }; | 13 }; |
| 12 delete_request.onsuccess = function(e) { | 14 delete_request.onsuccess = function(e) { |
| 13 var req = indexedDB.open(dbName, dbVersion); | 15 var req = indexedDB.open(dbName, dbVersion); |
| 14 req.onsuccess = onsuccess; | 16 req.onsuccess = onsuccess; |
| 15 req.onerror = function() { | 17 req.onerror = function() { |
| 16 assert_unreached('open should not fail'); | 18 assert_unreached('open should not fail'); |
| 17 }; | 19 }; |
| 18 req.onupgradeneeded = function(evt) { | 20 req.onupgradeneeded = function(evt) { |
| 19 var connection = evt.target.result; | 21 var connection = evt.target.result; |
| 20 var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split(''); | |
| 21 | 22 |
| 22 var store = connection.createObjectStore('generated', | 23 var store = connection.createObjectStore('generated', |
| 23 {autoIncrement: true, keyPath: 'id'}); | 24 {autoIncrement: true, keyPath: 'id'}); |
| 24 alphabet.forEach(function(letter) { | 25 alphabet.forEach(function(letter) { |
| 25 store.put({ch: letter}); | 26 store.put({ch: letter}); |
| 26 }); | 27 }); |
| 27 | 28 |
| 28 store = connection.createObjectStore('out-of-line', null); | 29 store = connection.createObjectStore('out-of-line', null); |
| 29 alphabet.forEach(function(letter) { | 30 alphabet.forEach(function(letter) { |
| 30 store.put(letter, letter); | 31 store.put('value-' + letter, letter); |
| 31 }); | 32 }); |
| 32 | 33 |
| 33 store = connection.createObjectStore('empty', null); | 34 store = connection.createObjectStore('empty', null); |
| 34 }; | 35 }; |
| 35 }; | 36 }; |
| 36 } | 37 } |
| 37 | 38 |
| 38 function createGetAllRequest(t, storeName, connection, range, maxCount) { | 39 function createGetAllKeysRequest(t, storeName, connection, range, maxCount) { |
| 39 var transaction = connection.transaction(storeName, 'readonly'); | 40 var transaction = connection.transaction(storeName, 'readonly'); |
| 40 var store = transaction.objectStore(storeName); | 41 var store = transaction.objectStore(storeName); |
| 41 // TODO(cmumford): Simplify once crbug.com/335871 is closed. | 42 // TODO(cmumford): Simplify once crbug.com/335871 is closed. |
| 42 var req = maxCount !== undefined ? store.getAll(range, maxCount) : | 43 var req = maxCount !== undefined ? store.getAllKeys(range, maxCount) : |
| 43 range !== undefined ? store.getAll(range) : store.getAll(); | 44 range !== undefined ? store.getAllKeys(range) : |
| 44 req.onerror = t.unreached_func('getAll request should succeed'); | 45 store.getAllKeys(); |
| 46 req.onerror = t.unreached_func('getAllKeys request should succeed'); |
| 45 return req; | 47 return req; |
| 46 } | 48 } |
| 47 | 49 |
| 48 doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) { | 50 doSetup(location.pathname + '-IDBObjectStore.getAllKeys', 1, function(evt) { |
| 49 var connection = evt.target.result; | 51 var connection = evt.target.result; |
| 50 async_test(function(t) { | 52 async_test(function(t) { |
| 51 var req = createGetAllRequest(t, 'out-of-line', connection, 'c'); | 53 var req = createGetAllKeysRequest(t, 'out-of-line', connection, 'c'); |
| 52 req.onsuccess = t.step_func(function(evt) { | 54 req.onsuccess = t.step_func(function(evt) { |
| 53 assert_array_equals(evt.target.result, ['c']); | 55 assert_array_equals(evt.target.result, ['c']); |
| 54 t.done(); | 56 t.done(); |
| 55 }); | 57 }); |
| 56 }, 'Single item get'); | 58 }, 'Single item get'); |
| 57 | 59 |
| 58 async_test(function(t) { | 60 async_test(function(t) { |
| 59 var req = createGetAllRequest(t, 'generated', connection, 3); | 61 var req = createGetAllKeysRequest(t, 'generated', connection, 3); |
| 60 req.onsuccess = t.step_func(function(evt) { | 62 req.onsuccess = t.step_func(function(evt) { |
| 61 var data = evt.target.result; | 63 var data = evt.target.result; |
| 62 assert_true(Array.isArray(data)); | 64 assert_true(Array.isArray(data)); |
| 63 assert_equals(data.length, 1); | 65 assert_array_equals(data, [3]); |
| 64 assert_object_equals(data[0], {ch: 'c', id: 3}); | |
| 65 t.done(); | 66 t.done(); |
| 66 }); | 67 }); |
| 67 }, 'Single item get (generated key)'); | 68 }, 'Single item get (generated key)'); |
| 68 | 69 |
| 69 async_test(function(t) { | 70 async_test(function(t) { |
| 70 var req = createGetAllRequest(t, 'empty', connection); | 71 var req = createGetAllKeysRequest(t, 'empty', connection); |
| 71 req.onsuccess = t.step_func(function(evt) { | 72 req.onsuccess = t.step_func(function(evt) { |
| 72 assert_array_equals(evt.target.result, [], | 73 assert_array_equals(evt.target.result, [], |
| 73 'getAll() on empty object store should return an empty array'); | 74 'getAllKeys() on empty object store should return an empty ' + |
| 75 'array'); |
| 74 t.done(); | 76 t.done(); |
| 75 }); | 77 }); |
| 76 }, 'getAll on empty object store'); | 78 }, 'getAllKeys on empty object store'); |
| 77 | 79 |
| 78 async_test(function(t) { | 80 async_test(function(t) { |
| 79 var req = createGetAllRequest(t, 'out-of-line', connection); | 81 var req = createGetAllKeysRequest(t, 'out-of-line', connection); |
| 80 req.onsuccess = t.step_func(function(evt) { | 82 req.onsuccess = t.step_func(function(evt) { |
| 81 assert_array_equals(evt.target.result, | 83 assert_array_equals(evt.target.result, alphabet); |
| 82 'abcdefghijklmnopqrstuvwxyz'.split('')); | |
| 83 t.done(); | 84 t.done(); |
| 84 }); | 85 }); |
| 85 }, 'Get all values'); | 86 }, 'Get all values'); |
| 86 | 87 |
| 87 async_test(function(t) { | 88 async_test(function(t) { |
| 88 var req = createGetAllRequest(t, 'out-of-line', connection, undefined, | 89 var req = createGetAllKeysRequest(t, 'out-of-line', connection, undefined, |
| 89 10); | 90 10); |
| 90 req.onsuccess = t.step_func(function(evt) { | 91 req.onsuccess = t.step_func(function(evt) { |
| 91 assert_array_equals(evt.target.result, | 92 assert_array_equals(evt.target.result, |
| 92 ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']); | 93 ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']); |
| 93 t.done(); | 94 t.done(); |
| 94 }); | 95 }); |
| 95 }, 'Test maxCount'); | 96 }, 'Test maxCount'); |
| 96 | 97 |
| 97 async_test(function(t) { | 98 async_test(function(t) { |
| 98 var req = createGetAllRequest(t, 'out-of-line', connection, | 99 var req = createGetAllKeysRequest(t, 'out-of-line', connection, |
| 99 IDBKeyRange.bound('g', 'm')); | 100 IDBKeyRange.bound('g', 'm')); |
| 100 req.onsuccess = t.step_func(function(evt) { | 101 req.onsuccess = t.step_func(function(evt) { |
| 101 assert_array_equals(evt.target.result, | 102 assert_array_equals(evt.target.result, |
| 102 ['g', 'h', 'i', 'j', 'k', 'l', 'm']); | 103 ['g', 'h', 'i', 'j', 'k', 'l', 'm']); |
| 103 t.done(); | 104 t.done(); |
| 104 }); | 105 }); |
| 105 }, 'Get bound range'); | 106 }, 'Get bound range'); |
| 106 | 107 |
| 107 async_test(function(t) { | 108 async_test(function(t) { |
| 108 var req = createGetAllRequest(t, 'out-of-line', connection, | 109 var req = createGetAllKeysRequest(t, 'out-of-line', connection, |
| 109 IDBKeyRange.bound('g', 'm'), 3); | 110 IDBKeyRange.bound('g', 'm'), 3); |
| 110 req.onsuccess = t.step_func(function(evt) { | 111 req.onsuccess = t.step_func(function(evt) { |
| 111 assert_array_equals(evt.target.result, ['g', 'h', 'i']); | 112 assert_array_equals(evt.target.result, ['g', 'h', 'i']); |
| 112 t.done(); | 113 t.done(); |
| 113 }); | 114 }); |
| 114 }, 'Get bound range with maxCount'); | 115 }, 'Get bound range with maxCount'); |
| 115 | 116 |
| 116 async_test(function(t) { | 117 async_test(function(t) { |
| 117 var req = createGetAllRequest(t, 'out-of-line', connection, | 118 var req = createGetAllKeysRequest(t, 'out-of-line', connection, |
| 118 IDBKeyRange.bound('g', 'k', false, true)); | 119 IDBKeyRange.bound('g', 'k', false, true)); |
| 119 req.onsuccess = t.step_func(function(evt) { | 120 req.onsuccess = t.step_func(function(evt) { |
| 120 assert_array_equals(evt.target.result, ['g', 'h', 'i', 'j']); | 121 assert_array_equals(evt.target.result, ['g', 'h', 'i', 'j']); |
| 121 t.done(); | 122 t.done(); |
| 122 }); | 123 }); |
| 123 }, 'Get upper excluded'); | 124 }, 'Get upper excluded'); |
| 124 | 125 |
| 125 async_test(function(t) { | 126 async_test(function(t) { |
| 126 var req = createGetAllRequest(t, 'out-of-line', connection, | 127 var req = createGetAllKeysRequest(t, 'out-of-line', connection, |
| 127 IDBKeyRange.bound('g', 'k', true, false)); | 128 IDBKeyRange.bound('g', 'k', true, false)); |
| 128 req.onsuccess = t.step_func(function(evt) { | 129 req.onsuccess = t.step_func(function(evt) { |
| 129 assert_array_equals(evt.target.result, ['h', 'i', 'j', 'k']); | 130 assert_array_equals(evt.target.result, ['h', 'i', 'j', 'k']); |
| 130 t.done(); | 131 t.done(); |
| 131 }); | 132 }); |
| 132 }, 'Get lower excluded'); | 133 }, 'Get lower excluded'); |
| 133 | 134 |
| 134 async_test(function(t) { | 135 async_test(function(t) { |
| 135 var req = createGetAllRequest(t, 'generated', connection, | 136 var req = createGetAllKeysRequest(t, 'generated', connection, |
| 136 IDBKeyRange.bound(4, 15), 3); | 137 IDBKeyRange.bound(4, 15), 3); |
| 137 req.onsuccess = t.step_func(function(evt) { | 138 req.onsuccess = t.step_func(function(evt) { |
| 138 var data = evt.target.result; | 139 var data = evt.target.result; |
| 139 assert_true(Array.isArray(data)); | 140 assert_true(Array.isArray(data)); |
| 140 assert_equals(data.length, 3); | 141 assert_array_equals(data, [4, 5, 6]); |
| 141 assert_object_equals(data[0], {ch: 'd', id: 4}); | |
| 142 assert_object_equals(data[1], {ch: 'e', id: 5}); | |
| 143 assert_object_equals(data[2], {ch: 'f', id: 6}); | |
| 144 t.done(); | 142 t.done(); |
| 145 }); | 143 }); |
| 146 }, 'Get bound range (generated) with maxCount'); | 144 }, 'Get bound range (generated) with maxCount'); |
| 147 | 145 |
| 148 async_test(function(t) { | 146 async_test(function(t) { |
| 149 var req = createGetAllRequest(t, 'out-of-line', connection, | 147 var req = createGetAllKeysRequest(t, 'out-of-line', connection, |
| 150 "Doesn't exist"); | 148 "Doesn't exist"); |
| 151 req.onsuccess = t.step_func(function(evt) { | 149 req.onsuccess = t.step_func(function(evt) { |
| 152 assert_array_equals(evt.target.result, [], | 150 assert_array_equals(evt.target.result, [], |
| 153 'getAll() using a nonexistent key should return an empty array'); | 151 'getAllKeys() using a nonexistent key should return an ' + |
| 152 'empty array'); |
| 154 t.done(); | 153 t.done(); |
| 155 }); | 154 }); |
| 156 req.onerror = t.unreached_func('getAll request should succeed'); | 155 req.onerror = t.unreached_func('getAllKeys request should succeed'); |
| 157 }, 'Non existent key'); | 156 }, 'Non existent key'); |
| 158 | 157 |
| 159 async_test(function(t) { | 158 async_test(function(t) { |
| 160 var transaction = connection.transaction('out-of-line', 'readonly'); | 159 var req = createGetAllKeysRequest(t, 'out-of-line', connection, undefined, |
| 161 var store = transaction.objectStore('out-of-line'); | 160 0); |
| 162 assert_throws(new TypeError(), function () { | 161 req.onsuccess = t.step_func(function(evt) { |
| 163 store.getAll(undefined, 0); | 162 assert_array_equals(evt.target.result, alphabet); |
| 164 }, 'getAll() with maxCount=0 should throw TypeError'); | 163 t.done(); |
| 165 t.done(); | 164 }); |
| 166 }, 'zero maxCount'); | 165 }, 'zero maxCount'); |
| 167 }); | 166 }); |
| 168 | 167 |
| 169 </script> | 168 </script> |
| OLD | NEW |