diff --git a/IndexedDB/submissions/TestTWF_Paris/ChristopheCHARLES/idbkeyrange_incorrect.htm b/IndexedDB/idbkeyrange_incorrect.htm similarity index 100% rename from IndexedDB/submissions/TestTWF_Paris/ChristopheCHARLES/idbkeyrange_incorrect.htm rename to IndexedDB/idbkeyrange_incorrect.htm diff --git a/IndexedDB/submissions/TestTWF_Paris/ChristopheCHARLES/support.js b/IndexedDB/submissions/TestTWF_Paris/ChristopheCHARLES/support.js deleted file mode 100644 index d5e8a203779e75..00000000000000 --- a/IndexedDB/submissions/TestTWF_Paris/ChristopheCHARLES/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); - }); -}