From 6f576c5fbe9e03c4aad88a04ed8ab60c027760ce Mon Sep 17 00:00:00 2001
From: Zhiqiang Zhang <zhiqiang.zhang@intel.com>
Date: Wed, 11 Dec 2013 14:41:53 +0800
Subject: [PATCH] Review rhuet's Indexed DB tests

- Remove support.js
- Remove error checkCursorDirections
- Add back undefined event
---
 IndexedDB/cursor-overloads.htm |   7 +--
 IndexedDB/support.js           | 101 ---------------------------------
 2 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 IndexedDB/support.js

diff --git a/IndexedDB/cursor-overloads.htm b/IndexedDB/cursor-overloads.htm
index 7c1eef746f08d6..078bc2fd3d015d 100644
--- a/IndexedDB/cursor-overloads.htm
+++ b/IndexedDB/cursor-overloads.htm
@@ -39,10 +39,6 @@
         checkCursorDirection("store.openCursor(0, 'nextunique')", "nextunique");
         checkCursorDirection("store.openCursor(0, 'prev')", "prev");
         checkCursorDirection("store.openCursor(0, 'prevunique')", "prevunique");
-        checkCursorDirection("store.openCursor(0, IDBCursor.NEXT)", "next");
-        checkCursorDirection("store.openCursor(0, IDBCursor.NEXT_NO_DUPLICATE)", "nextunique");
-        checkCursorDirection("store.openCursor(0, IDBCursor.PREV)", "prev");
-        checkCursorDirection("store.openCursor(0, IDBCursor.PREV_NO_DUPLICATE)", "prevunique");
 
         checkCursorDirection("store.openCursor(IDBKeyRange.only(0))", "next");
         checkCursorDirection("store.openCursor(IDBKeyRange.only(0), 'next')", "next");
@@ -81,8 +77,7 @@
 
     function checkCursorDirection(statement, direction) {
         request = eval(statement);
-        request.onsuccess = function() {
-            console.log(statement);
+        request.onsuccess = function(event) {
             assert_not_equals(event.target.result, null, "Check the result is not null")
             assert_equals(event.target.result.direction, direction, "Check the result direction");
         };
diff --git a/IndexedDB/support.js b/IndexedDB/support.js
deleted file mode 100644
index d5e8a203779e75..00000000000000
--- a/IndexedDB/support.js
+++ /dev/null
@@ -1,101 +0,0 @@
-if (!window.indexedDB)
-{
-    if (window.msIndexedDB)
-    {
-        window.indexedDB = window.msIndexedDB;
-    }
-    else if (window.mozIndexedDB)
-    {
-        window.indexedDB = window.mozIndexedDB;
-    }
-    else if (window.webkitIndexedDB)
-    {
-        window.indexedDB        = webkitIndexedDB;
-        IDBCursor               = webkitIDBCursor;
-        IDBDatabaseException    = webkitIDBDatabaseException;
-        IDBIndex                = webkitIDBIndex;
-        IDBObjectStore          = webkitIDBObjectStore;
-        IDBRequest              = webkitIDBRequest;
-        IDBKeyRange             = webkitIDBKeyRange;
-        IDBTransaction          = webkitIDBTransaction;
-    }
-}
-
-/* Delete created databases
- *
- * Go through each finished test, see if it has an associated database. Close
- * that and delete the database. */
-add_completion_callback(function(tests)
-{
-    for (var i in tests)
-    {
-        if(tests[i].db)
-        {
-            tests[i].db.close();
-            window.indexedDB.deleteDatabase(tests[i].db.name);
-        }
-    }
-});
-
-function createdb(test, dbname, version)
-{
-    var rq_open,
-      fake_open = {},
-      dbname = (dbname ? dbname : "testdb-" + new Date().getTime() + Math.random() );
-
-    if (version)
-        rq_open = window.indexedDB.open(dbname, version);
-    else
-        rq_open = window.indexedDB.open(dbname);
-
-    function auto_fail(evt) {
-        /* Fail handlers, if we haven't set on/whatever/, don't
-         * expect to get event whatever. */
-        rq_open.manually_handled = {}
-
-        rq_open.addEventListener(evt,
-            test.step_func(function(e) {
-                if (!rq_open.manually_handled[evt])
-                    assert_unreached("unexpected open." + evt + " event")
-
-                if (e.target.result + "" == "[object IDBDatabase]" && !this.db)
-                {
-                    this.db = e.target.result;
-
-                    this.db.onerror = fail(test, "unexpected db.error");
-                    this.db.onabort = fail(test, "unexpected db.abort");
-                    this.db.onversionchange = fail(test, "unexpected db.versionchange");
-                }
-            })
-        )
-        rq_open.__defineSetter__("on" + evt, function(h) {
-            rq_open.manually_handled[evt] = true
-            if (!h)
-                rq_open.addEventListener(evt, function() {})
-            else
-                rq_open.addEventListener(evt, test.step_func(h))
-        })
-    }
-
-    auto_fail("upgradeneeded")
-    auto_fail("success")
-    auto_fail("blocked")
-    auto_fail("error")
-
-    return rq_open
-}
-
-function fail(test, desc) {
-    return test.step_func(function(e) {
-        console.log(desc, e);
-
-        if (e && e.message && e.target.error)
-            assert_unreached(desc + " (" + e.target.error.name + ": " + e.message + ")");
-        else if (e && e.message)
-            assert_unreached(desc + " (" + e.message + ")");
-        else if (e && e.target.error)
-            assert_unreached(desc + " (" + e.target.error.name + ")");
-        else
-            assert_unreached(desc);
-    });
-}