Refactored test suite: All tests are now compiled into one file, runs much faster and does not require ugly synchronization; Changed build.xml (tested) and Makefile (not tested!); Replaced calls to cmpOK() with ok(), removed cmpOK(); Tests can now call reset() to be able to always test against the unmodified test setup
This commit is contained in:
Jörn Zaefferer
parent
c792f32514
commit
f6ecc6a95c
6 changed files with 118 additions and 146 deletions
|
|
@ -4,7 +4,7 @@
|
|||
<script type="text/javascript" src="js/test.js"></script>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
runTests([{FILES}]);
|
||||
runTest('tests.js');
|
||||
});
|
||||
</script>
|
||||
<style>.pass { color: green; } .fail { color: red; } #tests ol { display: none; }</style>
|
||||
|
|
|
|||
|
|
@ -1,143 +1,121 @@
|
|||
var queue = [];
|
||||
var blocking = false;
|
||||
|
||||
function reset(fixture) {
|
||||
synchronize(function() {
|
||||
document.getElementById('main').innerHTML = fixture;
|
||||
});
|
||||
}
|
||||
|
||||
function synchronize(callback) {
|
||||
queue[queue.length] = callback;
|
||||
if(!blocking) {
|
||||
process();
|
||||
}
|
||||
}
|
||||
|
||||
function process() {
|
||||
while(queue.length && !blocking) {
|
||||
var call = queue[0];
|
||||
queue = queue.slice(1);
|
||||
call();
|
||||
}
|
||||
}
|
||||
|
||||
function runTests(files) {
|
||||
var fixture = document.getElementById('main').innerHTML;
|
||||
function runTest(file) {
|
||||
var startTime = new Date();
|
||||
for( var i=0; i < files.length; i++) {
|
||||
runTest( files, i );
|
||||
reset(fixture);
|
||||
}
|
||||
synchronize(function() {
|
||||
var runTime = new Date() - startTime;
|
||||
// lets use jQuery for this, its not important anyway
|
||||
$('body').append('<br/>Tests completed in ' + runTime + ' milliseconds.');
|
||||
});
|
||||
}
|
||||
|
||||
function runTest( files, num ) {
|
||||
synchronize(function() {
|
||||
blocking = true;
|
||||
$.get(files[num],function(js) {
|
||||
evaluateTest(files, num, js);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function evaluateTest(files, num, js) {
|
||||
var Test = [];
|
||||
js = js.replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&");
|
||||
|
||||
try {
|
||||
eval(js);
|
||||
} catch(e) {
|
||||
if(typeof console != "undefined") {
|
||||
console.error(e);
|
||||
console.debug(js);
|
||||
}
|
||||
Test.push( [ false, "Died on test #" + (Test.length+1) + ": " + e ] );
|
||||
}
|
||||
|
||||
var good = 0, bad = 0;
|
||||
var ol = document.createElement("ol");
|
||||
|
||||
var li = "", state = "pass";
|
||||
for ( var i = 0; i < Test.length; i++ ) {
|
||||
var li = document.createElement("li");
|
||||
li.className = Test[i][0] ? "pass" : "fail";
|
||||
li.innerHTML = Test[i][1];
|
||||
ol.appendChild( li );
|
||||
|
||||
if ( !Test[i][0] ) {
|
||||
state = "fail";
|
||||
bad++;
|
||||
} else good++;
|
||||
}
|
||||
|
||||
var li = document.createElement("li");
|
||||
li.className = state;
|
||||
|
||||
var b = document.createElement("b");
|
||||
b.innerHTML = files[num] + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + Test.length + ")</b>";
|
||||
b.onclick = function(){
|
||||
var n = this.nextSibling;
|
||||
if ( jQuery.css( n, "display" ) == "none" )
|
||||
n.style.display = "block";
|
||||
else
|
||||
n.style.display = "none";
|
||||
var Test;
|
||||
var stats = {
|
||||
all: 0,
|
||||
bad: 0
|
||||
};
|
||||
li.appendChild( b );
|
||||
|
||||
li.appendChild( ol );
|
||||
|
||||
document.getElementById("tests").appendChild( li );
|
||||
|
||||
blocking = false;
|
||||
process();
|
||||
var fixture = document.getElementById('main').innerHTML;
|
||||
$.get(file,function(js) {
|
||||
js = js.replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&");
|
||||
eval(js);
|
||||
var runTime = new Date() - startTime;
|
||||
var result = document.createElement("div");
|
||||
result.innerHTML = 'Tests completed in ' + runTime + ' milliseconds.<br/>' +
|
||||
stats.bad + ' tests of ' + stats.all + ' failed.';
|
||||
document.getElementsByTagName("body")[0].appendChild(result);
|
||||
});
|
||||
|
||||
function test(name, callback) {
|
||||
Test = [];
|
||||
try {
|
||||
callback();
|
||||
} catch(e) {
|
||||
if(typeof console != "undefined") {
|
||||
console.error("Test " + name + " died, exception and test follows");
|
||||
console.error(e);
|
||||
console.warn(callback.toString());
|
||||
}
|
||||
Test.push( [ false, "Died on test #" + (Test.length+1) + ": " + e ] );
|
||||
}
|
||||
reset();
|
||||
|
||||
var good = 0, bad = 0;
|
||||
var ol = document.createElement("ol");
|
||||
|
||||
var li = "", state = "pass";
|
||||
for ( var i = 0; i < Test.length; i++ ) {
|
||||
var li = document.createElement("li");
|
||||
li.className = Test[i][0] ? "pass" : "fail";
|
||||
li.innerHTML = Test[i][1];
|
||||
ol.appendChild( li );
|
||||
|
||||
stats.all++;
|
||||
if ( !Test[i][0] ) {
|
||||
state = "fail";
|
||||
bad++;
|
||||
stats.bad++;
|
||||
} else good++;
|
||||
}
|
||||
|
||||
var li = document.createElement("li");
|
||||
li.className = state;
|
||||
|
||||
var b = document.createElement("b");
|
||||
b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + Test.length + ")</b>";
|
||||
b.onclick = function(){
|
||||
var n = this.nextSibling;
|
||||
if ( jQuery.css( n, "display" ) == "none" )
|
||||
n.style.display = "block";
|
||||
else
|
||||
n.style.display = "none";
|
||||
};
|
||||
li.appendChild( b );
|
||||
li.appendChild( ol );
|
||||
|
||||
document.getElementById("tests").appendChild( li );
|
||||
}
|
||||
|
||||
function reset() {
|
||||
document.getElementById('main').innerHTML = fixture;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts true.
|
||||
* @example ok( $("a").size() > 5, "There must be at least 5 anchors" );
|
||||
*/
|
||||
function ok(a, msg) {
|
||||
Test.push( [ !!a, msg ] );
|
||||
}
|
||||
|
||||
function cmpOK( a, c, b, msg ) {
|
||||
var res;
|
||||
eval( "res = (a " + c + " b)" );
|
||||
Test.push( [ res, msg ] );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Asserts that two arrays are the same
|
||||
*/
|
||||
function isSet(a, b, msg) {
|
||||
var ret = true;
|
||||
|
||||
if ( a && b && a.length == b.length ) {
|
||||
for ( var i in a )
|
||||
if ( a[i] != b[i] )
|
||||
ret = false;
|
||||
} else
|
||||
ret = false;
|
||||
|
||||
if ( !ret && console )
|
||||
console.log( msg, a, b );
|
||||
|
||||
Test.push( [ ret, msg ] );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an array of elements with the given IDs, eg.
|
||||
* @example q("main", "foo", "bar")
|
||||
* @result [<div id="main">, <span id="foo">, <input id="bar">]
|
||||
*/
|
||||
function q() {
|
||||
var r = [];
|
||||
|
||||
for ( var i = 0; i < arguments.length; i++ )
|
||||
r.push( document.getElementById( arguments[i] ) );
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that a select matches the given IDs
|
||||
* @example t("Check for something", "//[a]", ["foo", "baar"]);
|
||||
* @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar'
|
||||
*/
|
||||
function t(a,b,c) {
|
||||
var f = jQuery.find(b);
|
||||
|
||||
var s = "";
|
||||
for ( var i = 0; i < f.length; i++ )
|
||||
s += (s && ",") + '"' + f[i].id + '"';
|
||||
|
||||
isSet(f, q.apply(q,c), a + " (" + b + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,31 @@
|
|||
load( "build/js/writeFile.js", "build/js/parse.js" );
|
||||
|
||||
function addParams(name, params) {
|
||||
if(params.length > 0) {
|
||||
name += "(";
|
||||
for ( var i = 0; i < params.length; i++) {
|
||||
name += params[i].type + ", ";
|
||||
}
|
||||
return name.substring(0, name.length - 2) + ")";
|
||||
} else {
|
||||
return name + "()";
|
||||
}
|
||||
}
|
||||
function addTestWrapper(name, test) {
|
||||
return 'test("' + name + '", function() {\n' + test + '\n});';
|
||||
}
|
||||
|
||||
var dir = arguments[1];
|
||||
|
||||
var indexFile = readFile( "build/test/index.html" );
|
||||
var testFile = readFile( "build/test/test.html" );
|
||||
|
||||
var jq = parse( readFile( arguments[0] ) );
|
||||
|
||||
var fileList = [];
|
||||
var count = 1;
|
||||
var testFile = [];
|
||||
|
||||
for ( var i = 0; i < jq.length; i++ ) {
|
||||
if ( jq[i].tests.length > 0 ) {
|
||||
var name = count + "-" + jq[i].name;
|
||||
if(count < 100) {
|
||||
name = "0" + name;
|
||||
}
|
||||
if(count < 10) {
|
||||
name = "0" + name;
|
||||
}
|
||||
|
||||
var fileName = "tests/" + name + ".js";
|
||||
|
||||
writeFile( dir + "/" + fileName, jq[i].tests.join("\n") );
|
||||
|
||||
fileList.push( fileName );
|
||||
|
||||
count++;
|
||||
var method = jq[i];
|
||||
var name = addParams(method.name, method.params);
|
||||
testFile[testFile.length] = addTestWrapper(name, method.tests.join("\n"));
|
||||
}
|
||||
}
|
||||
|
||||
var fileString = "";
|
||||
for ( var i = 0; i < fileList.length; i++ ) {
|
||||
if ( fileString ) fileString += ", ";
|
||||
fileString += "'" + fileList[i] + "'";
|
||||
}
|
||||
|
||||
writeFile( dir + "/index.html", indexFile.replace( /{FILES}/g, fileString ) );
|
||||
writeFile( dir + "/tests.js", testFile.join("\n") );
|
||||
Loading…
Add table
Add a link
Reference in a new issue