Chromium Code Reviews Chromium Code Reviews
Issue 2914293002:
[IndexedDB] [DevTools] Right-click 'Refresh' on database now updates object store view, also fixed … (Closed)
| 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) { | 9 function onIndexedDBError(e) { |
| 10 console.error("IndexedDB error: " + e); | 10 console.error("IndexedDB error: " + e); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 | 80 |
| 81 var indexedDBModel = InspectorTest.mainTarget.model(Resources.IndexedDBModel ); | 81 var indexedDBModel = InspectorTest.mainTarget.model(Resources.IndexedDBModel ); |
| 82 var databaseId; | 82 var databaseId; |
| 83 | 83 |
| 84 function waitRefreshDatabase(callback) { | 84 function waitRefreshDatabase(callback) { |
| 85 var view = UI.panels.resources._sidebar.indexedDBListTreeElement._idbDat abaseTreeElements[0]._view; | 85 var view = UI.panels.resources._sidebar.indexedDBListTreeElement._idbDat abaseTreeElements[0]._view; |
| 86 InspectorTest.addSniffer(Resources.IDBDatabaseView.prototype, "_updatedF orTests", callback, false); | 86 InspectorTest.addSniffer(Resources.IDBDatabaseView.prototype, "_updatedF orTests", callback, false); |
| 87 view._refreshDatabaseButtonClicked(); | 87 view._refreshDatabaseButtonClicked(); |
| 88 } | 88 } |
| 89 | 89 |
| 90 function waitRefreshDatabaseRightClick(callback) { | |
| 91 InspectorTest.addSniffer(Resources.IDBDataView.prototype, "_updatedDataF orTests", callback, false); | |
| 92 idbDatabaseTreeElement._refreshIndexedDB(); | |
| 93 } | |
| 94 | |
| 90 function waitUpdateDataView(callback) { | 95 function waitUpdateDataView(callback) { |
| 91 InspectorTest.addSniffer(Resources.IDBDataView.prototype, "_updatedDataF orTests", callback, false); | 96 InspectorTest.addSniffer(Resources.IDBDataView.prototype, "_updatedDataF orTests", callback, false); |
| 92 } | 97 } |
| 93 | 98 |
| 94 function waitDatabaseLoaded(callback) { | 99 function waitDatabaseLoaded(callback) { |
| 95 var event = indexedDBModel.addEventListener(Resources.IndexedDBModel.Eve nts.DatabaseLoaded, () => { | 100 var event = indexedDBModel.addEventListener(Resources.IndexedDBModel.Eve nts.DatabaseLoaded, () => { |
| 96 Common.EventTarget.removeEventListeners([event]); | 101 Common.EventTarget.removeEventListeners([event]); |
| 97 callback(); | 102 callback(); |
| 98 }); | 103 }); |
| 99 } | 104 } |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 167 // Refresh database view | 172 // Refresh database view |
| 168 await new Promise(waitRefreshDatabase); | 173 await new Promise(waitRefreshDatabase); |
| 169 for (var i = 0; i < idbDatabaseTreeElement.childCount(); ++i) { | 174 for (var i = 0; i < idbDatabaseTreeElement.childCount(); ++i) { |
| 170 var objectStoreTreeElement = idbDatabaseTreeElement.childAt(i); | 175 var objectStoreTreeElement = idbDatabaseTreeElement.childAt(i); |
| 171 if (objectStoreTreeElement._objectStore.name === objectStoreName1) { | 176 if (objectStoreTreeElement._objectStore.name === objectStoreName1) { |
| 172 objectStoreTreeElement.onselect(false); | 177 objectStoreTreeElement.onselect(false); |
| 173 break; | 178 break; |
| 174 } | 179 } |
| 175 } | 180 } |
| 176 await new Promise(waitUpdateDataView); // Wait for objectstore data to load on page. | 181 await new Promise(waitUpdateDataView); // Wait for objectstore data to load on page. |
| 177 InspectorTest.addResult("Refreshed database."); | 182 InspectorTest.addResult("Refreshed database view."); |
| 183 dumpObjectStores(); | |
| 184 | |
| 185 // Add entries | |
| 186 await InspectorTest.evaluateInPageAsync("addIDBValue('" + databaseName + "', '" + objectStoreName2 + "', 'testKey2', 'testValue2')"); | |
|
dmurph
2017/06/01 22:50:31
Can you use this:
https://cs.chromium.org/chromium
kristipark
2017/06/02 00:16:56
Since those function uses callbacks, I made the ab
| |
| 187 InspectorTest.addResult("Added " + objectStoreName2 + " entry."); | |
| 188 dumpObjectStores(); | |
| 189 | |
| 190 // Right-click refresh database view | |
| 191 await new Promise(waitRefreshDatabaseRightClick); | |
| 192 for (var i = 0; i < idbDatabaseTreeElement.childCount(); ++i) { | |
| 193 var objectStoreTreeElement = idbDatabaseTreeElement.childAt(i); | |
| 194 if (objectStoreTreeElement._objectStore.name === objectStoreName2) { | |
| 195 objectStoreTreeElement.onselect(false); | |
|
dmurph
2017/06/01 22:50:31
Can you comment what this does? This selects the t
kristipark
2017/06/02 00:16:56
Ah, you're right, it doesn't do anything. Removed!
| |
| 196 break; | |
| 197 } | |
| 198 } | |
| 199 await new Promise(waitUpdateDataView); // Wait for objectstore data to load on page. | |
| 200 InspectorTest.addResult("Right-click refreshed database."); | |
| 178 dumpObjectStores(); | 201 dumpObjectStores(); |
| 179 | 202 |
| 180 InspectorTest.completeTest(); | 203 InspectorTest.completeTest(); |
| 181 } | 204 } |
| 182 </script> | 205 </script> |
| 183 </head> | 206 </head> |
| 184 <body onload="runTest()"> | 207 <body onload="runTest()"> |
| 185 <p>Tests refreshing the database information and data views.</p> | 208 <p>Tests refreshing the database information and data views.</p> |
| 186 </body> | 209 </body> |
| 187 </html> | 210 </html> |
| OLD | NEW |
