summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/in_process_webkit/indexed_db_browsertest.cc27
-rw-r--r--chrome/renderer/renderer_webidbfactory_impl.cc2
-rw-r--r--chrome/renderer/renderer_webidbfactory_impl.h2
-rw-r--r--chrome/test/data/indexeddb/cursor_test.js21
-rw-r--r--chrome/test/data/indexeddb/index_test.js36
-rw-r--r--chrome/test/data/indexeddb/key_path_test.js22
-rw-r--r--chrome/test/data/indexeddb/transaction_get_test.js30
7 files changed, 70 insertions, 70 deletions
diff --git a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
index 922b15e..daf5df0 100644
--- a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -78,19 +78,6 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
}
};
-// TODO(jorlow): Re-enable once the other side of the transaction changes lands.
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_CursorTest) {
- SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
-}
-
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_IndexTest) {
- SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html"))));
-}
-
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) {
- SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
-}
-
IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, SplitFilename) {
scoped_refptr<TestOnWebKitThread> test_on_webkit_thread(
new TestOnWebKitThread);
@@ -102,6 +89,18 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, SplitFilename) {
EXPECT_EQ("http://host:1", origin_str);
}
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionGetTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
+ SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
+}
+
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, IndexTest) {
+ SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html"))));
+}
+
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) {
+ SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
+}
+
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html"))));
}
diff --git a/chrome/renderer/renderer_webidbfactory_impl.cc b/chrome/renderer/renderer_webidbfactory_impl.cc
index 79f02cc..9362964 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.cc
+++ b/chrome/renderer/renderer_webidbfactory_impl.cc
@@ -30,7 +30,7 @@ void RendererWebIDBFactoryImpl::open(
const WebSecurityOrigin& origin,
WebFrame* web_frame,
const WebString& dataDir,
- uint64 maximum_size) {
+ unsigned long long maximum_size) {
// Don't send the dataDir. We know what we want on the Browser side of things.
IndexedDBDispatcher* dispatcher =
RenderThread::current()->indexed_db_dispatcher();
diff --git a/chrome/renderer/renderer_webidbfactory_impl.h b/chrome/renderer/renderer_webidbfactory_impl.h
index d52aa53..9b28a66 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.h
+++ b/chrome/renderer/renderer_webidbfactory_impl.h
@@ -31,7 +31,7 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
const WebKit::WebSecurityOrigin& origin,
WebKit::WebFrame* web_frame,
const WebKit::WebString& dataDir,
- uint64 maximum_size);
+ unsigned long long maximum_size);
};
#endif // CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
diff --git a/chrome/test/data/indexeddb/cursor_test.js b/chrome/test/data/indexeddb/cursor_test.js
index eb6f31c..21aa4e8 100644
--- a/chrome/test/data/indexeddb/cursor_test.js
+++ b/chrome/test/data/indexeddb/cursor_test.js
@@ -8,7 +8,7 @@ function emptyCursorSuccess()
function openEmptyCursor()
{
debug('Opening an empty cursor.');
- keyRange = IDBKeyRange.leftBound('InexistentKey');
+ keyRange = webkitIDBKeyRange.leftBound('InexistentKey');
result = objectStore.openCursor(keyRange);
result.onsuccess = emptyCursorSuccess;
result.onerror = unexpectedErrorCallback;
@@ -26,7 +26,7 @@ function cursorSuccess()
function openCursor(objectStore)
{
debug('Opening cursor');
- var keyRange = IDBKeyRange.leftBound('myKey');
+ var keyRange = webkitIDBKeyRange.leftBound('myKey');
var result = objectStore.openCursor(keyRange);
result.onsuccess = cursorSuccess;
result.onerror = unexpectedErrorCallback;
@@ -41,17 +41,18 @@ function dataAddedSuccess()
function populateObjectStore()
{
debug('Populating object store');
- objectStore = event.result;
+ deleteAllObjectStores(db);
+ window.objectStore = db.createObjectStore('test');
var result = objectStore.add('myValue', 'myKey');
- result.onsuccess = dataAddedSuccess();
+ result.onsuccess = dataAddedSuccess;
result.onerror = unexpectedErrorCallback;
}
-function openSuccess()
+function setVersion()
{
- debug('Creating object store');
- var db = event.result;
- var result = db.createObjectStore('test');
+ debug('setVersion');
+ window.db = event.result;
+ var result = db.setVersion('new version');
result.onsuccess = populateObjectStore;
result.onerror = unexpectedErrorCallback;
}
@@ -59,7 +60,7 @@ function openSuccess()
function test()
{
debug('Connecting to indexedDB');
- var result = indexedDB.open('name', 'description');
- result.onsuccess = openSuccess;
+ var result = webkitIndexedDB.open('name', 'description');
+ result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/index_test.js b/chrome/test/data/indexeddb/index_test.js
index 459ac24..d46ccf8 100644
--- a/chrome/test/data/indexeddb/index_test.js
+++ b/chrome/test/data/indexeddb/index_test.js
@@ -9,19 +9,22 @@ function indexErrorExpected()
function indexSuccess()
{
debug('Index created successfully.');
- createIndex(true);
+ try {
+ result = objectStore.createIndex('myIndex', 'aKey', true);
+ fail('Re-creating an index must throw an exception');
+ } catch (e) {
+ indexErrorExpected();
+ }
}
function createIndex(expect_error)
{
debug('Creating an index.');
- result = objectStore.createIndex('myIndex', 'aKey', true);
- if (expect_error) {
- result.onsuccess = unexpectedErrorCallback;
- result.onerror = indexErrorExpected;
- } else {
- result.onsuccess = indexSuccess;
- result.onerror = unexpectedErrorCallback;
+ try {
+ result = objectStore.createIndex('myIndex', 'aKey', true);
+ indexSuccess();
+ } catch (e) {
+ unexpectedErrorCallback();
}
}
@@ -34,18 +37,19 @@ function dataAddedSuccess()
function populateObjectStore()
{
debug('Populating object store');
- objectStore = event.result;
+ deleteAllObjectStores(db);
+ window.objectStore = db.createObjectStore('test');
var myValue = {'aKey': 21, 'aValue': '!42'};
var result = objectStore.add(myValue, 0);
- result.onsuccess = dataAddedSuccess();
+ result.onsuccess = dataAddedSuccess;
result.onerror = unexpectedErrorCallback;
}
-function openSuccess()
+function setVersion()
{
- debug('Creating object store');
- var db = event.result;
- var result = db.createObjectStore('test');
+ debug('setVersion');
+ window.db = event.result;
+ var result = db.setVersion('new version');
result.onsuccess = populateObjectStore;
result.onerror = unexpectedErrorCallback;
}
@@ -53,7 +57,7 @@ function openSuccess()
function test()
{
debug('Connecting to indexedDB');
- var result = indexedDB.open('name', 'description');
- result.onsuccess = openSuccess;
+ var result = webkitIndexedDB.open('name', 'description');
+ result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/key_path_test.js b/chrome/test/data/indexeddb/key_path_test.js
index 2a328fa..39fac49 100644
--- a/chrome/test/data/indexeddb/key_path_test.js
+++ b/chrome/test/data/indexeddb/key_path_test.js
@@ -17,7 +17,7 @@ function cursorSuccess()
function openCursor()
{
debug("Opening cursor #" + count);
- keyRange = IDBKeyRange.leftBound("myKey" + count);
+ keyRange = webkitIDBKeyRange.leftBound("myKey" + count);
result = objectStore.openCursor(keyRange);
result.onsuccess = cursorSuccess;
result.onerror = unexpectedErrorCallback;
@@ -37,27 +37,29 @@ function populateObjectStore()
}
}
-function createObjectStoreSuccess()
+function createObjectStore()
{
- objectStore = event.result;
+ debug('createObjectStore');
+ deleteAllObjectStores(db);
+ window.objectStore = db.createObjectStore('test', 'keyPath');
count = 0;
populateObjectStore();
}
-function openSuccess()
+function setVersion()
{
- debug("Creating object store");
- var db = event.result;
- result = db.createObjectStore('test', 'keyPath');
- result.onsuccess = createObjectStoreSuccess;
+ debug('setVersion');
+ window.db = event.result;
+ var result = db.setVersion('new version');
+ result.onsuccess = createObjectStore;
result.onerror = unexpectedErrorCallback;
}
function test()
{
debug("Opening IndexedDB");
- result = indexedDB.open('name', 'description');
- result.onsuccess = openSuccess;
+ result = webkitIndexedDB.open('name', 'description');
+ result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
diff --git a/chrome/test/data/indexeddb/transaction_get_test.js b/chrome/test/data/indexeddb/transaction_get_test.js
index e9c992a..ef59ff1 100644
--- a/chrome/test/data/indexeddb/transaction_get_test.js
+++ b/chrome/test/data/indexeddb/transaction_get_test.js
@@ -5,7 +5,7 @@ function afterCommit()
var store = transaction.objectStore('storeName');
} catch (e) {
exc = e;
- shouldBe('exc.code', '9');
+ shouldBe('exc.code', 'webkitIDBDatabaseException.NOT_ALLOWED_ERR');
}
done();
}
@@ -37,33 +37,27 @@ function startTransaction()
emptyResult.onerror = nonExistingKey;
}
-function populateObjectStore(objectStore)
+function populateObjectStore()
{
- result = objectStore.add('myValue', 'myKey');
+ deleteAllObjectStores(db);
+ window.objectStore = db.createObjectStore('storeName');
+ var result = objectStore.add('myValue', 'myKey');
result.onsuccess = startTransaction;
+ result.onerror = unexpectedErrorCallback;
}
-function createObjectStoreSuccess()
-{
- var objectStore = event.result;
- populateObjectStore(objectStore);
-}
-
-function openSuccess()
+function setVersion()
{
- db = event.result;
-
- deleteAllObjectStores(db);
-
- result = db.createObjectStore('storeName');
- result.onsuccess = createObjectStoreSuccess;
+ window.db = event.result;
+ var result = db.setVersion('new version');
+ result.onsuccess = populateObjectStore;
result.onerror = unexpectedErrorCallback;
}
function test()
{
- result = indexedDB.open('name', 'description');
- result.onsuccess = openSuccess;
+ result = webkitIndexedDB.open('name', 'description');
+ result.onsuccess = setVersion;
result.onerror = unexpectedErrorCallback;
}
generated by cgit v1.1 at 2025-02-01 12:49:54 +0000