X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=build%2Ftest%2Fjs%2Ftest.js;h=ec6f9c07e09c7cc776add61c0b2f8410a441f268;hb=f6ecc6a95c4046f53d1f0d75af213305c2bd7ea7;hp=d478b63678da7a7f96eda6150975f7ce25ff1e25;hpb=c792f325142ad928a1bf3263b5958cc01ea1a936;p=jquery.git

diff --git a/build/test/js/test.js b/build/test/js/test.js
index d478b63..ec6f9c0 100644
--- a/build/test/js/test.js
+++ b/build/test/js/test.js
@@ -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 Test;
+	var stats = {
+		all: 0,
+		bad: 0
+	};
+	var fixture = document.getElementById('main').innerHTML;
+	$.get(file,function(js) {
+		js = js.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+		eval(js);
 		var runTime = new Date() - startTime;
-		// lets use jQuery for this, its not important anyway
-		$('body').append('<br/>Tests completed in ' + runTime + ' milliseconds.');
+		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 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(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
 	
-	try {
-		eval(js);
-	} catch(e) {
-		if(typeof console != "undefined") {
-			console.error(e);
-			console.debug(js);
+	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 ] );
 		}
-		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++ ) {
+		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 = 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 );
-
-	li.appendChild( ol );
-
-	document.getElementById("tests").appendChild( li );
-
-	blocking = false;
-	process();
+		li.className = state;
 	
-	function ok(a, msg) {
-		Test.push( [ !!a, msg ] );
+		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 cmpOK( a, c, b, msg ) {
-		var res;
-		eval( "res = (a " + c + " b)" );
-		Test.push( [ res, msg ] );
+	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 ] );
+	}
+
+	/**
+	 * 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 + ")");
 	}
-}
\ No newline at end of file
+}