diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /LayoutTests/storage/indexeddb/database-quota.html | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'LayoutTests/storage/indexeddb/database-quota.html')
-rw-r--r-- | LayoutTests/storage/indexeddb/database-quota.html | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/LayoutTests/storage/indexeddb/database-quota.html b/LayoutTests/storage/indexeddb/database-quota.html index b447505..038e8d8 100644 --- a/LayoutTests/storage/indexeddb/database-quota.html +++ b/LayoutTests/storage/indexeddb/database-quota.html @@ -16,39 +16,31 @@ if (window.layoutTestController) function test() { - result = evalAndLog("webkitIndexedDB.open('name')"); - verifyResult(result); - result.onsuccess = openSuccess; - result.onerror = unexpectedErrorCallback; + request = evalAndLog("webkitIndexedDB.open('database-quota')"); + request.onsuccess = openSuccess; + request.onerror = unexpectedErrorCallback; } function openSuccess() { - verifySuccessEvent(event); - window.db = evalAndLog("db = event.result"); + window.db = evalAndLog("db = event.target.result"); - result = evalAndLog("db.setVersion('new version')"); - verifyResult(result); - result.onsuccess = setVersionSuccess; - result.onerror = unexpectedErrorCallback; + request = evalAndLog("db.setVersion('new version')"); + request.onsuccess = setVersionSuccess; + request.onerror = unexpectedErrorCallback; } function setVersionSuccess() { debug("setVersionSuccess():"); - verifySuccessEvent(event); - window.trans = evalAndLog("trans = event.result"); + window.trans = evalAndLog("trans = event.target.result"); shouldBeTrue("trans !== null"); trans.onabort = unexpectedAbortCallback; - deleteAllObjectStores(db, createNewObjectStore); -} + deleteAllObjectStores(db); -function createNewObjectStore() -{ - verifySuccessEvent(event); shouldBeEqualToString("db.version", "new version"); - shouldBeEqualToString("db.name", "name"); + shouldBeEqualToString("db.name", "database-quota"); shouldBe("db.objectStoreNames", "[]"); shouldBe("db.objectStoreNames.length", "0"); shouldBe("db.objectStoreNames.contains('')", "false"); @@ -91,22 +83,21 @@ function addData() { if (dataAdded < 5 * 1024 * 1024) { if (dataAdded > 0) - store = event.source; + store = event.target.source; } else { testFailed("added more than quota"); done(); return; } dataAdded += 65536; - result = store.add({x: data}, dataAdded); - result.onsuccess = addData; - result.onerror = logError; + request = store.add({x: data}, dataAdded); + request.onsuccess = addData; + request.onerror = logError; } function logError() { debug("Error function called: (" + event.code + ") " + event.message); - verifyErrorEvent(event); evalAndLog("event.preventDefault()"); } |