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:
parent
c792f32514
commit
f6ecc6a95c
6 changed files with 118 additions and 146 deletions
1
Makefile
1
Makefile
|
@ -70,6 +70,7 @@ test: ${JQ}
|
||||||
|
|
||||||
@@echo " - Copying over script files."
|
@@echo " - Copying over script files."
|
||||||
@@cp -fR ${BUILD_DIR}/test/js ${TEST_DIR}/js
|
@@cp -fR ${BUILD_DIR}/test/js ${TEST_DIR}/js
|
||||||
|
@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
|
||||||
|
|
||||||
@@echo " - Compiling Test Cases"
|
@@echo " - Compiling Test Cases"
|
||||||
@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
|
@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
|
||||||
|
|
|
@ -63,6 +63,7 @@
|
||||||
<delete dir="${TEST_DIR}" />
|
<delete dir="${TEST_DIR}" />
|
||||||
<mkdir dir="${TEST_DIR}/tests" />
|
<mkdir dir="${TEST_DIR}/tests" />
|
||||||
<mkdir dir="${TEST_DIR}/js" />
|
<mkdir dir="${TEST_DIR}/js" />
|
||||||
|
<copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
|
||||||
<copy todir="${TEST_DIR}/js">
|
<copy todir="${TEST_DIR}/js">
|
||||||
<fileset dir="${BUILD_DIR}/test/js">
|
<fileset dir="${BUILD_DIR}/test/js">
|
||||||
<include name="**/*.js"/>
|
<include name="**/*.js"/>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<script type="text/javascript" src="js/test.js"></script>
|
<script type="text/javascript" src="js/test.js"></script>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
runTests([{FILES}]);
|
runTest('tests.js');
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<style>.pass { color: green; } .fail { color: red; } #tests ol { display: none; }</style>
|
<style>.pass { color: green; } .fail { color: red; } #tests ol { display: none; }</style>
|
||||||
|
|
|
@ -1,143 +1,121 @@
|
||||||
var queue = [];
|
function runTest(file) {
|
||||||
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;
|
|
||||||
var startTime = new Date();
|
var startTime = new Date();
|
||||||
for( var i=0; i < files.length; i++) {
|
var Test;
|
||||||
runTest( files, i );
|
var stats = {
|
||||||
reset(fixture);
|
all: 0,
|
||||||
}
|
bad: 0
|
||||||
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";
|
|
||||||
};
|
};
|
||||||
li.appendChild( b );
|
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);
|
||||||
|
});
|
||||||
|
|
||||||
li.appendChild( ol );
|
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();
|
||||||
|
|
||||||
document.getElementById("tests").appendChild( li );
|
var good = 0, bad = 0;
|
||||||
|
var ol = document.createElement("ol");
|
||||||
|
|
||||||
blocking = false;
|
var li = "", state = "pass";
|
||||||
process();
|
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) {
|
function ok(a, msg) {
|
||||||
Test.push( [ !!a, msg ] );
|
Test.push( [ !!a, msg ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmpOK( a, c, b, msg ) {
|
/**
|
||||||
var res;
|
* Asserts that two arrays are the same
|
||||||
eval( "res = (a " + c + " b)" );
|
*/
|
||||||
Test.push( [ res, msg ] );
|
|
||||||
}
|
|
||||||
|
|
||||||
function isSet(a, b, msg) {
|
function isSet(a, b, msg) {
|
||||||
var ret = true;
|
var ret = true;
|
||||||
|
|
||||||
if ( a && b && a.length == b.length ) {
|
if ( a && b && a.length == b.length ) {
|
||||||
for ( var i in a )
|
for ( var i in a )
|
||||||
if ( a[i] != b[i] )
|
if ( a[i] != b[i] )
|
||||||
ret = false;
|
ret = false;
|
||||||
} else
|
} else
|
||||||
ret = false;
|
ret = false;
|
||||||
|
|
||||||
if ( !ret && console )
|
if ( !ret && console )
|
||||||
console.log( msg, a, b );
|
console.log( msg, a, b );
|
||||||
|
|
||||||
Test.push( [ ret, msg ] );
|
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() {
|
function q() {
|
||||||
var r = [];
|
var r = [];
|
||||||
|
|
||||||
for ( var i = 0; i < arguments.length; i++ )
|
for ( var i = 0; i < arguments.length; i++ )
|
||||||
r.push( document.getElementById( arguments[i] ) );
|
r.push( document.getElementById( arguments[i] ) );
|
||||||
|
|
||||||
return r;
|
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) {
|
function t(a,b,c) {
|
||||||
var f = jQuery.find(b);
|
var f = jQuery.find(b);
|
||||||
|
|
||||||
var s = "";
|
var s = "";
|
||||||
for ( var i = 0; i < f.length; i++ )
|
for ( var i = 0; i < f.length; i++ )
|
||||||
s += (s && ",") + '"' + f[i].id + '"';
|
s += (s && ",") + '"' + f[i].id + '"';
|
||||||
|
|
||||||
isSet(f, q.apply(q,c), a + " (" + b + ")");
|
isSet(f, q.apply(q,c), a + " (" + b + ")");
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,39 +1,31 @@
|
||||||
load( "build/js/writeFile.js", "build/js/parse.js" );
|
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 dir = arguments[1];
|
||||||
|
|
||||||
var indexFile = readFile( "build/test/index.html" );
|
|
||||||
var testFile = readFile( "build/test/test.html" );
|
|
||||||
|
|
||||||
var jq = parse( readFile( arguments[0] ) );
|
var jq = parse( readFile( arguments[0] ) );
|
||||||
|
|
||||||
var fileList = [];
|
var testFile = [];
|
||||||
var count = 1;
|
|
||||||
|
|
||||||
for ( var i = 0; i < jq.length; i++ ) {
|
for ( var i = 0; i < jq.length; i++ ) {
|
||||||
if ( jq[i].tests.length > 0 ) {
|
if ( jq[i].tests.length > 0 ) {
|
||||||
var name = count + "-" + jq[i].name;
|
var method = jq[i];
|
||||||
if(count < 100) {
|
var name = addParams(method.name, method.params);
|
||||||
name = "0" + name;
|
testFile[testFile.length] = addTestWrapper(name, method.tests.join("\n"));
|
||||||
}
|
|
||||||
if(count < 10) {
|
|
||||||
name = "0" + name;
|
|
||||||
}
|
|
||||||
|
|
||||||
var fileName = "tests/" + name + ".js";
|
|
||||||
|
|
||||||
writeFile( dir + "/" + fileName, jq[i].tests.join("\n") );
|
|
||||||
|
|
||||||
fileList.push( fileName );
|
|
||||||
|
|
||||||
count++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var fileString = "";
|
writeFile( dir + "/tests.js", testFile.join("\n") );
|
||||||
for ( var i = 0; i < fileList.length; i++ ) {
|
|
||||||
if ( fileString ) fileString += ", ";
|
|
||||||
fileString += "'" + fileList[i] + "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
writeFile( dir + "/index.html", indexFile.replace( /{FILES}/g, fileString ) );
|
|
12
src/jquery/jquery.js
vendored
12
src/jquery/jquery.js
vendored
|
@ -203,7 +203,7 @@ jQuery.fn = jQuery.prototype = {
|
||||||
* @before <img src="test1.jpg"/> <img src="test2.jpg"/>
|
* @before <img src="test1.jpg"/> <img src="test2.jpg"/>
|
||||||
* @result 2
|
* @result 2
|
||||||
*
|
*
|
||||||
* @test cmpOK( $("div").length, "==", 2, "Get Number of Elements Found" );
|
* @test ok( $("div").length == 2, "Get Number of Elements Found" );
|
||||||
*
|
*
|
||||||
* @property
|
* @property
|
||||||
* @name length
|
* @name length
|
||||||
|
@ -218,7 +218,7 @@ jQuery.fn = jQuery.prototype = {
|
||||||
* @before <img src="test1.jpg"/> <img src="test2.jpg"/>
|
* @before <img src="test1.jpg"/> <img src="test2.jpg"/>
|
||||||
* @result 2
|
* @result 2
|
||||||
*
|
*
|
||||||
* @test cmpOK( $("div").size(), "==", 2, "Get Number of Elements Found" );
|
* @test ok( $("div").size() == 2, "Get Number of Elements Found" );
|
||||||
*
|
*
|
||||||
* @name size
|
* @name size
|
||||||
* @type Number
|
* @type Number
|
||||||
|
@ -252,7 +252,7 @@ jQuery.fn = jQuery.prototype = {
|
||||||
* @before <img src="test1.jpg"/> <img src="test2.jpg"/>
|
* @before <img src="test1.jpg"/> <img src="test2.jpg"/>
|
||||||
* @result [ <img src="test1.jpg"/> ]
|
* @result [ <img src="test1.jpg"/> ]
|
||||||
*
|
*
|
||||||
* @test cmpOK( $("div").get(0), "==", document.getElementById("main"), "Get A Single Element" );
|
* @test ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" );
|
||||||
*
|
*
|
||||||
* @name get
|
* @name get
|
||||||
* @type Element
|
* @type Element
|
||||||
|
@ -1035,7 +1035,7 @@ jQuery.fn = jQuery.prototype = {
|
||||||
* @example $("p").not("#selected")
|
* @example $("p").not("#selected")
|
||||||
* @before <p>Hello</p><p id="selected">Hello Again</p>
|
* @before <p>Hello</p><p id="selected">Hello Again</p>
|
||||||
* @result [ <p>Hello</p> ]
|
* @result [ <p>Hello</p> ]
|
||||||
* @test cmpOK($("#main > p#ap > a").not("#google").length, "==", 2, ".not")
|
* @test ok($("#main > p#ap > a").not("#google").length == 2, ".not")
|
||||||
*
|
*
|
||||||
* @name not
|
* @name not
|
||||||
* @type jQuery
|
* @type jQuery
|
||||||
|
@ -1549,7 +1549,7 @@ jQuery.extend({
|
||||||
* @test t( "Element Selector", "div", ["main","foo"] );
|
* @test t( "Element Selector", "div", ["main","foo"] );
|
||||||
* @test t( "Element Selector", "body", ["body"] );
|
* @test t( "Element Selector", "body", ["body"] );
|
||||||
* @test t( "Element Selector", "html", ["html"] );
|
* @test t( "Element Selector", "html", ["html"] );
|
||||||
* @test cmpOK( $("*").size(), ">=", 30, "Element Selector" );
|
* @test ok( $("*").size() >= 30, "Element Selector" );
|
||||||
* @test t( "Parent Element", "div div", ["foo"] );
|
* @test t( "Parent Element", "div div", ["foo"] );
|
||||||
*
|
*
|
||||||
* @test t( "ID Selector", "#body", ["body"] );
|
* @test t( "ID Selector", "#body", ["body"] );
|
||||||
|
@ -1606,7 +1606,7 @@ jQuery.extend({
|
||||||
* @test t( "Element Preceded By", "p ~ div", ["foo"] );
|
* @test t( "Element Preceded By", "p ~ div", ["foo"] );
|
||||||
* @test t( "Not", "a.blog:not(.link)", ["mark"] );
|
* @test t( "Not", "a.blog:not(.link)", ["mark"] );
|
||||||
*
|
*
|
||||||
* @test cmpOK( jQuery.find("//*").length, ">=", 30, "All Elements (//*)" );
|
* @test ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
|
||||||
* @test t( "All Div Elements", "//div", ["main","foo"] );
|
* @test t( "All Div Elements", "//div", ["main","foo"] );
|
||||||
* @test t( "Absolute Path", "/html/body", ["body"] );
|
* @test t( "Absolute Path", "/html/body", ["body"] );
|
||||||
* @test t( "Absolute Path w/ *", "/* /body", ["body"] );
|
* @test t( "Absolute Path w/ *", "/* /body", ["body"] );
|
||||||
|
|
Loading…
Reference in a new issue