From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 30 Sep 2010 15:42:16 +0100 Subject: Merge WebKit at r68651 : Initial merge by git. Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12 --- LayoutTests/storage/indexeddb/basics-expected.txt | 2 -- .../storage/indexeddb/database-basics-expected.txt | 9 +------ .../storage/indexeddb/index-basics-expected.txt | 30 ---------------------- .../storage/indexeddb/index-cursor-expected.txt | 22 ---------------- .../indexeddb/objectstore-basics-expected.txt | 28 ++++++++++---------- .../storage/indexeddb/objectstore-basics.html | 28 +++++++++++++++++++- .../indexeddb/objectstore-cursor-expected.txt | 18 ------------- .../objectstore-removeobjectstore-expected.txt | 24 +++++------------ .../indexeddb/objectstore-removeobjectstore.html | 22 ++++++++++++---- .../storage/indexeddb/open-cursor-expected.txt | 10 +------- LayoutTests/storage/indexeddb/resources/shared.js | 2 -- .../indexeddb/transaction-basics-expected.txt | 5 +--- 12 files changed, 66 insertions(+), 134 deletions(-) (limited to 'LayoutTests/storage') diff --git a/LayoutTests/storage/indexeddb/basics-expected.txt b/LayoutTests/storage/indexeddb/basics-expected.txt index 5365901..7632e40 100644 --- a/LayoutTests/storage/indexeddb/basics-expected.txt +++ b/LayoutTests/storage/indexeddb/basics-expected.txt @@ -8,7 +8,6 @@ PASS indexedDB == null is false indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -20,7 +19,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE diff --git a/LayoutTests/storage/indexeddb/database-basics-expected.txt b/LayoutTests/storage/indexeddb/database-basics-expected.txt index fc224cc..42c9879 100644 --- a/LayoutTests/storage/indexeddb/database-basics-expected.txt +++ b/LayoutTests/storage/indexeddb/database-basics-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -18,7 +17,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -27,7 +25,6 @@ Testing setVersion. db.setVersion("version a") PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -39,14 +36,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE db.setVersion("version b") PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -58,7 +53,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -70,7 +64,6 @@ PASS db.objectStores.contains('') is false db.createObjectStore("test123") PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -82,7 +75,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -94,3 +86,4 @@ PASS db.objectStores.contains('test123') is true PASS successfullyParsed is true TEST COMPLETE + diff --git a/LayoutTests/storage/indexeddb/index-basics-expected.txt b/LayoutTests/storage/indexeddb/index-basics-expected.txt index a99bc86..564bdc8 100644 --- a/LayoutTests/storage/indexeddb/index-basics-expected.txt +++ b/LayoutTests/storage/indexeddb/index-basics-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -18,7 +17,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -26,7 +24,6 @@ db = event.result db.createObjectStore('storeName', null) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -38,7 +35,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -46,7 +42,6 @@ store = event.result event.result.createIndex('indexName', 'x') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -58,7 +53,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -79,7 +73,6 @@ PASS 'get' in indexObject is true event.source.add({x: 'value', y: 'zzz'}, 'key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -91,14 +84,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE event.source.add({x: 'value2', y: 'zzz2'}, 'key2') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -110,14 +101,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE indexObject.get('value') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -129,7 +118,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -137,7 +125,6 @@ PASS event.result is "key" indexObject.getObject('value') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -149,7 +136,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -158,7 +144,6 @@ PASS event.result.y is "zzz" indexObject.get('does not exist') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -170,7 +155,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -178,7 +162,6 @@ PASS event.code is IDBDatabaseException.NOT_FOUND_ERR indexObject.getObject('does not exist') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -190,7 +173,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -198,7 +180,6 @@ PASS event.code is IDBDatabaseException.NOT_FOUND_ERR indexObject.openCursor() PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -210,7 +191,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -220,7 +200,6 @@ PASS event.result.value is "key" event.result.continue() PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -232,7 +211,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -242,7 +220,6 @@ PASS event.result.value is "key2" event.result.continue() PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -254,7 +231,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -262,7 +238,6 @@ PASS event.result === null is true indexObject.openObjectCursor() PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -274,7 +249,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -285,7 +259,6 @@ PASS event.result.value.y is "zzz" event.result.continue() PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -297,7 +270,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -308,7 +280,6 @@ PASS event.result.value.y is "zzz2" event.result.continue() PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -320,7 +291,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE diff --git a/LayoutTests/storage/indexeddb/index-cursor-expected.txt b/LayoutTests/storage/indexeddb/index-cursor-expected.txt index 1442ad4..6d1417f 100644 --- a/LayoutTests/storage/indexeddb/index-cursor-expected.txt +++ b/LayoutTests/storage/indexeddb/index-cursor-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('someDB', 'some description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -18,7 +17,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -26,7 +24,6 @@ db = event.result db.createObjectStore('someObjectStore') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -38,7 +35,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -46,7 +42,6 @@ objectStore = event.result objectStore.createIndex('someIndex', 'x') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -58,7 +53,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -71,14 +65,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -90,14 +82,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -109,14 +99,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -128,14 +116,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -147,14 +133,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -166,14 +150,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -185,14 +167,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -204,14 +184,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add({'x': testData[nextToAdd]}, nextToAdd) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... diff --git a/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt b/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt index 890c00f..7b5439a 100644 --- a/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt +++ b/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -19,7 +18,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -27,7 +25,6 @@ db = event.result db.createObjectStore('storeName', null) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -40,7 +37,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -50,10 +46,13 @@ PASS store.name is "storeName" PASS store.keyPath is null PASS storeNames.contains('storeName') is true PASS storeNames.length is 1 +Ask for a store that doesn't exist: +index = store.index('asdf') +PASS index is null +FAIL Asking for a store that doesn't exist should have thrown. event.result.createIndex('indexName', 'x', true) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -66,15 +65,20 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE +PASS event.result !== null is true PASS event.source.indexNames.contains('indexName') is true +index = event.source.index('indexName') +PASS index !== null is true +Ask for a store that doesn't exist: +index = store.index('asdf') +PASS index is null +FAIL Asking for a store that doesn't exist should have thrown. event.source.add({x: 'value'}, 'key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -87,7 +91,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -95,7 +98,6 @@ PASS event.result is "key" event.source.add({x: 'value'}, 'zzz') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -108,16 +110,15 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE PASS event.code is IDBDatabaseException.UNKNOWN_ERR -store = event.source +db.transaction() +store = transaction.objectStore('storeName') store.get('key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -130,7 +131,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -139,7 +139,6 @@ store = event.source store.remove('key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -152,7 +151,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE diff --git a/LayoutTests/storage/indexeddb/objectstore-basics.html b/LayoutTests/storage/indexeddb/objectstore-basics.html index 731d421..b2d383a 100644 --- a/LayoutTests/storage/indexeddb/objectstore-basics.html +++ b/LayoutTests/storage/indexeddb/objectstore-basics.html @@ -49,6 +49,16 @@ function createSuccess() shouldBe("storeNames.length", "1"); // FIXME: test all of object store's methods. + debug("Ask for a store that doesn't exist:"); + try { + index = evalAndLog("index = store.index('asdf')"); + shouldBeNull("index"); // Returning null is wrong, but less wrong than returning an actual object! + testFailed("Asking for a store that doesn't exist should have thrown."); + } catch (err) { + testPassed("Error thrown."); + // FIXME: Verify the correct exception thrown. + } + result = evalAndLog("event.result.createIndex('indexName', 'x', true)"); // true == unique requirement. verifyResult(result); result.onsuccess = addIndexSuccess; @@ -59,7 +69,20 @@ function addIndexSuccess() { debug("addIndexSuccess():"); verifySuccessEvent(event); + shouldBeTrue("event.result !== null"); shouldBeTrue("event.source.indexNames.contains('indexName')"); + index = evalAndLog("index = event.source.index('indexName')"); + shouldBeTrue("index !== null"); + + debug("Ask for a store that doesn't exist:"); + try { + index = evalAndLog("index = store.index('asdf')"); + shouldBeNull("index"); // Returning null is wrong, but less wrong than returning an actual object! + testFailed("Asking for a store that doesn't exist should have thrown."); + } catch (err) { + testPassed("Error thrown."); + // FIXME: Verify the correct exception thrown. + } result = evalAndLog("event.source.add({x: 'value'}, 'key')"); verifyResult(result); @@ -85,7 +108,10 @@ function addAgainFailure() verifyErrorEvent(event); // FIXME: This error code needs to be specced. shouldBe("event.code", "IDBDatabaseException.UNKNOWN_ERR"); - var store = evalAndLog("store = event.source"); + + transaction = evalAndLog("db.transaction()"); + transaction.onabort = unexpectedErrorCallback; + var store = evalAndLog("store = transaction.objectStore('storeName')"); result = evalAndLog("store.get('key')"); verifyResult(result); diff --git a/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt b/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt index ce5514a..e7211f6 100644 --- a/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt +++ b/LayoutTests/storage/indexeddb/objectstore-cursor-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('someDB', 'some description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -18,7 +17,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -26,7 +24,6 @@ db = event.result db.createObjectStore('someObjectStore') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -38,7 +35,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -51,14 +47,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -70,14 +64,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -89,14 +81,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -108,14 +98,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -127,14 +115,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -146,14 +132,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -165,14 +149,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE objectStore.add('', testData[nextToAdd]) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... diff --git a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt index 0a3d938..b7ba473 100644 --- a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt +++ b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -18,7 +17,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -26,7 +24,6 @@ db = event.result db.createObjectStore('storeName', null) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -38,14 +35,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE event.result.add('value', 'key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -57,14 +52,14 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE -event.source.get('key') +db.transaction() +store = transaction.objectStore('storeName') +store.get('key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -76,7 +71,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -84,7 +78,6 @@ PASS event.result is "value" event.source.createIndex('indexName', '') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -96,7 +89,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -104,7 +96,6 @@ PASS event.source.indexNames.contains('indexName') is true db.removeObjectStore('storeName') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -116,14 +107,12 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE db.createObjectStore('storeName', null) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -135,14 +124,14 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE -event.result.get('key') +db.transaction() +store = transaction.objectStore('storeName') +store.get('key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -154,7 +143,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE diff --git a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html index e842f5b..7878c7f 100644 --- a/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html +++ b/LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html @@ -49,7 +49,11 @@ function getValue() { verifySuccessEvent(event); - result = evalAndLog("event.source.get('key')"); + transaction = evalAndLog("db.transaction()"); + transaction.onabort = unexpectedErrorCallback; + var store = evalAndLog("store = transaction.objectStore('storeName')"); + + result = evalAndLog("store.get('key')"); verifyResult(result); result.onsuccess = addIndex; result.onerror = unexpectedErrorCallback; @@ -62,15 +66,20 @@ function addIndex() result = evalAndLog("event.source.createIndex('indexName', '')"); verifyResult(result); - result.onsuccess = removeObjectStore; + result.onsuccess = commitTransaction; result.onerror = unexpectedErrorCallback; } -function removeObjectStore() +function commitTransaction() { verifySuccessEvent(event); shouldBeTrue("event.source.indexNames.contains('indexName')"); + // Let the transaction commit. + window.setTimeout('removeObjectStore()', 0); +} +function removeObjectStore() +{ result = evalAndLog("db.removeObjectStore('storeName')"); verifyResult(result); result.onsuccess = createObjectStoreAgain; @@ -91,7 +100,11 @@ function getValueAgain() { verifySuccessEvent(event); - result = evalAndLog("event.result.get('key')"); + transaction = evalAndLog("db.transaction()"); + transaction.onabort = unexpectedErrorCallback; + var store = evalAndLog("store = transaction.objectStore('storeName')"); + + result = evalAndLog("store.get('key')"); verifyResult(result); result.onsuccess = unexpectedSuccessCallback; result.onerror = verifyError; @@ -100,7 +113,6 @@ function getValueAgain() function verifyError() { verifyErrorEvent(event); - // FIXME: Should just be IDBDatabaseException.NOT_FOUND_ERR but that doesn't work yet. shouldBe("event.code", "2"); shouldBeFalse("event.source.indexNames.contains('indexName')"); diff --git a/LayoutTests/storage/indexeddb/open-cursor-expected.txt b/LayoutTests/storage/indexeddb/open-cursor-expected.txt index e4ddc69..bda103f 100644 --- a/LayoutTests/storage/indexeddb/open-cursor-expected.txt +++ b/LayoutTests/storage/indexeddb/open-cursor-expected.txt @@ -6,7 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -18,7 +17,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -26,7 +24,6 @@ db = event.result db.createObjectStore('test') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -38,7 +35,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -46,7 +42,6 @@ objectStore = event.result objectStore.add('myValue', 'myKey') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -54,7 +49,6 @@ Opening cursor objectStore.openCursor(keyRange) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -67,7 +61,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -79,7 +72,6 @@ Opening an empty cursor. objectStore.openCursor(keyRange) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -92,10 +84,10 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE PASS successfullyParsed is true TEST COMPLETE + diff --git a/LayoutTests/storage/indexeddb/resources/shared.js b/LayoutTests/storage/indexeddb/resources/shared.js index 112bf18..65da3bf 100644 --- a/LayoutTests/storage/indexeddb/resources/shared.js +++ b/LayoutTests/storage/indexeddb/resources/shared.js @@ -11,7 +11,6 @@ function verifyEventCommon(event) shouldBeTrue("event.source != null"); shouldBeTrue("'onsuccess' in event.target"); shouldBeTrue("'onerror' in event.target"); - shouldBeTrue("'abort' in event.target"); shouldBeTrue("'readyState' in event.target"); shouldBe("event.target.readyState", "event.target.DONE"); debug(""); @@ -45,7 +44,6 @@ function verifyResult(result) { shouldBeTrue("'onsuccess' in result"); shouldBeTrue("'onerror' in result"); - shouldBeTrue("'abort' in result"); shouldBeTrue("'readyState' in result"); debug("An event should fire shortly..."); debug(""); diff --git a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt index 25d0694..bba62f0 100644 --- a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt +++ b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt @@ -8,7 +8,6 @@ PASS indexedDB == null is false indexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -21,7 +20,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -29,7 +27,6 @@ db = event.result db.createObjectStore('storeName', null) PASS 'onsuccess' in result is true PASS 'onerror' in result is true -PASS 'abort' in result is true PASS 'readyState' in result is true An event should fire shortly... @@ -41,7 +38,6 @@ PASS 'source' in event is true PASS event.source != null is true PASS 'onsuccess' in event.target is true PASS 'onerror' in event.target is true -PASS 'abort' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE @@ -53,3 +49,4 @@ PASS event.type is "abort" PASS successfullyParsed is true TEST COMPLETE + -- cgit v1.1