From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- .../storage/indexeddb/index-basics-expected.txt | 63 ++++++++++++---------- 1 file changed, 34 insertions(+), 29 deletions(-) (limited to 'LayoutTests/storage/indexeddb/index-basics-expected.txt') diff --git a/LayoutTests/storage/indexeddb/index-basics-expected.txt b/LayoutTests/storage/indexeddb/index-basics-expected.txt index 564bdc8..0869d95 100644 --- a/LayoutTests/storage/indexeddb/index-basics-expected.txt +++ b/LayoutTests/storage/indexeddb/index-basics-expected.txt @@ -1,9 +1,9 @@ -Test the basics of IndexedDB's IDBIndex. +Test the basics of IndexedDB's webkitIDBIndex. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -indexedDB.open('name', 'description') +webkitIndexedDB.open('name', 'description') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -21,12 +21,13 @@ PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE db = event.result -db.createObjectStore('storeName', null) +db.setVersion('new version') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true An event should fire shortly... +setVersionSuccess(): Success event fired: PASS 'result' in event is true PASS 'code' in event is false @@ -38,8 +39,25 @@ PASS 'onerror' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE -store = event.result -event.result.createIndex('indexName', 'x') +trans = event.result +PASS trans !== null is true +Deleted all object stores. +db.createObjectStore('storeName', null) +store.createIndex('indexName', 'x') +store.createIndex('indexName2', 'y', false) +PASS 'name' in indexObject is true +PASS indexObject.name is "indexName" +PASS 'storeName' in indexObject is true +PASS indexObject.storeName is "storeName" +PASS 'keyPath' in indexObject is true +PASS indexObject.keyPath is "x" +PASS 'unique' in indexObject is true +PASS indexObject.unique is false +PASS 'openKeyCursor' in indexObject is true +PASS 'openCursor' in indexObject is true +PASS 'getKey' in indexObject is true +PASS 'get' in indexObject is true +store.add({x: 'value', y: 'zzz'}, 'key') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -56,21 +74,7 @@ PASS 'onerror' 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 false -indexObject = event.result -PASS 'name' in indexObject is true -PASS indexObject.name is "indexName" -PASS 'storeName' in indexObject is true -PASS indexObject.storeName is "storeName" -PASS 'keyPath' in indexObject is true -PASS indexObject.keyPath is "x" -PASS 'unique' in indexObject is true -PASS indexObject.unique is false -PASS 'openObjectCursor' in indexObject is true -PASS 'openCursor' in indexObject is true -PASS 'getObject' in indexObject is true -PASS 'get' in indexObject is true -event.source.add({x: 'value', y: 'zzz'}, 'key') +event.source.add({x: 'value2', y: 'zzz2'}, 'key2') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -87,7 +91,7 @@ PASS 'onerror' 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') +indexObject.getKey('value') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -104,7 +108,8 @@ PASS 'onerror' in event.target is true PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE -indexObject.get('value') +PASS event.result is "key" +indexObject2.getKey('zzz') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -122,7 +127,7 @@ PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE PASS event.result is "key" -indexObject.getObject('value') +indexObject.get('value') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -141,7 +146,7 @@ PASS event.target.readyState is event.target.DONE PASS event.result.x is "value" PASS event.result.y is "zzz" -indexObject.get('does not exist') +indexObject.getKey('does not exist') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -158,8 +163,8 @@ PASS 'onerror' 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.NOT_FOUND_ERR -indexObject.getObject('does not exist') +PASS event.code is webkitIDBDatabaseException.NOT_FOUND_ERR +indexObject.get('does not exist') PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -176,8 +181,8 @@ PASS 'onerror' 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.NOT_FOUND_ERR -indexObject.openCursor() +PASS event.code is webkitIDBDatabaseException.NOT_FOUND_ERR +indexObject.openKeyCursor() PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true @@ -235,7 +240,7 @@ PASS 'readyState' in event.target is true PASS event.target.readyState is event.target.DONE PASS event.result === null is true -indexObject.openObjectCursor() +indexObject.openCursor() PASS 'onsuccess' in result is true PASS 'onerror' in result is true PASS 'readyState' in result is true -- cgit v1.1