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/create-and-remove-object-store.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/create-and-remove-object-store.html')
-rw-r--r-- | LayoutTests/storage/indexeddb/create-and-remove-object-store.html | 60 |
1 files changed, 16 insertions, 44 deletions
diff --git a/LayoutTests/storage/indexeddb/create-and-remove-object-store.html b/LayoutTests/storage/indexeddb/create-and-remove-object-store.html index 7bde468..43c1fe1 100644 --- a/LayoutTests/storage/indexeddb/create-and-remove-object-store.html +++ b/LayoutTests/storage/indexeddb/create-and-remove-object-store.html @@ -16,74 +16,46 @@ if (window.layoutTestController) function test() { - shouldBeTrue("'webkitIndexedDB' in window"); - shouldBeFalse("webkitIndexedDB == null"); - - result = evalAndLog("webkitIndexedDB.open('name')"); - verifyResult(result); - result.onsuccess = openSuccess; - result.onerror = unexpectedErrorCallback; + request = evalAndLog("webkitIndexedDB.open('create-and-remove-object-store')"); + request.onsuccess = openSuccess; + request.onerror = unexpectedErrorCallback; } function openSuccess() { debug("openSuccess():"); - verifySuccessEvent(event); - window.db = evalAndLog("db = event.result"); + window.db = evalAndLog("db = event.target.result"); testCreateAndRemove(); - result = evalAndLog("result = db.setVersion('version 1')"); - result.onsuccess = cleanDatabase; - result.onerror = unexpectedErrorCallback; + request = evalAndLog("result = db.setVersion('version 1')"); + request.onsuccess = cleanDatabase; + request.onerror = unexpectedErrorCallback; testCreateAndRemove(); } function testCreateAndRemove() { debug("Trying create"); - try { - db.createObjectStore("some os"); - testFailed("No exception thrown!"); - } catch (e) { - code = e.code; - shouldBe("code", "webkitIDBDatabaseException.NOT_ALLOWED_ERR"); - } + evalAndExpectException('db.createObjectStore("some os")', "webkitIDBDatabaseException.NOT_ALLOWED_ERR"); debug("Trying remove"); - try { - db.createObjectStore("some os"); - testFailed("No exception thrown!"); - } catch (e) { - code = e.code; - shouldBe("code", "webkitIDBDatabaseException.NOT_ALLOWED_ERR"); - } + evalAndExpectException('db.createObjectStore("some os")', "webkitIDBDatabaseException.NOT_ALLOWED_ERR"); } function cleanDatabase() { - verifySuccessEvent(event); - deleteAllObjectStores(db, cleaned); -} + deleteAllObjectStores(db); -function cleaned() -{ os = evalAndLog("db.createObjectStore('tmp')"); - debug("Adding 'tmp' again"); - try { - db.createObjectStore('tmp'); - testFailed("No exception thrown!"); - } catch (e) { - code = e.code; - shouldBe("code", "webkitIDBDatabaseException.CONSTRAINT_ERR"); - } + evalAndExpectException("db.createObjectStore('tmp')", "webkitIDBDatabaseException.CONSTRAINT_ERR"); + trans = evalAndLog("trans = db.transaction({mode: webkitIDBTransaction.READ_WRITE})"); - req = evalAndLog("trans.objectStore('tmp').get(0)"); - req.onsuccess = tryOnceMore; - req.onerror = unexpectedErrorCallback; + request = evalAndLog("trans.objectStore('tmp').get(0)"); + request.onsuccess = tryOnceMore; + request.onerror = unexpectedErrorCallback; } function tryOnceMore() { - verifySuccessEvent(event); - shouldBe("event.result", "undefined"); + shouldBeUndefined("event.target.result"); testCreateAndRemove(); |