diff options
author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 20:48:04 +0000 |
---|---|---|
committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 20:48:04 +0000 |
commit | e62ab15a129a1359578f2b936338c08a9c4d8ca5 (patch) | |
tree | 2f03e2e2c741edb436adbdea179be3037703d49c | |
parent | 5f1938fafdf6f706a5bceaff6d93442633c1d10c (diff) | |
download | chromium_src-e62ab15a129a1359578f2b936338c08a9c4d8ca5.zip chromium_src-e62ab15a129a1359578f2b936338c08a9c4d8ca5.tar.gz chromium_src-e62ab15a129a1359578f2b936338c08a9c4d8ca5.tar.bz2 |
Update chromium tests for new IDBDatabase.transaction() restrictions. The transaction([]) shortcut is no longer supported, stores must be listed explicitly.
WebKit change is https://bugs.webkit.org/show_bug.cgi?id=70251
Discussion of change: https://groups.google.com/a/chromium.org/group/chromium-html5/browse_thread/thread/f667458ca6455d33/1496ad2d1a67b53f#1496ad2d1a67b53f
BUG=101927
TEST=content_unittests --gtest_filter='*IndexedDB*'
Review URL: http://codereview.chromium.org/8414002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107617 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 11 insertions, 9 deletions
diff --git a/chrome/test/data/indexeddb/quota_test.js b/chrome/test/data/indexeddb/quota_test.js index 807245e..8150415 100644 --- a/chrome/test/data/indexeddb/quota_test.js +++ b/chrome/test/data/indexeddb/quota_test.js @@ -72,7 +72,7 @@ function startNewTransaction() { debug(""); debug("Starting new transaction."); - var trans = db.transaction([], webkitIDBTransaction.READ_WRITE); + var trans = db.transaction(['test123'], webkitIDBTransaction.READ_WRITE); trans.onabort = onAbort; trans.oncomplete = getQuotaAndUsage; var store = trans.objectStore('test123'); diff --git a/chrome/test/data/indexeddb/transaction_run_forever.js b/chrome/test/data/indexeddb/transaction_run_forever.js index 74042b2..5b3d395 100644 --- a/chrome/test/data/indexeddb/transaction_run_forever.js +++ b/chrome/test/data/indexeddb/transaction_run_forever.js @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,8 @@ function newTransactionComplete() { debug('The transaction completed.'); - var finalTransaction = db.transaction([], IDBTransaction.READ_ONLY); + var finalTransaction = db.transaction(['employees'], + IDBTransaction.READ_ONLY); finalTransaction.oncomplete = unexpectedCompleteCallback; finalTransaction.onabort = unexpectedErrorCallback; @@ -34,7 +35,7 @@ function newTransactionComplete() function onSetVersionComplete() { debug('Creating new transaction.'); - var newTransaction = db.transaction([], IDBTransaction.READ_WRITE); + var newTransaction = db.transaction(['employees'], IDBTransaction.READ_WRITE); newTransaction.oncomplete = newTransactionComplete; newTransaction.onabort = unexpectedAbortCallback; diff --git a/chrome/test/data/indexeddb/transaction_test.js b/chrome/test/data/indexeddb/transaction_test.js index 71f04fa..afb344f 100644 --- a/chrome/test/data/indexeddb/transaction_test.js +++ b/chrome/test/data/indexeddb/transaction_test.js @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -23,7 +23,8 @@ function newTransactionAborted() { debug('The transaction was aborted.'); - var finalTransaction = db.transaction([], IDBTransaction.READ_ONLY); + var finalTransaction = db.transaction(['employees'], + IDBTransaction.READ_ONLY); finalTransaction.oncomplete = finalTransactionCompleted; finalTransaction.onabort = finalTransactionAborted; @@ -46,7 +47,8 @@ function employeeAdded() function onSetVersionComplete() { debug('Creating new transaction.'); - window.newTransaction = db.transaction([], IDBTransaction.READ_WRITE); + window.newTransaction = db.transaction(['employees'], + IDBTransaction.READ_WRITE); newTransaction.oncomplete = newTransactionCompleted; newTransaction.onabort = newTransactionAborted; diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 5b8a0a8..5525aba 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -234,8 +234,7 @@ class IndexedDBBrowserTestWithLowQuota : public IndexedDBBrowserTest { }; -// See http://crbug.com/101927 -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithLowQuota, DISABLED_QuotaTest) { +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithLowQuota, QuotaTest) { SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("quota_test.html")))); } |