| OLD | NEW |
| 1 if (this.importScripts) { | 1 if (this.importScripts) { |
| 2 importScripts('../../../resources/js-test.js'); | 2 importScripts('../../../resources/js-test.js'); |
| 3 importScripts('shared.js'); | 3 importScripts('shared.js'); |
| 4 } | 4 } |
| 5 | 5 |
| 6 description("Test IndexedDB odd value datatypes"); | 6 description("Test IndexedDB odd value datatypes"); |
| 7 | 7 |
| 8 function test() | 8 function test() |
| 9 { | 9 { |
| 10 testData = [{ description: 'empty string', name: '' }, | 10 testData = [{ description: 'empty string', name: '' }, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 if (++numDeleted == testData.length) | 27 if (++numDeleted == testData.length) |
| 28 openNextDatabase(); | 28 openNextDatabase(); |
| 29 }; | 29 }; |
| 30 } | 30 } |
| 31 } | 31 } |
| 32 | 32 |
| 33 function openNextDatabase() | 33 function openNextDatabase() |
| 34 { | 34 { |
| 35 debug("opening a database named " + testData[nextToOpen].description); | 35 debug("opening a database named " + testData[nextToOpen].description); |
| 36 request = evalAndLog("indexedDB.open(testData[nextToOpen].name, 1)"); | 36 request = evalAndLog("indexedDB.open(testData[nextToOpen].name, 1)"); |
| 37 request.onsuccess = unexpectedSuccessCallback; | |
| 38 request.onblocked = unexpectedBlockedCallback; | 37 request.onblocked = unexpectedBlockedCallback; |
| 39 request.onupgradeneeded = addAKey; | 38 request.onupgradeneeded = addAKey; |
| 39 request.onsuccess = closeDatabase; |
| 40 } | 40 } |
| 41 | 41 |
| 42 function addAKey() | 42 function addAKey() |
| 43 { | 43 { |
| 44 db = event.target.result; | 44 db = event.target.result; |
| 45 evalAndLog("objectStore = db.createObjectStore(testData[nextToOpen].name);")
; | 45 evalAndLog("objectStore = db.createObjectStore(testData[nextToOpen].name);")
; |
| 46 evalAndLog("index = objectStore.createIndex(testData[nextToOpen].name, 'keyP
ath');"); | 46 evalAndLog("index = objectStore.createIndex(testData[nextToOpen].name, 'keyP
ath');"); |
| 47 evalAndLog("key = testData[nextToOpen].name"); | 47 evalAndLog("key = testData[nextToOpen].name"); |
| 48 evalAndLog("request = objectStore.add(key, key);"); | 48 evalAndLog("request = objectStore.add(key, key);"); |
| 49 request.onsuccess = closeDatabase; | |
| 50 request.onerror = unexpectedErrorCallback; | 49 request.onerror = unexpectedErrorCallback; |
| 51 } | 50 } |
| 52 | 51 |
| 53 function closeDatabase() | 52 function closeDatabase() |
| 54 { | 53 { |
| 55 evalAndLog("db.close()"); | 54 evalAndLog("db.close()"); |
| 56 debug(""); | 55 debug(""); |
| 57 if (++nextToOpen < testData.length) { | 56 if (++nextToOpen < testData.length) { |
| 58 openNextDatabase(); | 57 openNextDatabase(); |
| 59 } else { | 58 } else { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 88 shouldBe("cursor.value", "testData[nextToOpen].name"); | 87 shouldBe("cursor.value", "testData[nextToOpen].name"); |
| 89 if (++nextToOpen < testData.length) { | 88 if (++nextToOpen < testData.length) { |
| 90 debug(""); | 89 debug(""); |
| 91 verifyNextDatabase(); | 90 verifyNextDatabase(); |
| 92 } else { | 91 } else { |
| 93 finishJSTest(); | 92 finishJSTest(); |
| 94 } | 93 } |
| 95 } | 94 } |
| 96 | 95 |
| 97 test(); | 96 test(); |
| OLD | NEW |