1 files changed, 12 insertions, 23 deletions

diff --git a/LayoutTests/storage/indexeddb/index-cursor.html b/LayoutTests/storage/indexeddb/index-cursor.html
index 97985a4..77366a9 100644
--- a/LayoutTests/storage/indexeddb/index-cursor.html
+++ b/LayoutTests/storage/indexeddb/index-cursor.html
@@ -29,35 +29,28 @@ window.testData = [
  
 function openDatabase()
 {
-    result = evalAndLog("webkitIndexedDB.open('someDB')");
-    verifyResult(result);
+    result = evalAndLog("webkitIndexedDB.open('index-cursor')");
     result.onsuccess = setVersion;
     result.onerror = unexpectedErrorCallback;
 }
  
 function setVersion()
 {
-    verifySuccessEvent(event);
-    window.db = evalAndLog("db = event.result");
+    window.db = evalAndLog("db = event.target.result");
 
     result = evalAndLog("db.setVersion('new version')");
-    verifyResult(result);
     result.onsuccess = deleteExisting;
     result.onerror = unexpectedErrorCallback;
 }
 
 function deleteExisting()
 {
-    verifySuccessEvent(event);
-    window.trans = evalAndLog("trans = event.result");
+    window.trans = evalAndLog("trans = event.target.result");
     shouldBeTrue("trans !== null");
     trans.onabort = unexpectedAbortCallback;
 
-    deleteAllObjectStores(db, startAddingData);
-}
- 
-function startAddingData()
-{
+    deleteAllObjectStores(db);
+
     window.objectStore = evalAndLog("db.createObjectStore('someObjectStore')");
     window.indexObject = evalAndLog("objectStore.createIndex('someIndex', 'x')");
     window.nextToAdd = 0;
@@ -66,11 +59,7 @@ function startAddingData()
 
 function addData()
 {
-    if (window.nextToAdd > 0)
-        verifySuccessEvent(event);
-
     result = evalAndLog("objectStore.add({'x': testData[nextToAdd]}, nextToAdd)");
-    verifyResult(result);
     result.onsuccess = ++window.nextToAdd < testData.length ? addData : scheduleTests;
     result.onerror = unexpectedErrorCallback;
 }
@@ -181,7 +170,7 @@ function runNextTest()
  
     var keyRange;
     if (lower !== null && upper !== null)
-        keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], {lowerOpen: lowerIsOpen, upperOpen: upperIsOpen});
+        keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
     else if (lower !== null)
         keyRange = webkitIDBKeyRange.lowerBound(testData[lower], lowerIsOpen);
     else
@@ -209,22 +198,22 @@ function testWithinBounds()
 function cursorIteration()
 {
     if (expectedIndex === null) {
-        shouldBeNull("event.result");
+        shouldBeNull("event.target.result");
         runNextTest();
         return;
     }
-    if (event.result === null) {
-        testFailed("Event.result should not be null.");
+    if (event.target.result === null) {
+        testFailed("event.target.result should not be null.");
         runNextTest();
         return;
     }
  
-    shouldBe("event.result.value", "expectedIndex");
-    shouldBe("event.result.key", "testData[" + expectedIndex + "]");
+    shouldBe("event.target.result.primaryKey", "expectedIndex");
+    shouldBe("event.target.result.key", "testData[" + expectedIndex + "]");
     window.expectedIndex = ascending ? expectedIndex + 1 : expectedIndex - 1;
     testWithinBounds();
 
-    event.result.continue();
+    event.target.result.continue();
 }
  
 window.nullKeyRangeStep = 0;