Diff
Modified: trunk/LayoutTests/ChangeLog (120975 => 120976)
--- trunk/LayoutTests/ChangeLog 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/ChangeLog 2012-06-21 23:28:43 UTC (rev 120976)
@@ -1,3 +1,40 @@
+2012-06-21 Joshua Bell <[email protected]>
+
+ IndexedDB: Fix layout tests to clear previous database structures
+ https://bugs.webkit.org/show_bug.cgi?id=89609
+
+ Reviewed by Tony Chang.
+
+ A handful of tests weren't deleting previously created stores (or the whole
+ database), which made them fail if trivially re-run in Chromium or under
+ NRWT with --iterations=2.
+
+ * storage/indexeddb/cursor-key-order-expected.txt:
+ * storage/indexeddb/cursor-primary-key-order-expected.txt:
+ * storage/indexeddb/open-during-transaction-expected.txt:
+ * storage/indexeddb/resources/cursor-key-order.js:
+ (prepareDatabase.deleteRequest.onsuccess.openreq.onsuccess.verreq.onsuccess):
+ (prepareDatabase.deleteRequest.onsuccess.openreq.onsuccess):
+ (prepareDatabase.deleteRequest.onsuccess):
+ (prepareDatabase):
+ * storage/indexeddb/resources/cursor-primary-key-order.js:
+ (prepareDatabase.deleteRequest.onsuccess.openRequest.onsuccess.versionChangeRequest.onsuccess):
+ (prepareDatabase.deleteRequest.onsuccess.openRequest.onsuccess):
+ (prepareDatabase.deleteRequest.onsuccess):
+ (prepareDatabase):
+ * storage/indexeddb/resources/factory-deletedatabase-interactions.js:
+ * storage/indexeddb/resources/open-close-version.js:
+ (test6):
+ (test6.halfDone):
+ * storage/indexeddb/resources/open-during-transaction.js:
+ (prepareDatabase.deleteRequest.onsuccess.openreq1.onsuccess.setverreq.onsuccess.setverreq.result.oncomplete):
+ (prepareDatabase.deleteRequest.onsuccess.openreq1.onsuccess.setverreq.onsuccess):
+ (prepareDatabase.deleteRequest.onsuccess.openreq1.onsuccess):
+ (prepareDatabase.deleteRequest.onsuccess):
+ (prepareDatabase):
+ * storage/indexeddb/transaction-abort-with-js-recursion-cross-frame-expected.txt:
+ * storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html:
+
2012-06-21 Kenneth Russell <[email protected]>
[Chromium] Rebaseline video tests after r120939
Modified: trunk/LayoutTests/storage/indexeddb/cursor-key-order-expected.txt (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/cursor-key-order-expected.txt 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/cursor-key-order-expected.txt 2012-06-21 23:28:43 UTC (rev 120976)
@@ -6,6 +6,7 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+indexedDB.deleteDatabase('cursor-key-order')
openreq = indexedDB.open('cursor-key-order')
db = openreq.result
verreq = db.setVersion('1')
Modified: trunk/LayoutTests/storage/indexeddb/cursor-primary-key-order-expected.txt (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/cursor-primary-key-order-expected.txt 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/cursor-primary-key-order-expected.txt 2012-06-21 23:28:43 UTC (rev 120976)
@@ -6,6 +6,7 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+indexedDB.deleteDatabase('cursor-primary-key-order')
openRequest = indexedDB.open('cursor-primary-key-order')
db = openRequest.result
versionChangeRequest = db.setVersion('1')
Modified: trunk/LayoutTests/storage/indexeddb/open-during-transaction-expected.txt (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/open-during-transaction-expected.txt 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/open-during-transaction-expected.txt 2012-06-21 23:28:43 UTC (rev 120976)
@@ -6,7 +6,8 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
prepare database
-openreq1 = indexedDB.open('db1')
+indexedDB.deleteDatabase('open-during-transaction1')
+openreq1 = indexedDB.open('open-during-transaction1')
dbc1 = openreq1.result
setverreq = dbc1.setVersion('1.0')
dbc1.createObjectStore('storeName')
@@ -21,7 +22,7 @@
openreq2 = indexedDB.open('db1')
trying to open a different database
-openreq3 = indexedDB.open('db2')
+openreq3 = indexedDB.open('open-during-transaction2')
openreq2.onsuccess
PASS state is "starting"
Modified: trunk/LayoutTests/storage/indexeddb/resources/cursor-key-order.js (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/resources/cursor-key-order.js 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/resources/cursor-key-order.js 2012-06-21 23:28:43 UTC (rev 120976)
@@ -15,15 +15,19 @@
function prepareDatabase()
{
debug("");
- evalAndLog("openreq = indexedDB.open('cursor-key-order')");
- openreq._onerror_ = unexpectedErrorCallback;
- openreq._onsuccess_ = function() {
- evalAndLog("db = openreq.result");
- evalAndLog("verreq = db.setVersion('1')");
- verreq._onerror_ = unexpectedErrorCallback;
- verreq._onsuccess_ = function() {
- evalAndLog("db.createObjectStore('store')");
- verreq.result._oncomplete_ = populateStore;
+ deleteRequest = evalAndLog("indexedDB.deleteDatabase('cursor-key-order')");
+ deleteRequest._onerror_ = unexpectedErrorCallback;
+ deleteRequest._onsuccess_ = function () {
+ evalAndLog("openreq = indexedDB.open('cursor-key-order')");
+ openreq._onerror_ = unexpectedErrorCallback;
+ openreq._onsuccess_ = function() {
+ evalAndLog("db = openreq.result");
+ evalAndLog("verreq = db.setVersion('1')");
+ verreq._onerror_ = unexpectedErrorCallback;
+ verreq._onsuccess_ = function() {
+ evalAndLog("db.createObjectStore('store')");
+ verreq.result._oncomplete_ = populateStore;
+ };
};
};
}
Modified: trunk/LayoutTests/storage/indexeddb/resources/cursor-primary-key-order.js (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/resources/cursor-primary-key-order.js 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/resources/cursor-primary-key-order.js 2012-06-21 23:28:43 UTC (rev 120976)
@@ -15,17 +15,20 @@
function prepareDatabase()
{
debug("");
- evalAndLog("openRequest = indexedDB.open('cursor-primary-key-order')");
- openRequest._onerror_ = unexpectedErrorCallback;
- openRequest._onsuccess_ = function() {
- evalAndLog("db = openRequest.result");
- evalAndLog("versionChangeRequest = db.setVersion('1')");
- versionChangeRequest._onerror_ = unexpectedErrorCallback;
- versionChangeRequest._onsuccess_ = function() {
- evalAndLog("store = db.createObjectStore('store')");
- evalAndLog("index = store.createIndex('index', 'indexKey')");
-
- versionChangeRequest.result._oncomplete_ = populateStore;
+ deleteRequest = evalAndLog("indexedDB.deleteDatabase('cursor-primary-key-order')");
+ deleteRequest._onerror_ = unexpectedErrorCallback;
+ deleteRequest._onsuccess_ = function () {
+ evalAndLog("openRequest = indexedDB.open('cursor-primary-key-order')");
+ openRequest._onerror_ = unexpectedErrorCallback;
+ openRequest._onsuccess_ = function() {
+ evalAndLog("db = openRequest.result");
+ evalAndLog("versionChangeRequest = db.setVersion('1')");
+ versionChangeRequest._onerror_ = unexpectedErrorCallback;
+ versionChangeRequest._onsuccess_ = function() {
+ evalAndLog("store = db.createObjectStore('store')");
+ evalAndLog("index = store.createIndex('index', 'indexKey')");
+ versionChangeRequest.result._oncomplete_ = populateStore;
+ };
};
};
}
Modified: trunk/LayoutTests/storage/indexeddb/resources/factory-deletedatabase-interactions.js (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/resources/factory-deletedatabase-interactions.js 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/resources/factory-deletedatabase-interactions.js 2012-06-21 23:28:43 UTC (rev 120976)
@@ -5,12 +5,13 @@
description("Test the deleteDatabase call and its interaction with open/setVersion");
+var dbprefix = 'factory-deletedatabase-interactions-';
function Connection(id) {
id = String(id);
var that = this;
this.open = function(opts) {
self.steps.push(evalAndLog("'" + id + ".open'"));
- var req = indexedDB.open(self.dbname);
+ var req = indexedDB.open(dbprefix + self.dbname);
req._onerror_ = unexpectedErrorCallback;
req._onsuccess_ = function (e) {
that.handle = e.target.result;
@@ -70,7 +71,7 @@
function deleteDatabase(id, name, opts) {
self.steps.push(evalAndLog("'deleteDatabase(" + id + ")'"));
- var req = indexedDB.deleteDatabase(name);
+ var req = indexedDB.deleteDatabase(dbprefix + name);
req._onsuccess_ = function (e) {
self.steps.push(evalAndLog("'deleteDatabase(" + id + ").onsuccess'"));
if (opts && opts.onsuccess) { opts.onsuccess.call(null); }
Modified: trunk/LayoutTests/storage/indexeddb/resources/open-close-version.js (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/resources/open-close-version.js 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/resources/open-close-version.js 2012-06-21 23:28:43 UTC (rev 120976)
@@ -10,7 +10,7 @@
var that = this;
this.open = function(opts) {
self.steps.push(evalAndLog("'" + id + ".open'"));
- var req = indexedDB.open(self.dbname);
+ var req = indexedDB.open('open-close-version-' + self.dbname);
req._onerror_ = unexpectedErrorCallback;
req._onsuccess_ = function (e) {
that.handle = e.target.result;
@@ -250,8 +250,8 @@
evalAndLog("self.dbname = 'test6'; self.ver = 1; self.steps = []");
var h1 = new Connection("h1");
- runSteps([function(doNext) { h1.open({onsuccess: doNext}); },
- function(doNext) { h1.setVersion({onsuccess: halfDone});
+ runSteps([function(doNext) { h1.open({onsuccess: doNext}); },
+ function(doNext) { h1.setVersion({onsuccess: halfDone});
h1.setVersion({onsuccess: halfDone}); }
]);
@@ -263,7 +263,7 @@
} else {
finishTest();
}
- }
+ }
function finishTest() {
shouldBeEqualToString("self.steps.toString()",
Modified: trunk/LayoutTests/storage/indexeddb/resources/open-during-transaction.js (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/resources/open-during-transaction.js 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/resources/open-during-transaction.js 2012-06-21 23:28:43 UTC (rev 120976)
@@ -14,18 +14,22 @@
function prepareDatabase()
{
debug("prepare database");
- evalAndLog("openreq1 = indexedDB.open('db1')");
- 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();
+ 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();
+ };
};
};
};
@@ -63,7 +67,7 @@
debug("");
debug("trying to open a different database");
- evalAndLog("openreq3 = indexedDB.open('db2')");
+ evalAndLog("openreq3 = indexedDB.open('open-during-transaction2')");
openreq3._onerror_ = unexpectedErrorCallback;
openreq3._onsuccess_ = function (e) {
debug("openreq3.onsuccess");
Modified: trunk/LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame-expected.txt (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame-expected.txt 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame-expected.txt 2012-06-21 23:28:43 UTC (rev 120976)
@@ -5,6 +5,7 @@
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+indexedDB.deleteDatabase('transaction-abort-with-js-recursion-cross-frame')
indexedDB.open('transaction-abort-with-js-recursion-cross-frame')
db = event.target.result
db.setVersion('new version')
Modified: trunk/LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html (120975 => 120976)
--- trunk/LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html 2012-06-21 22:56:56 UTC (rev 120975)
+++ trunk/LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html 2012-06-21 23:28:43 UTC (rev 120976)
@@ -19,9 +19,13 @@
function setup() {
removeVendorPrefixes();
- request = evalAndLog("indexedDB.open('transaction-abort-with-js-recursion-cross-frame')");
- request._onsuccess_ = setVersion;
+ request = evalAndLog("indexedDB.deleteDatabase('transaction-abort-with-js-recursion-cross-frame')");
request._onerror_ = unexpectedErrorCallback;
+ request._onsuccess_ = function () {
+ request = evalAndLog("indexedDB.open('transaction-abort-with-js-recursion-cross-frame')");
+ request._onsuccess_ = setVersion;
+ request._onerror_ = unexpectedErrorCallback;
+ };
}
function setVersion() {
