Diff
Modified: trunk/LayoutTests/ChangeLog (134865 => 134866)
--- trunk/LayoutTests/ChangeLog 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/ChangeLog 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,3 +1,52 @@
+2012-11-15 David Grogan <dgro...@chromium.org>
+
+ IndexedDB: setVersion batch 8
+ https://bugs.webkit.org/show_bug.cgi?id=102434
+
+ Reviewed by Tony Chang.
+
+ 2 lines were added to intversion-bad-parameters to capture the tests
+ that were in the now-deleted setVersion-{null,undefined}.
+
+ * storage/indexeddb/intversion-bad-parameters-expected.txt:
+ * storage/indexeddb/key-generator-expected.txt:
+ * storage/indexeddb/open-during-transaction-expected.txt:
+ * storage/indexeddb/readonly-properties-expected.txt:
+ * storage/indexeddb/resources/intversion-bad-parameters.js:
+ (deleteSuccess):
+ * storage/indexeddb/resources/key-generator.js:
+ Again awkward to call indexedDBTest all over the place. The prefix
+ line's gotta go, and we could also pull a resetDatabase method out of
+ indexedDBTest that would just do a delete and open.
+
+ (runTests.nextTest.prepareDatabase):
+ (runTests.nextTest.onSuccess.finishTest):
+ (runTests.nextTest.onSuccess):
+ (runTests.nextTest):
+ (testAcrossConnections.prepareDatabase):
+ * storage/indexeddb/resources/open-during-transaction.js:
+ (prepareDatabase.event.target.transaction.oncomplete):
+ (prepareDatabase):
+ (tryOpens):
+ * storage/indexeddb/resources/readonly-properties.js:
+ (prepareDatabase):
+ * storage/indexeddb/resources/setVersion-null.js: Removed.
+ * storage/indexeddb/resources/setVersion-undefined.js: Removed.
+ * storage/indexeddb/resources/transaction-after-close.js:
+ (prepareDatabase):
+ (firstTransactionComplete):
+ (onFinalPutSuccess):
+ * storage/indexeddb/resources/versionchangerequest-activedomobject.js:
+ (testSetVersion):
+ (upgradeNeededCallback):
+ (successCallback):
+ * storage/indexeddb/setVersion-null-expected.txt: Removed.
+ * storage/indexeddb/setVersion-null.html: Removed.
+ * storage/indexeddb/setVersion-undefined-expected.txt: Removed.
+ * storage/indexeddb/setVersion-undefined.html: Removed.
+ * storage/indexeddb/transaction-after-close-expected.txt:
+ * storage/indexeddb/versionchangerequest-activedomobject-expected.txt:
+
2012-11-15 Alec Flett <alecfl...@chromium.org>
Add tests for explicit serialization values
Modified: trunk/LayoutTests/storage/indexeddb/intversion-bad-parameters-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/intversion-bad-parameters-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/intversion-bad-parameters-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -24,6 +24,12 @@
Expecting TypeError exception from indexedDB.open(dbname, 0x20000000000000)
PASS Exception was thrown.
PASS indexedDB.open(dbname, 0x20000000000000) threw TypeError: Type error
+Expecting TypeError exception from indexedDB.open(dbname, null)
+PASS Exception was thrown.
+PASS indexedDB.open(dbname, null) threw TypeError: Type error
+Expecting TypeError exception from indexedDB.open(dbname, undefined)
+PASS Exception was thrown.
+PASS indexedDB.open(dbname, undefined) threw TypeError: Type error
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/storage/indexeddb/key-generator-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/key-generator-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/key-generator-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,10 +1,3 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
Test IndexedDB's key generator behavior.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -14,11 +7,11 @@
Verify that each object store has an independent key generator.
-request = indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-request = db.setVersion('1')
-trans = request.result
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
store1 = db.createObjectStore('store1', { autoIncrement: true })
store1.put('a')
request = store.get(1)
@@ -36,11 +29,11 @@
db.close()
Verify that the key generator is not updated if insertion fails
-request = indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-request = db.setVersion('1')
-trans = request.result
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
store = db.createObjectStore('store1', { autoIncrement: true })
index = store.createIndex('index1', 'ix', { unique: true })
store.put({ ix: 'a'})
@@ -53,11 +46,11 @@
db.close()
Verify that the key generator is not affected by item removal (delete or clear).
-request = indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-request = db.setVersion('1')
-trans = request.result
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
store = db.createObjectStore('store1', { autoIncrement: true })
store.put('a')
request = store.get(1)
@@ -77,11 +70,11 @@
db.close()
Verify that the key generator is only set if and only if a numeric key greater than the last generated key is used.
-request = indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-request = db.setVersion('1')
-trans = request.result
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
store = db.createObjectStore('store1', { autoIncrement: true })
store.put('a')
request = store.get(1)
@@ -125,11 +118,11 @@
db.close()
Verify that aborting a transaction resets the key generator state.
-request = indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-request = db.setVersion('1')
-trans = request.result
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
trans1 = db.transaction(['store'], 'readwrite')
store_t1 = trans1.objectStore('store')
store_t1.put('a')
@@ -152,11 +145,11 @@
db.close()
Verify that keys above 2^53 result in errors.
-request = indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-request = db.setVersion('1')
-trans = request.result
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
trans1 = db.transaction(['store'], 'readwrite')
store_t1 = trans1.objectStore('store')
store_t1.put('a')
@@ -176,10 +169,11 @@
db.close()
Ensure key generator state is maintained across connections:
-indexedDB.deleteDatabase('key-generator')
-request = indexedDB.open('key-generator')
-db = request.result
-db.setVersion('1')
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "key-generator.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
db.createObjectStore('store', {autoIncrement: true})
trans = db.transaction('store', 'readwrite')
@@ -188,7 +182,7 @@
trans.objectStore('store').clear()
db.close()
-request = indexedDB.open('key-generator')
+request = indexedDB.open(dbname)
db = request.result
trans = db.transaction('store', 'readwrite')
request = trans.objectStore('store').put('value2')
Modified: trunk/LayoutTests/storage/indexeddb/open-during-transaction-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/open-during-transaction-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/open-during-transaction-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
Test IndexedDB opening database connections during transactions
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -6,11 +5,9 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-prepare database
-indexedDB.deleteDatabase('open-during-transaction1')
-openreq1 = indexedDB.open('open-during-transaction1')
-dbc1 = openreq1.result
-setverreq = dbc1.setVersion('1.0')
+dbname = "open-during-transaction.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
dbc1.createObjectStore('storeName')
database preparation complete
@@ -20,10 +17,10 @@
trans.objectStore('storeName').put('value', 'key')
trying to open the same database
-openreq2 = indexedDB.open('open-during-transaction1')
+openreq2 = indexedDB.open(dbname)
trying to open a different database
-openreq3 = indexedDB.open('open-during-transaction2')
+openreq3 = indexedDB.open(dbname + '2')
openreq2.onsuccess
PASS state is "starting"
Modified: trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/readonly-properties-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
Test IndexedDB readonly properties
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -6,11 +5,9 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-indexedDB.open(name)
-db = event.target.result
-request = db.setVersion('1')
-transaction = event.target.result;
-Deleted all object stores.
+dbname = "readonly-properties.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
objectStore = db.createObjectStore('foo');
trying to set readonly property objectStore.transaction
objectStore.transaction = this
Modified: trunk/LayoutTests/storage/indexeddb/resources/intversion-bad-parameters.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/intversion-bad-parameters.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/intversion-bad-parameters.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -22,6 +22,8 @@
evalAndExpectExceptionClass("indexedDB.open(dbname, -5)", "TypeError");
evalAndExpectExceptionClass("indexedDB.open(dbname, -1)", "TypeError");
evalAndExpectExceptionClass("indexedDB.open(dbname, 0x20000000000000)", "TypeError");
+ evalAndExpectExceptionClass("indexedDB.open(dbname, null)", "TypeError");
+ evalAndExpectExceptionClass("indexedDB.open(dbname, undefined)", "TypeError");
finishJSTest();
}
Modified: trunk/LayoutTests/storage/indexeddb/resources/key-generator.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/key-generator.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/key-generator.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -35,34 +35,27 @@
debug("");
debug(test.description);
- evalAndLog("request = indexedDB.deleteDatabase('key-generator')");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function () {
- evalAndLog("request = indexedDB.open('key-generator')");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function () {
- evalAndLog("db = request.result");
- evalAndLog("request = db.setVersion('1')");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function () {
- evalAndLog("trans = request.result");
- trans._onabort_ = unexpectedAbortCallback;
- test.verchange(db, trans);
- trans._oncomplete_ = function () {
+ indexedDBTest(prepareDatabase, onSuccess);
+ function prepareDatabase()
+ {
+ db = event.target.result;
+ trans = event.target.transaction;
+ trans._onabort_ = unexpectedAbortCallback;
+ test.verchange(db, trans);
+ }
+ function onSuccess() {
+ db = event.target.result;
- function finishTest() {
- evalAndLog("db.close()");
- nextTest();
- }
+ function finishTest() {
+ evalAndLog("db.close()");
+ nextTest();
+ }
- if (test.optional) {
- test.optional(db, finishTest);
- } else {
- finishTest();
- }
- };
- };
- };
+ if (test.optional) {
+ test.optional(db, finishTest);
+ } else {
+ finishTest();
+ }
};
}
@@ -233,22 +226,11 @@
{
debug("");
debug("Ensure key generator state is maintained across connections:");
- request = evalAndLog("indexedDB.deleteDatabase('key-generator')");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function () {
- evalAndLog("request = indexedDB.open('key-generator')");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function () {
- evalAndLog("db = request.result");
- request = evalAndLog("db.setVersion('1')");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function () {
- trans = request.result;
- trans._onabort_ = unexpectedAbortCallback;
- evalAndLog("db.createObjectStore('store', {autoIncrement: true})");
- trans._oncomplete_ = doFirstWrite;
- };
- };
+ indexedDBTest(prepareDatabase, doFirstWrite);
+ function prepareDatabase()
+ {
+ db = event.target.result;
+ evalAndLog("db.createObjectStore('store', {autoIncrement: true})");
};
function doFirstWrite() {
@@ -267,7 +249,7 @@
function closeAndReopen() {
evalAndLog("db.close()");
debug("");
- evalAndLog("request = indexedDB.open('key-generator')");
+ evalAndLog("request = indexedDB.open(dbname)");
request._onsuccess_ = function () {
evalAndLog("db = request.result");
doSecondWrite();
Modified: trunk/LayoutTests/storage/indexeddb/resources/open-during-transaction.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/open-during-transaction.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/open-during-transaction.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -5,33 +5,14 @@
description("Test IndexedDB opening database connections during transactions");
-function test()
-{
- removeVendorPrefixes();
- prepareDatabase();
-}
-
+indexedDBTest(prepareDatabase, startTransaction);
function prepareDatabase()
{
- debug("prepare database");
- deleteRequest = evalAndLog("indexedDB.deleteDatabase('open-during-transaction1')");
- deleteRequest._onerror_ = unexpectedErrorCallback;
- deleteRequest._onsuccess_ = function () {
- evalAndLog("openreq1 = indexedDB.open('open-during-transaction1')");
- openreq1._onerror_ = unexpectedErrorCallback;
- openreq1._onsuccess_ = function (e) {
- evalAndLog("dbc1 = openreq1.result");
- evalAndLog("setverreq = dbc1.setVersion('1.0')");
- setverreq._onerror_ = unexpectedErrorCallback;
- setverreq._onsuccess_ = function (e) {
- evalAndLog("dbc1.createObjectStore('storeName')");
- setverreq.result._oncomplete_ = function (e) {
- debug("database preparation complete");
- debug("");
- startTransaction();
- };
- };
- };
+ dbc1 = event.target.result;
+ evalAndLog("dbc1.createObjectStore('storeName')");
+ event.target.transaction._oncomplete_ = function (e) {
+ debug("database preparation complete");
+ debug("");
};
}
@@ -56,7 +37,7 @@
function tryOpens()
{
debug("trying to open the same database");
- evalAndLog("openreq2 = indexedDB.open('open-during-transaction1')");
+ evalAndLog("openreq2 = indexedDB.open(dbname)");
openreq2._onerror_ = unexpectedErrorCallback;
openreq2._onsuccess_ = function (e) {
debug("openreq2.onsuccess");
@@ -67,7 +48,7 @@
debug("");
debug("trying to open a different database");
- evalAndLog("openreq3 = indexedDB.open('open-during-transaction2')");
+ evalAndLog("openreq3 = indexedDB.open(dbname + '2')");
openreq3._onerror_ = unexpectedErrorCallback;
openreq3._onsuccess_ = function (e) {
debug("openreq3.onsuccess");
@@ -77,5 +58,3 @@
}
debug("");
}
-
-test();
Modified: trunk/LayoutTests/storage/indexeddb/resources/readonly-properties.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/readonly-properties.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/readonly-properties.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -18,31 +18,11 @@
}
}
-function test()
+indexedDBTest(prepareDatabase);
+function prepareDatabase()
{
- removeVendorPrefixes();
-
- name = "foo";
- request = evalAndLog("indexedDB.open(name)");
- request._onsuccess_ = openSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function openSuccess()
-{
- db = evalAndLog("db = event.target.result");
- request = evalAndLog("request = db.setVersion('1')");
- request._onsuccess_ = createAndPopulateObjectStore;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function createAndPopulateObjectStore()
-{
- transaction = evalAndLog("transaction = event.target.result;");
- deleteAllObjectStores(db);
+ db = event.target.result;
objectStore = evalAndLog("objectStore = db.createObjectStore('foo');");
setReadonlyProperty("objectStore.transaction", "this");
finishJSTest();
}
-
-test();
\ No newline at end of file
Deleted: trunk/LayoutTests/storage/indexeddb/resources/setVersion-null.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/setVersion-null.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/setVersion-null.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,34 +0,0 @@
-if (this.importScripts) {
- importScripts('../../../fast/js/resources/js-test-pre.js');
- importScripts('shared.js');
-}
-
-description("Test IndexedDB with null version string");
-
-function test()
-{
- removeVendorPrefixes();
-
- name = self.location.pathname;
- request = evalAndLog("indexedDB.open(name)");
- request._onsuccess_ = openSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function openSuccess()
-{
- db = evalAndLog("db = event.target.result");
-
- request = evalAndLog("db.setVersion(null);");
- request._onsuccess_ = postSetVersion;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function postSetVersion()
-{
- shouldBeEqualToString("db.version", "null");
- finishJSTest();
-}
-
-
-test();
Deleted: trunk/LayoutTests/storage/indexeddb/resources/setVersion-undefined.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/setVersion-undefined.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/setVersion-undefined.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,27 +0,0 @@
-if (this.importScripts) {
- importScripts('../../../fast/js/resources/js-test-pre.js');
- importScripts('shared.js');
-}
-
-description("Test IndexedDB version string is required");
-
-function test()
-{
- removeVendorPrefixes();
-
- name = self.location.pathname;
- request = evalAndLog("indexedDB.open(name)");
- request._onsuccess_ = openSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function openSuccess()
-{
- db = evalAndLog("db = event.target.result");
-
- shouldThrow("db.setVersion();");
- finishJSTest();
-}
-
-
-test();
Modified: trunk/LayoutTests/storage/indexeddb/resources/transaction-after-close.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/transaction-after-close.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/transaction-after-close.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -5,30 +5,10 @@
description("Test closing a database connection in IndexedDB.");
-function test()
+indexedDBTest(prepareDatabase, runFirstRegularTransaction);
+function prepareDatabase()
{
- removeVendorPrefixes();
-
- request = evalAndLog("indexedDB.open('transaction-after-close')");
- request._onsuccess_ = openSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function openSuccess()
-{
- debug("openSuccess():");
- self.db = evalAndLog("db = event.target.result");
- request = evalAndLog("request = db.setVersion('version 1')");
- request._onsuccess_ = inSetVersion;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function inSetVersion()
-{
- deleteAllObjectStores(db);
-
- event.target.result._oncomplete_ = runFirstRegularTransaction;
- event.target.result._onabort_ = unexpectedAbortCallback;
+ db = event.target.result;
store = evalAndLog("store = db.createObjectStore('store')");
request = evalAndLog("request = store.put('x', 'y')");
request._onsuccess_ = onPutSuccess;
@@ -58,7 +38,7 @@
debug("")
debug("verify that we can reopen the db after calling close")
- request = evalAndLog("indexedDB.open('transaction-after-close')");
+ request = evalAndLog("indexedDB.open(dbname)");
request._onsuccess_ = onSecondOpen
request._onerror_ = unexpectedErrorCallback;
}
@@ -77,5 +57,3 @@
function onFinalPutSuccess() {
testPassed("final put success");
}
-
-test();
Modified: trunk/LayoutTests/storage/indexeddb/resources/versionchangerequest-activedomobject.js (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/resources/versionchangerequest-activedomobject.js 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/resources/versionchangerequest-activedomobject.js 2012-11-16 01:14:12 UTC (rev 134866)
@@ -40,28 +40,28 @@
debug("");
debug("testSetVersion():");
- // NOTE: This is just an IDBRequest, it can be global.
- evalAndLog("openRequest = indexedDB.open(self.dbname)");
+ // NOTE: openRequest is local variable so it is not captured in global
+ // scope.
+ var openRequest = evalAndLog("indexedDB.open(self.dbname)");
openRequest._onerror_ = unexpectedErrorCallback;
- openRequest._onsuccess_ = function () {
- evalAndLog("db = openRequest.result");
+ openRequest._onblocked_ = unexpectedBlockedCallback;
+ openRequest._onupgradeneeded_ = upgradeNeededCallback;
+ openRequest._onsuccess_ = successCallback;
+ openRequest = null;
+ if (self.gc) {
+ evalAndLog("self.gc()");
+ }
+}
- // NOTE: versionRequest is local variable so it is not captured in global scope.
- var versionRequest = evalAndLog("db.setVersion('1')");
- versionRequest._onerror_ = unexpectedErrorCallback;
- versionRequest._onblocked_ = unexpectedBlockedCallback;
- versionRequest._onsuccess_ = function() { versionSuccess(); };
- versionRequest = null;
- if (self.gc) {
- evalAndLog("self.gc()");
- }
- };
+function upgradeNeededCallback()
+{
+ testPassed("IDBOpenDBRequest received upgradeneeded event");
}
-function versionSuccess()
+function successCallback()
{
- testPassed("setVersion's IDBVersionChangeRequest.onsuccess event fired");
+ testPassed("IDBOpenDBRequest received success event");
finishJSTest();
}
-test();
\ No newline at end of file
+test();
Deleted: trunk/LayoutTests/storage/indexeddb/setVersion-null-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/setVersion-null-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/setVersion-null-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,16 +0,0 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
-Test IndexedDB with null version string
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-
-indexedDB.open(name)
-db = event.target.result
-db.setVersion(null);
-PASS db.version is "null"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/storage/indexeddb/setVersion-null.html (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/setVersion-null.html 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/setVersion-null.html 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,10 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/storage/indexeddb/setVersion-undefined-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/setVersion-undefined-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/setVersion-undefined-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,14 +0,0 @@
-Test IndexedDB version string is required
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-
-indexedDB.open(name)
-db = event.target.result
-PASS db.setVersion(); threw exception TypeError: Not enough arguments.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/storage/indexeddb/setVersion-undefined.html (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/setVersion-undefined.html 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/setVersion-undefined.html 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,10 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-</body>
-</html>
Modified: trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
Test closing a database connection in IndexedDB.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -6,11 +5,9 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-indexedDB.open('transaction-after-close')
-openSuccess():
-db = event.target.result
-request = db.setVersion('version 1')
-Deleted all object stores.
+dbname = "transaction-after-close.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
store = db.createObjectStore('store')
request = store.put('x', 'y')
PASS Put success
@@ -24,7 +21,7 @@
PASS ename is 'InvalidStateError'
verify that we can reopen the db after calling close
-indexedDB.open('transaction-after-close')
+indexedDB.open(dbname)
second_db = event.target.result
currentTransaction = second_db.transaction(['store'], 'readwrite')
request = store.put('1', '2')
Modified: trunk/LayoutTests/storage/indexeddb/versionchangerequest-activedomobject-expected.txt (134865 => 134866)
--- trunk/LayoutTests/storage/indexeddb/versionchangerequest-activedomobject-expected.txt 2012-11-16 01:07:26 UTC (rev 134865)
+++ trunk/LayoutTests/storage/indexeddb/versionchangerequest-activedomobject-expected.txt 2012-11-16 01:14:12 UTC (rev 134866)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
Ensure that IDBVersionChangeRequest objects are not GC'd if they have pending events
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -15,11 +14,10 @@
PASS deleteDatabase's IDBVersionChangeRequest.onsuccess event fired
testSetVersion():
-openRequest = indexedDB.open(self.dbname)
-db = openRequest.result
-db.setVersion('1')
+indexedDB.open(self.dbname)
self.gc()
-PASS setVersion's IDBVersionChangeRequest.onsuccess event fired
+PASS IDBOpenDBRequest received upgradeneeded event
+PASS IDBOpenDBRequest received success event
PASS successfullyParsed is true
TEST COMPLETE
