summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_browsertest.cc18
-rw-r--r--chrome/test/data/indexeddb/common.js2
-rw-r--r--chrome/test/data/indexeddb/cursor_test.js8
-rw-r--r--chrome/test/data/indexeddb/database_test.js8
-rw-r--r--chrome/test/data/indexeddb/index_test.js8
-rw-r--r--chrome/test/data/indexeddb/key_path_test.js6
-rw-r--r--chrome/test/data/indexeddb/object_store_test.js2
-rw-r--r--chrome/test/data/indexeddb/transaction_run_forever.js2
-rw-r--r--chrome/test/data/indexeddb/transaction_test.js2
9 files changed, 28 insertions, 28 deletions
diff --git a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
index 7a9cbb3..4eeac74 100644
--- a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -46,36 +46,36 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
}
};
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_CursorTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
}
// TODO(hans): Keep an eye out for these tests going flaky. See crbug.com/63675.
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_IndexTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, IndexTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html"))));
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionGetTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html"))));
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ObjectStoreTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ObjectStoreTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html"))));
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DatabaseTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html"))));
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) {
SimpleTest(testUrl(FilePath(
FILE_PATH_LITERAL("transaction_run_forever.html"))));
ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
@@ -84,7 +84,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) {
// In proc browser test is needed here because ClearLocalState indirectly calls
// WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin.
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ClearLocalState) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) {
// Create test files.
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
diff --git a/chrome/test/data/indexeddb/common.js b/chrome/test/data/indexeddb/common.js
index d2416d0..cf850e4 100644
--- a/chrome/test/data/indexeddb/common.js
+++ b/chrome/test/data/indexeddb/common.js
@@ -48,7 +48,7 @@ function unexpectedErrorCallback()
function deleteAllObjectStores(db)
{
- objectStores = db.objectStores;
+ objectStores = db.objectStoreNames;
for (var i = 0; i < objectStores.length; ++i)
db.removeObjectStore(objectStores[i]);
}
diff --git a/chrome/test/data/indexeddb/cursor_test.js b/chrome/test/data/indexeddb/cursor_test.js
index fc6dbc1..321f434 100644
--- a/chrome/test/data/indexeddb/cursor_test.js
+++ b/chrome/test/data/indexeddb/cursor_test.js
@@ -11,8 +11,8 @@ function emptyCursorSuccess()
function openEmptyCursor()
{
debug('Opening an empty cursor.');
- keyRange = webkitIDBKeyRange.leftBound('InexistentKey');
- result = objectStore.openCursor(keyRange);
+ keyRange = webkitIDBKeyRange.lowerBound('InexistentKey');
+ result = objectStore.openCursor({range: keyRange});
result.onsuccess = emptyCursorSuccess;
result.onerror = unexpectedErrorCallback;
}
@@ -37,8 +37,8 @@ function cursorSuccess()
function openCursor(objectStore)
{
debug('Opening cursor');
- var keyRange = webkitIDBKeyRange.leftBound('myKey');
- var result = objectStore.openCursor(keyRange);
+ var keyRange = webkitIDBKeyRange.lowerBound('myKey');
+ var result = objectStore.openCursor({range: keyRange});
result.onsuccess = cursorSuccess;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/database_test.js b/chrome/test/data/indexeddb/database_test.js
index b8f0361..47854e5 100644
--- a/chrome/test/data/indexeddb/database_test.js
+++ b/chrome/test/data/indexeddb/database_test.js
@@ -6,18 +6,18 @@ function populateObjectStore()
{
debug('Populating object store');
deleteAllObjectStores(db);
- window.objectStore = db.createObjectStore('employees', 'id');
+ window.objectStore = db.createObjectStore('employees', {keyPath: 'id'});
shouldBe("objectStore.name", "'employees'");
shouldBe("objectStore.keyPath", "'id'");
shouldBe('db.name', '"name"');
shouldBe('db.version', '"1.0"');
- shouldBe('db.objectStores.length', '1');
- shouldBe('db.objectStores[0]', '"employees"');
+ shouldBe('db.objectStoreNames.length', '1');
+ shouldBe('db.objectStoreNames[0]', '"employees"');
debug('Deleting an object store.');
db.removeObjectStore('employees');
- shouldBe('db.objectStores.length', '0');
+ shouldBe('db.objectStoreNames.length', '0');
done();
}
diff --git a/chrome/test/data/indexeddb/index_test.js b/chrome/test/data/indexeddb/index_test.js
index 1979ea7..9522b2e 100644
--- a/chrome/test/data/indexeddb/index_test.js
+++ b/chrome/test/data/indexeddb/index_test.js
@@ -33,7 +33,7 @@ function onKeyCursor()
return;
}
- var result = index.openCursor(IDBKeyRange.only(55));
+ var result = index.openCursor({range: IDBKeyRange.only(55)});
result.onsuccess = onCursor;
result.onerror = unexpectedErrorCallback;
gotObjectThroughCursor = false;
@@ -55,7 +55,7 @@ function getSuccess()
shouldBe('event.result.aKey', '55');
shouldBe('event.result.aValue', '"foo"');
- var result = index.openKeyCursor(IDBKeyRange.only(55));
+ var result = index.openKeyCursor({range: IDBKeyRange.only(55)});
result.onsuccess = onKeyCursor;
result.onerror = unexpectedErrorCallback;
gotKeyThroughCursor = false;
@@ -99,7 +99,7 @@ function indexSuccess()
shouldBe("index.unique", "true");
try {
- result = objectStore.createIndex('myIndex', 'aKey', true);
+ result = objectStore.createIndex('myIndex', 'aKey', {unique: true});
fail('Re-creating an index must throw an exception');
} catch (e) {
indexErrorExpected();
@@ -110,7 +110,7 @@ function createIndex(expect_error)
{
debug('Creating an index.');
try {
- result = objectStore.createIndex('myIndex', 'aKey', true);
+ result = objectStore.createIndex('myIndex', 'aKey', {unique: true});
window.index = result;
indexSuccess();
} catch (e) {
diff --git a/chrome/test/data/indexeddb/key_path_test.js b/chrome/test/data/indexeddb/key_path_test.js
index 872dbf8..0acb552 100644
--- a/chrome/test/data/indexeddb/key_path_test.js
+++ b/chrome/test/data/indexeddb/key_path_test.js
@@ -20,8 +20,8 @@ function cursorSuccess()
function openCursor()
{
debug("Opening cursor #" + count);
- keyRange = webkitIDBKeyRange.leftBound("myKey" + count);
- result = objectStore.openCursor(keyRange);
+ keyRange = webkitIDBKeyRange.lowerBound("myKey" + count);
+ result = objectStore.openCursor({range: keyRange});
result.onsuccess = cursorSuccess;
result.onerror = unexpectedErrorCallback;
}
@@ -44,7 +44,7 @@ function createObjectStore()
{
debug('createObjectStore');
deleteAllObjectStores(db);
- window.objectStore = db.createObjectStore('test', 'keyPath');
+ window.objectStore = db.createObjectStore('test', {keyPath: 'keyPath'});
count = 0;
populateObjectStore();
}
diff --git a/chrome/test/data/indexeddb/object_store_test.js b/chrome/test/data/indexeddb/object_store_test.js
index bab8971..bba7153 100644
--- a/chrome/test/data/indexeddb/object_store_test.js
+++ b/chrome/test/data/indexeddb/object_store_test.js
@@ -53,7 +53,7 @@ function populateObjectStore()
{
debug('Populating object store');
deleteAllObjectStores(db);
- window.objectStore = db.createObjectStore('employees', 'id');
+ window.objectStore = db.createObjectStore('employees', {keyPath: 'id'});
shouldBe("objectStore.name", "'employees'");
shouldBe("objectStore.keyPath", "'id'");
diff --git a/chrome/test/data/indexeddb/transaction_run_forever.js b/chrome/test/data/indexeddb/transaction_run_forever.js
index 89f4a42..2a6ba3e 100644
--- a/chrome/test/data/indexeddb/transaction_run_forever.js
+++ b/chrome/test/data/indexeddb/transaction_run_forever.js
@@ -52,7 +52,7 @@ function onSetVersion()
debug('Creating object store.');
deleteAllObjectStores(db);
- var objectStore = db.createObjectStore('employees', 'id');
+ var objectStore = db.createObjectStore('employees', {keyPath: 'id'});
}
function setVersion()
diff --git a/chrome/test/data/indexeddb/transaction_test.js b/chrome/test/data/indexeddb/transaction_test.js
index ebd02b1..eac97b2 100644
--- a/chrome/test/data/indexeddb/transaction_test.js
+++ b/chrome/test/data/indexeddb/transaction_test.js
@@ -65,7 +65,7 @@ function onSetVersion()
debug('Creating object store.');
deleteAllObjectStores(db);
- var objectStore = db.createObjectStore('employees', 'id');
+ var objectStore = db.createObjectStore('employees', {keyPath: 'id'});
}
function setVersion()
generated by cgit v1.1 at 2025-02-25 00:19:14 +0000