X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=build%2Ftest%2Fdata%2Ftestrunner.js;h=25ffb3f27ba13d14081bb14a1b79877404e28285;hb=e3263063e4ef3d2e0ee6b74b9da573bf40e87668;hp=a72a1c17c883b367be73ef3a9d7573791dd4c66c;hpb=b0c3711d3e8bd844d1cfa8569864df1c1f73180a;p=jquery.git
diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
index a72a1c1..25ffb3f 100644
--- a/build/test/data/testrunner.js
+++ b/build/test/data/testrunner.js
@@ -1,91 +1,129 @@
-var asyncTimeout = 2 // seconds for async timeout
-
-var fixture;
-var Test;
-var stats = {
- all: 0,
- bad: 0
+var _config = {
+ fixture: null,
+ Test: [],
+ stats: {
+ all: 0,
+ bad: 0
+ },
+ queue: [],
+ blocking: true,
+ timeout: null,
+ expected: null,
+ currentModule: null,
+ asyncTimeout: 2 // seconds for async timeout
};
-var queue = [];
-var blocking = false;
+
+var isLocal = !!(window.location.protocol == 'file:');
+
+$(function() {
+ $('#userAgent').html(navigator.userAgent);
+ runTest();
+});
function synchronize(callback) {
- queue[queue.length] = callback;
- if(!blocking) {
+ _config.queue[_config.queue.length] = callback;
+ if(!_config.blocking) {
process();
}
}
function process() {
- while(queue.length && !blocking) {
- var call = queue[0];
- queue = queue.slice(1);
+ while(_config.queue.length && !_config.blocking) {
+ var call = _config.queue[0];
+ _config.queue = _config.queue.slice(1);
call();
}
}
-function stop() {
- blocking = true;
- setTimeout(start, asyncTimeout * 1000);
+function stop(allowFailure) {
+ _config.blocking = true;
+ var handler = allowFailure ? start : function() {
+ ok( false, "Test timed out" );
+ start();
+ };
+ // Disabled, caused too many random errors
+ //_config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
}
function start() {
- blocking = false;
- process();
+ // A slight delay, to avoid any current callbacks
+ setTimeout(function(){
+ if(_config.timeout)
+ clearTimeout(_config.timeout);
+ _config.blocking = false;
+ process();
+ }, 13);
}
-function runTest(tests) {
- var startTime = new Date();
- fixture = document.getElementById('main').innerHTML;
- tests();
+function runTest() {
+ _config.blocking = false;
+ var time = new Date();
+ _config.fixture = document.getElementById('main').innerHTML;
synchronize(function() {
- var runTime = new Date() - startTime;
- 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);
+ time = new Date() - time;
+ $("
").html(['
Tests completed in ',
+ time, ' milliseconds.
',
+ _config.stats.bad, ' tests of ', _config.stats.all, ' failed.
']
+ .join(''))
+ .appendTo("body");
+ $("#banner").addClass(_config.stats.bad ? "fail" : "pass");
});
}
-function test(name, callback) {
- Test = [];
+function test(name, callback, nowait) {
+ if(_config.currentModule)
+ name = _config.currentModule + " module: " + name;
+
+ var filter = location.search.slice(1);
+ if ( filter && encodeURIComponent(name) != filter )
+ return;
+
synchronize(function() {
+ _config.Test = [];
try {
callback();
} catch(e) {
- if(typeof console != "undefined") {
+ if( typeof console != "undefined" && console.error && console.warn ) {
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 ] );
+ _config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e ] );
}
});
synchronize(function() {
reset();
+ // don't output pause tests
+ if(nowait) return;
+
+ if(_config.expected && _config.expected != _config.Test.length) {
+ _config.Test.push( [ false, "Expected " + _config.expected + " assertions, but " + _config.Test.length + " were run" ] );
+ }
+ _config.expected = null;
+
var good = 0, bad = 0;
var ol = document.createElement("ol");
-
+ ol.style.display = "none";
var li = "", state = "pass";
- for ( var i = 0; i < Test.length; i++ ) {
+ for ( var i = 0; i < _config.Test.length; i++ ) {
var li = document.createElement("li");
- li.className = Test[i][0] ? "pass" : "fail";
- li.innerHTML = Test[i][1];
+ li.className = _config.Test[i][0] ? "pass" : "fail";
+ li.innerHTML = _config.Test[i][1];
ol.appendChild( li );
- stats.all++;
- if ( !Test[i][0] ) {
+ _config.stats.all++;
+ if ( !_config.Test[i][0] ) {
state = "fail";
bad++;
- stats.bad++;
+ _config.stats.bad++;
} else good++;
}
var li = document.createElement("li");
li.className = state;
- var b = document.createElement("b");
- b.innerHTML = name + "
(" + bad + ", " + good + ", " + Test.length + ")";
+ var b = document.createElement("strong");
+ b.innerHTML = name + "
(" + bad + ", " + good + ", " + _config.Test.length + ")";
b.onclick = function(){
var n = this.nextSibling;
if ( jQuery.css( n, "display" ) == "none" )
@@ -93,6 +131,13 @@ function test(name, callback) {
else
n.style.display = "none";
};
+ $(b).dblclick(function(event) {
+ var target = jQuery(event.target).filter("strong").clone();
+ if ( target.length ) {
+ target.children().remove();
+ location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent($.trim(target.text()));
+ }
+ });
li.appendChild( b );
li.appendChild( ol );
@@ -100,11 +145,23 @@ function test(name, callback) {
});
}
+// call on start of module test to prepend name to all tests
+function module(moduleName) {
+ _config.currentModule = moduleName;
+}
+
+/**
+ * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+ */
+function expect(asserts) {
+ _config.expected = asserts;
+}
+
/**
* Resets the test setup. Useful for tests that modify the DOM.
*/
function reset() {
- document.getElementById('main').innerHTML = fixture;
+ document.getElementById('main').innerHTML = _config.fixture;
}
/**
@@ -112,7 +169,7 @@ function reset() {
* @example ok( $("a").size() > 5, "There must be at least 5 anchors" );
*/
function ok(a, msg) {
- Test.push( [ !!a, msg ] );
+ _config.Test.push( [ !!a, msg ] );
}
/**
@@ -120,15 +177,54 @@ function ok(a, msg) {
*/
function isSet(a, b, msg) {
var ret = true;
- if ( a && b && a.length == b.length ) {
+ if ( a && b && a.length != undefined && a.length == b.length ) {
+ for ( var i = 0; i < a.length; i++ )
+ if ( a[i] != b[i] )
+ ret = false;
+ } else
+ ret = false;
+ if ( !ret )
+ _config.Test.push( [ ret, msg + " expected: " + serialArray(b) + " result: " + serialArray(a) ] );
+ else
+ _config.Test.push( [ ret, msg ] );
+}
+
+/**
+ * Asserts that two objects are equivalent
+ */
+function isObj(a, b, msg) {
+ var ret = true;
+
+ if ( a && b ) {
for ( var i in a )
if ( a[i] != b[i] )
ret = false;
+
+ for ( i in b )
+ if ( a[i] != b[i] )
+ ret = false;
} else
ret = false;
- if ( !ret && console )
- console.log( msg, a, b );
- Test.push( [ ret, msg ] );
+
+ _config.Test.push( [ ret, msg ] );
+}
+
+function serialArray( a ) {
+ var r = [];
+
+ if ( a && a.length )
+ for ( var i = 0; i < a.length; i++ ) {
+ var str = a[i].nodeName;
+ if ( str ) {
+ str = str.toLowerCase();
+ if ( a[i].id )
+ str += "#" + a[i].id;
+ } else
+ str = a[i];
+ r.push( str );
+ }
+
+ return "[ " + r.join(", ") + " ]"
}
/**
@@ -149,9 +245,59 @@ function q() {
* @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 f = jQuery(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
+}
+
+/**
+ * Add random number to url to stop IE from caching
+ *
+ * @example url("data/test.html")
+ * @result "data/test.html?10538358428943"
+ *
+ * @example url("data/test.php?foo=bar")
+ * @result "data/test.php?foo=bar&10538358345554"
+ */
+function url(value) {
+ return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000);
+}
+
+/**
+ * Checks that the first two arguments are equal, with an optional message.
+ * Prints out both expected and actual values on failure.
+ *
+ * Prefered to ok( expected == actual, message )
+ *
+ * @example equals( "Expected 2 characters.", v.formatMessage("Expected {0} characters.", 2) );
+ *
+ * @param Object expected
+ * @param Object actual
+ * @param String message (optional)
+ */
+function equals(actual, expected, message) {
+ var result = expected == actual;
+ message = message || (result ? "okay" : "failed");
+ _config.Test.push( [ result, result ? message + ": " + expected : message + " expected: " + expected + " actual: " + actual ] );
+}
+
+/**
+ * Trigger an event on an element.
+ *
+ * @example triggerEvent( document.body, "click" );
+ *
+ * @param DOMElement elem
+ * @param String type
+ */
+function triggerEvent( elem, type, event ) {
+ if ( jQuery.browser.mozilla || jQuery.browser.opera ) {
+ event = document.createEvent("MouseEvents");
+ event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+ 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+ elem.dispatchEvent( event );
+ } else if ( jQuery.browser.msie ) {
+ elem.fireEvent("on"+type);
+ }
+}