X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build%2Ftest%2Fjs%2Ftest.js;h=ec6f9c07e09c7cc776add61c0b2f8410a441f268;hb=f6ecc6a95c4046f53d1f0d75af213305c2bd7ea7;hp=3f5030e95c149f4d768b2d2aeab0ca1ae62881a6;hpb=b5220adbbcbb6216af176fa38c626aca53ec8d0f;p=jquery.git
diff --git a/build/test/js/test.js b/build/test/js/test.js
index 3f5030e..ec6f9c0 100644
--- a/build/test/js/test.js
+++ b/build/test/js/test.js
@@ -1,158 +1,121 @@
-var queue = [];
-var blocking = false;
-var fixture;
-
-function reset() {
- if(fixture) {
- $("#main").html(fixture);
- } else {
- fixture = $("#main").html();
- }
-}
-
-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 = null;
- reset();
+function runTest(file) {
var startTime = new Date();
- for( var i=0; i < files.length; i++) {
- runTest( files, i );
- }
- synchronize(function() {
+ var Test;
+ var stats = {
+ all: 0,
+ bad: 0
+ };
+ 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;
- $('body').append('
Tests completed in ' + runTime + ' milliseconds.');
+ var result = document.createElement("div");
+ result.innerHTML = 'Tests completed in ' + runTime + ' milliseconds.
' +
+ stats.bad + ' tests of ' + stats.all + ' failed.';
+ document.getElementsByTagName("body")[0].appendChild(result);
});
-}
-
-function runTest( files, num ) {
- synchronize(function() {
- blocking = true;
- $.get(files[num],function(js){
- js = js.replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&");
- try {
- eval(js);
- } catch(e) {
- if(typeof console != "undefined")
- console.error(e);
- Test.push( [ false, "Died on test #" + (Test.length+1) + ": " + e ] );
+ 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 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 = "", 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 );
+ var li = document.createElement("li");
+ li.className = state;
- if ( !Test[i][0] ) {
- state = "fail";
- bad++;
- } else good++;
- }
+ var b = document.createElement("b");
+ b.innerHTML = name + " (" + bad + ", " + good + ", " + Test.length + ")";
+ 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 );
- var li = document.createElement("li");
- li.className = state;
+ document.getElementById("tests").appendChild( li );
+ }
- var b = document.createElement("b");
- b.innerHTML = files[num] + " (" + bad + ", " + good + ", " + Test.length + ")";
- 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 );
+ function reset() {
+ document.getElementById('main').innerHTML = fixture;
+ }
- li.appendChild( ol );
+ /**
+ * Asserts true.
+ * @example ok( $("a").size() > 5, "There must be at least 5 anchors" );
+ */
+ function ok(a, msg) {
+ Test.push( [ !!a, 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 ] );
+ }
- document.getElementById("tests").appendChild( li );
+ /**
+ * Returns an array of elements with the given IDs, eg.
+ * @example q("main", "foo", "bar")
+ * @result [