Skip to content

Commit

Permalink
Review support.js files in IndexedDB/ and subdirectories
Browse files Browse the repository at this point in the history
Combine the functions so that web-platform-tests#63, web-platform-tests#66 ~ web-platform-tests#69 can remove the file.

Still keep IndexedDB/support.js use vendor prefix.
  • Loading branch information
Zhiqiang Zhang committed Dec 9, 2013
1 parent 453ab70 commit b51fa03
Showing 1 changed file with 154 additions and 1 deletion.
155 changes: 154 additions & 1 deletion IndexedDB/support.js
Expand Up @@ -54,4 +54,157 @@ function assert_cursor_exists(cursor) {

function assert_unexpected_complete() {
assert_unreached("Unexpected complete event fired.");
}
}

/* 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);
});
}

// modified version of support.js’ createdb function,
// the returned DB object has a `setTest(t)` method which
// change the 'test' object used for fails reports, and return
// the DB object (for chained calls)
// Author: Baptiste Fontaine (batifon@yahoo.fr, bfn on IRC)
function createdb_for_multiple_tests(dbname, version) {
var rq_open,
fake_open = {},
test = null,
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, current_test) {
/* Fail handlers, if we haven't set on/whatever/, don't
* expect to get event whatever. */
rq_open.manually_handled = {}

rq_open.addEventListener(evt,

function(e) {

if (current_test !== test) {
return;
}

test.step(function() {
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))
})
}

// add a .setTest method to the DB object
Object.defineProperty(rq_open, 'setTest', {
enumerable : false,
value : function(t) {

test = t;

auto_fail("upgradeneeded", test);
auto_fail("success", test);
auto_fail("blocked", test);
auto_fail("error", test);

return this;
}
});

return rq_open
}

0 comments on commit b51fa03

Please sign in to comment.