| OLD | NEW |
|---|
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script src="../inspector-test.js"></script> | 3 <script src="../inspector-test.js"></script> |
| 4 <script src="../resources-test.js"></script> | 4 <script src="../resources-test.js"></script> |
| 5 <script src="../console-test.js"></script> | 5 <script src="../console-test.js"></script> |
| 6 <script src="indexeddb-test.js"></script> | 6 <script src="indexeddb-test.js"></script> |
| 7 <script> | 7 <script> |
| 8 | 8 |
| 9 function onIndexedDBError(e) { | |
| 10 console.error("IndexedDB error: " + e); | |
| 11 } | |
| 12 | |
| 13 function createDatabase(databaseName) { | |
| 14 var callback; | |
| 15 var promise = new Promise((fulfill) => callback = fulfill); | |
| 16 var request = indexedDB.open(databaseName); | |
| 17 request.onerror = onIndexedDBError; | |
| 18 request.onsuccess = function(event) { | |
| 19 request.result.close(); | |
| 20 callback(); | |
| 21 } | |
| 22 return promise; | |
| 23 } | |
| 24 | |
| 25 function createObjectStore(databaseName, objectStoreName, indexName, keyPath) { | |
| 26 var callback; | |
| 27 var promise = new Promise((fulfill) => callback = fulfill); | |
| 28 var request = indexedDB.open(databaseName); | |
| 29 request.onerror = onIndexedDBError; | |
| 30 request.onsuccess = function(event) { | |
| 31 var db = request.result; | |
| 32 var version = db.version; | |
| 33 db.close(); | |
| 34 | |
| 35 var upgradeRequest = indexedDB.open(databaseName, version + 1); | |
| 36 | |
| 37 upgradeRequest.onerror = onIndexedDBError; | |
| 38 upgradeRequest.onupgradeneeded = function(e) { | |
| 39 var upgradeDb = e.target.result; | |
| 40 var store = upgradeDb.createObjectStore(objectStoreName, { keyPath:
"test", autoIncrement: false }); | |
| 41 store.createIndex(indexName, "test", { unique: false, multiEntry: fa
lse }); | |
| 42 callback(); | |
| 43 } | |
| 44 upgradeRequest.onsuccess = function(e) { | |
| 45 var upgradeDb = e.target.result; | |
| 46 upgradeDb.close(); | |
| 47 callback(); | |
| 48 } | |
| 49 } | |
| 50 return promise; | |
| 51 } | |
| 52 | |
| 53 function addIDBValue(databaseName, objectStoreName, key, value) { | |
| 54 var callback; | |
| 55 var promise = new Promise((fulfill) => callback = fulfill); | |
| 56 var request = indexedDB.open(databaseName); | |
| 57 request.onerror = onIndexedDBError; | |
| 58 request.onsuccess = function(event) { | |
| 59 var db = request.result; | |
| 60 var transaction = db.transaction(objectStoreName, "readwrite"); | |
| 61 var store = transaction.objectStore(objectStoreName); | |
| 62 store.put({ test: key, testValue: value }); | |
| 63 | |
| 64 transaction.onerror = onIndexedDBError; | |
| 65 transaction.oncomplete = function() { | |
| 66 db.close(); | |
| 67 callback(); | |
| 68 }; | |
| 69 } | |
| 70 return promise; | |
| 71 } | |
| 72 | |
| 73 async function test() | 9 async function test() |
| 74 { | 10 { |
| 75 var databaseName = "testDatabase"; | 11 var databaseName = "testDatabase"; |
| 76 var objectStoreName1 = "testObjectStore1"; | 12 var objectStoreName1 = "testObjectStore1"; |
| 77 var objectStoreName2 = "testObjectStore2"; | 13 var objectStoreName2 = "testObjectStore2"; |
| 78 var indexName = "testIndex"; | 14 var indexName = "testIndex"; |
| 79 var keyPath = "testKey"; | 15 var keyPath = "testKey"; |
| 80 | 16 |
| 81 var indexedDBModel = InspectorTest.mainTarget.model(Resources.IndexedDBModel
); | 17 var indexedDBModel = InspectorTest.mainTarget.model(Resources.IndexedDBModel
); |
| 82 var databaseId; | 18 var databaseId; |
| 83 | 19 |
| 84 function waitRefreshDatabase(callback) { | 20 function waitRefreshDatabase() { |
| 85 var view = UI.panels.resources._sidebar.indexedDBListTreeElement._idbDat
abaseTreeElements[0]._view; | 21 var view = UI.panels.resources._sidebar.indexedDBListTreeElement._idbDat
abaseTreeElements[0]._view; |
| 86 InspectorTest.addSniffer(Resources.IDBDatabaseView.prototype, "_updatedF
orTests", callback, false); | |
| 87 view._refreshDatabaseButtonClicked(); | 22 view._refreshDatabaseButtonClicked(); |
| 23 return new Promise((resolve) => { |
| 24 InspectorTest.addSniffer(Resources.IDBDatabaseView.prototype, "_upda
tedForTests", resolve, false) |
| 25 }); |
| 88 } | 26 } |
| 89 | 27 |
| 90 function waitUpdateDataView(callback) { | 28 function waitRefreshDatabaseRightClick() { |
| 91 InspectorTest.addSniffer(Resources.IDBDataView.prototype, "_updatedDataF
orTests", callback, false); | 29 idbDatabaseTreeElement._refreshIndexedDB(); |
| 30 return waitUpdateDataView(); |
| 31 } |
| 32 |
| 33 function waitUpdateDataView() { |
| 34 return new Promise((resolve) => { |
| 35 InspectorTest.addSniffer(Resources.IDBDataView.prototype, "_updatedD
ataForTests", resolve, false) |
| 36 }); |
| 92 } | 37 } |
| 93 | 38 |
| 94 function waitDatabaseLoaded(callback) { | 39 function waitDatabaseLoaded(callback) { |
| 95 var event = indexedDBModel.addEventListener(Resources.IndexedDBModel.Eve
nts.DatabaseLoaded, () => { | 40 var event = indexedDBModel.addEventListener(Resources.IndexedDBModel.Eve
nts.DatabaseLoaded, () => { |
| 96 Common.EventTarget.removeEventListeners([event]); | 41 Common.EventTarget.removeEventListeners([event]); |
| 97 callback(); | 42 callback(); |
| 98 }); | 43 }); |
| 99 } | 44 } |
| 100 | 45 |
| 101 function waitDatabaseAdded(callback) { | 46 function waitDatabaseAdded(callback) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 121 for (var j = 0; j < entries.length; ++j) { | 66 for (var j = 0; j < entries.length; ++j) { |
| 122 InspectorTest.addResult(" Key = " + entries[j].key._v
alue + ", value = " + entries[j].value); | 67 InspectorTest.addResult(" Key = " + entries[j].key._v
alue + ", value = " + entries[j].value); |
| 123 } | 68 } |
| 124 } | 69 } |
| 125 } | 70 } |
| 126 | 71 |
| 127 // Initial tree | 72 // Initial tree |
| 128 InspectorTest.dumpIndexedDBTree(); | 73 InspectorTest.dumpIndexedDBTree(); |
| 129 | 74 |
| 130 // Create database | 75 // Create database |
| 131 await InspectorTest.evaluateInPageAsync("createDatabase('" + databaseName +
"')"); | 76 await InspectorTest.createDatabaseAsync(databaseName); |
| 132 await new Promise(waitDatabaseAdded); | 77 await new Promise(waitDatabaseAdded); |
| 133 var idbDatabaseTreeElement = UI.panels.resources._sidebar.indexedDBListTreeE
lement._idbDatabaseTreeElements[0]; | 78 var idbDatabaseTreeElement = UI.panels.resources._sidebar.indexedDBListTreeE
lement._idbDatabaseTreeElements[0]; |
| 134 databaseId = idbDatabaseTreeElement._databaseId; | 79 databaseId = idbDatabaseTreeElement._databaseId; |
| 135 InspectorTest.addResult("Created database."); | 80 InspectorTest.addResult("Created database."); |
| 136 InspectorTest.dumpIndexedDBTree(); | 81 InspectorTest.dumpIndexedDBTree(); |
| 137 | 82 |
| 138 // Load indexedDb database view | 83 // Load indexedDb database view |
| 139 indexedDBModel.refreshDatabase(databaseId); // Initial database refresh. | 84 indexedDBModel.refreshDatabase(databaseId); // Initial database refresh. |
| 140 await new Promise(waitDatabaseLoaded); // Needed to initialize database
view, otherwise | 85 await new Promise(waitDatabaseLoaded); // Needed to initialize database
view, otherwise |
| 141 idbDatabaseTreeElement.onselect(false); // IDBDatabaseTreeElement.databa
se would be undefined. | 86 idbDatabaseTreeElement.onselect(false); // IDBDatabaseTreeElement.databa
se would be undefined. |
| 142 var databaseView = idbDatabaseTreeElement._view; | 87 var databaseView = idbDatabaseTreeElement._view; |
| 143 | 88 |
| 144 // Create first objectstore | 89 // Create first objectstore |
| 145 await InspectorTest.evaluateInPageAsync("createObjectStore('" + databaseName
+ "', '" + objectStoreName1 + "', '" + indexName + "', '" + keyPath + "')"); | 90 await InspectorTest.createObjectStoreAsync(databaseName, objectStoreName1, i
ndexName, keyPath); |
| 146 await new Promise(waitRefreshDatabase); | 91 await waitRefreshDatabase(); |
| 147 InspectorTest.addResult("Created first objectstore."); | 92 InspectorTest.addResult("Created first objectstore."); |
| 148 InspectorTest.dumpIndexedDBTree(); | 93 InspectorTest.dumpIndexedDBTree(); |
| 149 | 94 |
| 150 // Create second objectstore | 95 // Create second objectstore |
| 151 await InspectorTest.evaluateInPageAsync("createObjectStore('" + databaseName
+ "', '" + objectStoreName2 + "', '" + indexName + "', '" + keyPath + "')"); | 96 await InspectorTest.createObjectStoreAsync(databaseName, objectStoreName2, i
ndexName, keyPath); |
| 152 await new Promise(waitRefreshDatabase); | 97 await waitRefreshDatabase(); |
| 153 InspectorTest.addResult("Created second objectstore."); | 98 InspectorTest.addResult("Created second objectstore."); |
| 154 InspectorTest.dumpIndexedDBTree(); | 99 InspectorTest.dumpIndexedDBTree(); |
| 155 | 100 |
| 156 // Load objectstore data views | 101 // Load objectstore data views |
| 157 for (var i = 0; i < idbDatabaseTreeElement.childCount(); ++i) { | 102 for (var i = 0; i < idbDatabaseTreeElement.childCount(); ++i) { |
| 158 var objectStoreTreeElement = idbDatabaseTreeElement.childAt(i); | 103 var objectStoreTreeElement = idbDatabaseTreeElement.childAt(i); |
| 159 objectStoreTreeElement.onselect(false); | 104 objectStoreTreeElement.onselect(false); |
| 160 } | 105 } |
| 161 | 106 |
| 162 // Add entries | 107 // Add entries |
| 163 await InspectorTest.evaluateInPageAsync("addIDBValue('" + databaseName + "',
'" + objectStoreName1 + "', 'testKey', 'testValue')"); | 108 await InspectorTest.addIDBValueAsync(databaseName, objectStoreName1, "testKe
y", "testValue"); |
| 164 InspectorTest.addResult("Added " + objectStoreName1 + " entry."); | 109 InspectorTest.addResult("Added " + objectStoreName1 + " entry."); |
| 165 dumpObjectStores(); | 110 dumpObjectStores(); |
| 166 | 111 |
| 167 // Refresh database view | 112 // Refresh database view |
| 168 await new Promise(waitRefreshDatabase); | 113 await waitRefreshDatabase(); |
| 169 for (var i = 0; i < idbDatabaseTreeElement.childCount(); ++i) { | 114 await waitUpdateDataView(); // Wait for second objectstore data to load on
page. |
| 170 var objectStoreTreeElement = idbDatabaseTreeElement.childAt(i); | 115 InspectorTest.addResult("Refreshed database view."); |
| 171 if (objectStoreTreeElement._objectStore.name === objectStoreName1) { | 116 dumpObjectStores(); |
| 172 objectStoreTreeElement.onselect(false); | 117 |
| 173 break; | 118 // Add entries |
| 174 } | 119 await InspectorTest.addIDBValueAsync(databaseName, objectStoreName2, "testKe
y2", "testValue2"); |
| 175 } | 120 InspectorTest.addResult("Added " + objectStoreName2 + " entry."); |
| 176 await new Promise(waitUpdateDataView); // Wait for objectstore data to
load on page. | 121 dumpObjectStores(); |
| 177 InspectorTest.addResult("Refreshed database."); | 122 |
| 123 // Right-click refresh database view |
| 124 await waitRefreshDatabaseRightClick(); |
| 125 await waitUpdateDataView(); // Wait for second objectstore data to load on
page. |
| 126 InspectorTest.addResult("Right-click refreshed database."); |
| 178 dumpObjectStores(); | 127 dumpObjectStores(); |
| 179 | 128 |
| 180 InspectorTest.completeTest(); | 129 InspectorTest.completeTest(); |
| 181 } | 130 } |
| 182 </script> | 131 </script> |
| 183 </head> | 132 </head> |
| 184 <body onload="runTest()"> | 133 <body onload="runTest()"> |
| 185 <p>Tests refreshing the database information and data views.</p> | 134 <p>Tests refreshing the database information and data views.</p> |
| 186 </body> | 135 </body> |
| 187 </html> | 136 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2914293002:
[IndexedDB] [DevTools] Right-click 'Refresh' on database now updates object store view, also fixed … (Closed)
