Skip to content

test-suite: fix eval of ASK results and continue running after errors #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpb587 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test-suite: fix eval of ASK results and continue running after errors #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions javascripts/models/test-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,28 @@ window.Test = Backbone.Model.extend({
var query = $rdf.SPARQLToQuery(sparqlText, true, kb);
var queryResult = "error";
if (query) {
// rdflib.js does not always call the final onDone callback (bug?)
var timeoutFallback = setTimeout(function() {
window.console && window.console.log("timeout waiting for query to call done callback");
that.set('result', queryResult);
}, 8000);

queryResult = expectedResults ? "FAIL" : "PASS";
kb.fetcher = null; // disables resource fetching
kb.query(query, function (result) {
// Result callback
// Indicate pass/fail and style
queryResult = result === expectedResults ? "PASS" : "FAIL";
kb.query(query, function(result) {
// result is an empty array since ASK queries have no bindings
queryResult = Array.isArray(result) === expectedResults ? "PASS" : "FAIL";
}, null, function () {
clearTimeout(timeoutFallback);
that.set('result', queryResult);
});
} else {
// Indicate fail and style
that.set('result', queryResult);
}
// Indicate fail and style
that.set("result", queryResult);
}).fail(function (result) {
// Indicate fail and style
window.console && window.console.log("Error fetching " + sparqlUrl);
window.console && window.console.log("Error fetching " + sparqlUrl + ": " + result);
that.set("result", "error");
});
});
Expand Down Expand Up @@ -267,16 +276,19 @@ window.TestCollection = Backbone.Collection.extend({
run_next: function(test) {
var result = test.get('result');

if (this.running && _.include(["PASS", "FAIL"], result)) {
if (this.running && _.include(["PASS", "FAIL", "error"], result)) {
console.log("test " + test.get('num') + ' completed with ' + result);
this.passed = _.reduce(this.models, function(memo, test) {
return memo + (test.get('result') == "PASS" ? 1 : 0);
}, 0);
this.failed = _.reduce(this.models, function(memo, test) {
return memo + (test.get('result') == "FAIL" ? 1 : 0);
}, 0);
this.errored = _.reduce(this.models, function(memo, test) {
return memo + (test.get('result') == "error" ? 1 : 0);
}, 0);

var total = this.passed + this.failed;
var total = this.passed + this.failed + this.errored;
var next = this.at(total);
if (next) {
console.log("next test: " + next.get('num'));
Expand Down