@@ -3,400 +3,408 @@ * http://license.appcelerator.com for full copy of the License. **/ - -$(document).ready(function() +(function($) { - var testCount = 0; - var suiteCount = 0; - var cellWidth = 0; - - // processing vars - var currentAssertion = 0; - var currentSuite = 1; - - // counts - var failureCount = 0; - var passedCount = 0; - var errorCount = 0; - - function resetStats() - { - testCount = 0; - suiteCount = 0; - failureCount = 0; - passedCount = 0; - errorCount = 0; - - $('#status_bar').empty(); - $("#results").empty(); - } - - // keyboard shortcuts - $(document).bind('keydown',function(e) + + $(document).ready(function() { - if (e.keyCode == 37 || e.keyCode==39) + var testCount = 0; + var suiteCount = 0; + var cellWidth = 0; + + // processing vars + var currentAssertion = 0; + var currentSuite = 1; + + // counts + var failureCount = 0; + var passedCount = 0; + var errorCount = 0; + + function resetStats() { - // left - var select = $("#selector select").get(0); - var idx = select.selectedIndex; - switch(e.keyCode) + testCount = 0; + suiteCount = 0; + failureCount = 0; + passedCount = 0; + errorCount = 0; + + $('#status_bar').empty(); + $("#results").empty(); + } + + // keyboard shortcuts + swiss(document).on('keydown',function(e) + { + if (e.keyCode == 37 || e.keyCode==39) { - case 37: - { - idx-=1; - break; - } - case 39: + // left + var select = $("#selector select").get(0); + var idx = select.selectedIndex; + switch(e.keyCode) { - idx+=1; - break; + case 37: + { + idx-=1; + break; + } + case 39: + { + idx+=1; + break; + } } + if (idx < 0) idx = select.options.length-1; + if (idx > select.options.length-1) idx = 0; + select.selectedIndex = idx; + return false; } - if (idx < 0) idx = select.options.length-1; - if (idx > select.options.length-1) idx = 0; - select.selectedIndex = idx; - return false; - } - else if (e.keyCode == 82) + else if (e.keyCode == 82) + { + if (e.metaKey || e.ctrlKey) return; // command+r is reload, ignore these + // run is 'r' or runall is 'shift+r' + var id = "#run" + (e.shiftKey ? "all":""); + $(id).click(); + return false; + } + }); + + $.getJSON(App.docRoot + 'tests/manifest.js',function(json) { - if (e.metaKey || e.ctrlKey) return; // command+r is reload, ignore these - // run is 'r' or runall is 'shift+r' - var id = "#run" + (e.shiftKey ? "all":""); - $(id).click(); - return false; - } - }); - - var lastSuite = null; - $.getJSON(AppC.docRoot+'tests/manifest.js',function(json) - { - $.each(json.suites,function(i) - { - $.getScript(AppC.docRoot+'tests/'+this, function() { - if (i == json.suites.length - 1) { - TestMonkey.fireEventAsync('manifestLoaded'); - } + $.each(json.suites,function() + { + $.getScript(App.docRoot + 'tests/'+this); }); }); - }); - - $("#run").on("click",function() - { - var test = $("#selector select").val(); - $.cookie('testmonkey.test',test); // remember the last test we ran - testRunner(test); - }); - $("#runall").on("click",function() - { - var select = $("#selector select").get(0); - var tests = []; - for (var c=0;c<select.length;c++) + $("#run").click(function() { - tests.push(select.options[c].text); - } - testRunner(tests); - }); - - function leadingWhitepsace(code) - { - var count = 0; - var spacing = ''; - while (true) + resetStats(); + $('#test_summary_title').show(); + var test = $("#selector select").val(); + //$.cookie('testmonkey.test',test); // remember the last test we ran + testRunner(test); + }); + + $("#runall").click(function() { - var ch = code.charAt(count); - if (ch != ' ') + resetStats(); + $('#test_summary_title').show(); + var select = $("#selector select").get(0); + var tests = []; + for (var c=0;c<select.length;c++) { - break; + tests.push(select.options[c].text); } - count++; - spacing+=' '; - } - return spacing; - } - - var idCounter = 1; - TestMonkey.installTestRunnerPlugin({ - onEvent: function(name,result) + testRunner(tests); + }); + + function leadingWhitepsace(code) { - switch(name) + var count = 0; + var spacing = ''; + while (true) { - case 'addTestSuite': + var ch = code.charAt(count); + if (ch != ' ') { - var lastTest = $.cookie('testmonkey.test'); - var sel = ''; - if (lastTest == result) sel = 'selected'; - - $("#selector select").append("<option "+sel+">"+result+"</option>"); - break; } - case 'beforeTestSuite': - { - break; - } - case 'afterAssertionCount': - { - // set assertion count total - $('#assert_count').html(result) - - // display - $('#summary').css('display','block') - - // reset - $('#status_bar').empty(); - currentAssertion = 0; - currentSuite = 1; - - // calculate cell width and pre-populate - var width = $('#status_bar').width(); - var totalCellWidth = (width -20) /result; - cellWidth = totalCellWidth - 5; + count++; + spacing+=' '; + } + return spacing; + } - for (var i=0;i<result;i++) + var idCounter = 1; + TestMonkey.installTestRunnerPlugin({ + onEvent: function(name,result) + { + switch(name) + { + case 'addTestSuite': { - $('#status_bar').append('<div id="assert_bar_'+i+'" style="float:left;background-color:#ccc;margin-left:5px;height:15px;width:'+cellWidth+'px"></div>'); + // var lastTest = $.cookie('testmonkey.test'); + var sel = ''; + // if (lastTest == result) sel = 'selected'; + $("#selector select").append("<option "+sel+">"+result+"</option>"); + break; } - break; - } - case 'afterTestRunner': - { - $(".testdetail").click(function() + case 'beforeTestSuite': { - var child = $(this).children('.result'); - $(child).css('display') == 'none' ? $(child).slideDown() : $(child).slideUp(); - }); - break; - } - case 'beforeTestRunner': - { - resetStats(); - $('#test_summary_title').show(); - - suiteCount = result.length; - $('#suite_count').html(suiteCount); - for (var i=0;i<suiteCount;i++) + break; + } + case 'afterAssertionCount': { - $("#results").append("<div id='testsuite_"+ (i+1) +"' class='testsuite'><div class='test_count' id='passed_count_" + (i+1) + "'>0</div><div class='test_count' id='failed_count_" + (i+1) + "'>0</div><div class='test_count' id='error_count_" + (i+1) + "'>0</div><div class='testsuite_name'><a href='#' id='testsuite_detail_link_"+(i+1)+"'>"+result[i][0]+"</a></div><div style='clear:both;padding-top:20px;' id='testsuite_detail_"+(i+1)+"'><div id='testsuite_detail_error_"+(i+1)+"' style='display:none'></div><div id='testsuite_detail_failed_"+(i+1)+"' style='display:none'></div><div id='testsuite_detail_passed_"+(i+1)+"' style='display:none;'></div><div id='testsuite_detail_all_"+(i+1)+"' style='display:none;'></div></div></div>"); + // set assertion count total + $('#assert_count').html(result) + + // display + $('#summary').css('display','block') + + // reset + $('#status_bar').empty(); + currentAssertion = 0; + currentSuite = 1; - $('#testsuite_detail_link_' + (i+1)).click(function() + // calculate cell width and pre-populate + var width = $('#status_bar').width(); + var totalCellWidth = (width -20) /result; + cellWidth = totalCellWidth - 5; + if (result < 100) { - var suite = this.id.substring(this.id.length-1) - var el = $('#testsuite_detail_all_' + suite); - var errorDiv = $('#testsuite_detail_error_' + suite); - var failedDiv = $('#testsuite_detail_failed_' + suite); - var passedDiv = $('#testsuite_detail_passed_' + suite); - if (el.css('display') == 'block') + $('#status_bar').show(); + $('#status_bar_title').show(); + for (var i=0;i<result;i++) { - el.slideUp() + $('#status_bar').append('<div id="assert_bar_'+i+'" style="float:left;background-color:#ccc;margin-left:5px;height:15px;width:'+cellWidth+'px"></div>'); } - else - { - el.slideDown(); - errorDiv.slideUp(); - failedDiv.slideUp(); - passedDiv.slideUp(); - } + + } + else + { + $('#status_bar').hide(); + $('#status_bar_title').hide(); + } + break; + } + case 'afterTestRunner': + { + $(".testdetail").click(function() + { + var child = $(this).children('.result'); + $(child).css('display') == 'none' ? $(child).slideDown() : $(child).slideUp(); }); - - $('#passed_count_' + (i+1)).click(function() + break; + } + case 'beforeTestRunner': + { + suiteCount = result.length; + $('#suite_count').html(suiteCount); + for (var i=0;i<suiteCount;i++) { - var suite = this.id.substring(this.id.length-1) - var el = $('#testsuite_detail_passed_' + suite); - var errorDiv = $('#testsuite_detail_error_' + suite); - var failedDiv = $('#testsuite_detail_failed_' + suite); - var all = $('#testsuite_detail_all_' + suite); - if (el.css('display') == 'block') + $("#results").append("<div id='testsuite_"+ (i+1) +"' class='testsuite'><div class='test_count' id='passed_count_" + (i+1) + "'>0</div><div class='test_count' id='failed_count_" + (i+1) + "'>0</div><div class='test_count' id='error_count_" + (i+1) + "'>0</div><div class='testsuite_name'><a href='#' id='testsuite_detail_link_"+(i+1)+"'>"+result[i][0]+"</a></div><div style='clear:both;padding-top:20px;' id='testsuite_detail_"+(i+1)+"'><div id='testsuite_detail_error_"+(i+1)+"' style='display:none'></div><div id='testsuite_detail_failed_"+(i+1)+"' style='display:none'></div><div id='testsuite_detail_passed_"+(i+1)+"' style='display:none;'></div><div id='testsuite_detail_all_"+(i+1)+"' style='display:none;'></div></div></div>"); + + $('#testsuite_detail_link_' + (i+1)).click(function() { - el.slideUp(); - } - else + var suite = this.id.substring(this.id.length-1) + var el = $('#testsuite_detail_all_' + suite); + var errorDiv = $('#testsuite_detail_error_' + suite); + var failedDiv = $('#testsuite_detail_failed_' + suite); + var passedDiv = $('#testsuite_detail_passed_' + suite); + if (el.css('display') == 'block') + { + el.slideUp() + } + else + { + el.slideDown(); + errorDiv.slideUp(); + failedDiv.slideUp(); + passedDiv.slideUp(); + } + }); + + $('#passed_count_' + (i+1)).click(function() { - el.slideDown(); - errorDiv.slideUp(); - failedDiv.slideUp(); - all.slideUp(); - } - }); - $('#failed_count_' + (i+1)).click(function() - { - var suite = this.id.substring(this.id.length-1) - var el = $('#testsuite_detail_failed_' + suite); - var errorDiv = $('#testsuite_detail_error_' + suite); - var passedDiv = $('#testsuite_detail_passed_' + suite); - var all = $('#testsuite_detail_all_' + suite); - if (el.css('display') == 'block') + var suite = this.id.substring(this.id.length-1) + var el = $('#testsuite_detail_passed_' + suite); + var errorDiv = $('#testsuite_detail_error_' + suite); + var failedDiv = $('#testsuite_detail_failed_' + suite); + var all = $('#testsuite_detail_all_' + suite); + if (el.css('display') == 'block') + { + el.slideUp(); + } + else + { + el.slideDown(); + errorDiv.slideUp(); + failedDiv.slideUp(); + all.slideUp(); + } + }); + $('#failed_count_' + (i+1)).click(function() { - el.slideUp(); - } - else + var suite = this.id.substring(this.id.length-1) + var el = $('#testsuite_detail_failed_' + suite); + var errorDiv = $('#testsuite_detail_error_' + suite); + var passedDiv = $('#testsuite_detail_passed_' + suite); + var all = $('#testsuite_detail_all_' + suite); + if (el.css('display') == 'block') + { + el.slideUp(); + } + else + { + el.slideDown(); + errorDiv.slideUp(); + passedDiv.slideUp(); + all.slideUp(); + } + + }); + $('#error_count_' + (i+1)).click(function() { - el.slideDown(); - errorDiv.slideUp(); - passedDiv.slideUp(); - all.slideUp(); - } + var suite = this.id.substring(this.id.length-1) + var el = $('#testsuite_detail_error_' + suite); + var passedDiv = $('#testsuite_detail_passed_' + suite); + var failedDiv = $('#testsuite_detail_failed_' + suite); + var all = $('#testsuite_detail_all_' + suite); + if (el.css('display') == 'block') + { + el.slideUp() + } + else + { + el.slideDown(); + failedDiv.slideUp(); + passedDiv.slideUp(); + all.slideUp(); + } - }); - $('#error_count_' + (i+1)).click(function() + }); + } + break; + } + case 'beforeTestCases': + { + testCount = result.length; + $('#test_count').html(result.length); + break; + } + case 'afterTestSuite': + { + currentSuite++; + failureCount = 0; + passedCount = 0; + errorCount = 0; + + break; + } + case 'afterTestCase': + { + try { - var suite = this.id.substring(this.id.length-1) - var el = $('#testsuite_detail_error_' + suite); - var passedDiv = $('#testsuite_detail_passed_' + suite); - var failedDiv = $('#testsuite_detail_failed_' + suite); - var all = $('#testsuite_detail_all_' + suite); - if (el.css('display') == 'block') + var errorMessage = result.testcase; + var failedCount = 0; + $.each(result.results,function() + { + failedCount +=this.result ? 0 : 1; + var cls = this.result ? 'passed' : 'failed'; + var idx = errorMessage.indexOf(this.assert); + if (this.error) + { + errorCount++; + $('#error_count_'+currentSuite).html(errorCount).addClass('error_count'); + $('#assert_bar_' + currentAssertion).css('background-color','red'); + } + else if (cls=='passed') + { + passedCount++ + $('#passed_count_'+currentSuite).html(passedCount).addClass('passed_count'); + $('#assert_bar_' + currentAssertion).css('background-color','green'); + } + else + { + failureCount++ + $('#failed_count_'+currentSuite).html(failureCount).addClass('failed_count'); + $('#assert_bar_' + currentAssertion).css('background-color','orange'); + } + currentAssertion++; + if (idx != -1) + { + var newMessage = errorMessage.substring(0,idx); + var line = errorMessage.substring(idx,idx+this.assert.length); + newMessage+=leadingWhitepsace(line); + newMessage+='<span class="'+cls+'">'; + newMessage+=$.trim(line); + newMessage+='</span>'; + if (this.error) + { + newMessage+='<span class="error">'+this.error+'</span>'; + } + else if (!this.result && this.message) + { + newMessage+='<span class="error">'+this.message+'</span>'; + } + newMessage+=errorMessage.substring(idx+this.assert.length); + errorMessage = newMessage; + } + }); + if (result.explicitFailure) { - el.slideUp() + if (failedCount==0) failedCount=1; + var re = /fail[\s]?\((.*)?\)/; + var matches = []; + errorMessage=$.gsub(errorMessage,re,function(m) + { + if (m[0].indexOf(result.message) > 0) + { + matches.push(extractCodeLine(errorMessage,m[0])); + } + return m[0]; + }); + $.each(matches,function() + { + var idx = errorMessage.indexOf(this); + var newMessage = errorMessage.substring(0,idx); + var line = errorMessage.substring(idx,idx+this.length); + newMessage+=leadingWhitepsace(line); + newMessage+='<span class="failed">'; + newMessage+=$.trim(line); + newMessage+='</span>'; + newMessage+=errorMessage.substring(idx+this.length); + errorMessage=newMessage; + }); } - else + if (typeof(result.timeout)!='undefined') { - el.slideDown(); - failedDiv.slideUp(); - passedDiv.slideUp(); - all.slideUp(); - } - - }); - } - break; - } - case 'beforeTestCases': - { - testCount = result.length; - $('#test_count').html(result.length); - break; - } - case 'afterTestSuite': - { - currentSuite++; - failureCount = 0; - passedCount = 0; - errorCount = 0; - - break; - } - case 'afterTestCase': - { - try - { - var errorMessage = result.testcase; - var failedCount = 0; - $.each(result.results,function() - { - failedCount +=this.result ? 0 : 1; - var cls = this.result ? 'passed' : 'failed'; - var idx = errorMessage.indexOf(this.assert); - if (this.error) + errorMessage = 'testAsync("' + result.name + '",'+result.timeout+',<span class="fn">'+errorMessage+'</span>);' + } + else { - errorCount++; - $('#error_count_'+currentSuite).html(errorCount).addClass('error_count'); - $('#assert_bar_' + currentAssertion).css('background-color','red'); + errorMessage = 'test("' + result.name + '",<span class="fn">'+errorMessage+'</span>);' } - else if (cls=='passed') + var id = idCounter++; + var html = "<div class='testdetail'><div class='testresult "+(result.failed?'failed':'passed')+"'>"+(result.error ? 'Error' : result.failed?('Failed <span class="count">('+failedCount+')</span>'):'Passed')+"</div><div>"+result.name+"</div><div class='clear'></div>"; + html+="<div style='display:none' class='result "+(result.error?'error':'')+"'>"; + html+=errorMessage; + if (result.error) { - passedCount++ - $('#passed_count_'+currentSuite).html(passedCount).addClass('passed_count'); - $('#assert_bar_' + currentAssertion).css('background-color','green'); + html+="<div class='error_msg'>" + result.error + "</div>"; } - else + if (result.logs) { - failureCount++ - $('#failed_count_'+currentSuite).html(failureCount).addClass('failed_count'); - $('#assert_bar_' + currentAssertion).css('background-color','orange'); + html+="<div class='logs'><h1>Test log results:</h1>" + result.logs.join("\n") + "</div>"; } - currentAssertion++; - if (idx != -1) + html+='<div class="html"><h1>HTML page (after test):</h1><pre><code>'+result.after_dom+'</code></pre></div>'; + html+="</div></div>"; + + $('#testsuite_detail_all_'+currentSuite).append(html) + if (result.error) { - var newMessage = errorMessage.substring(0,idx); - var line = errorMessage.substring(idx,idx+this.assert.length); - newMessage+=leadingWhitepsace(line); - newMessage+='<span class="'+cls+'">'; - newMessage+=$.trim(line); - newMessage+='</span>'; - if (this.error) - { - newMessage+='<span class="error">'+this.error+'</span>'; - } - else if (!this.result && this.message) - { - newMessage+='<span class="error">'+this.message+'</span>'; - } - newMessage+=errorMessage.substring(idx+this.assert.length); - errorMessage = newMessage; + $('#testsuite_detail_error_' + currentSuite).append(html) } - }); - if (result.explicitFailure) - { - if (failedCount==0) failedCount=1; - var re = /fail[\s]?\((.*)?\)/; - var matches = []; - errorMessage=$.gsub(errorMessage,re,function(m) + else if (result.failed) { - if (m[0].indexOf(result.message) > 0) - { - matches.push(extractCodeLine(errorMessage,m[0])); - } - return m[0]; - }); - $.each(matches,function() + $('#testsuite_detail_failed_' + currentSuite).append(html) + } + else { - var idx = errorMessage.indexOf(this); - var newMessage = errorMessage.substring(0,idx); - var line = errorMessage.substring(idx,idx+this.length); - newMessage+=leadingWhitepsace(line); - newMessage+='<span class="failed">'; - newMessage+=$.trim(line); - newMessage+='</span>'; - newMessage+=errorMessage.substring(idx+this.length); - errorMessage=newMessage; - }); - } - if (typeof(result.timeout)!='undefined') - { - errorMessage = 'testAsync("' + result.name + '",'+result.timeout+',<span class="fn">'+errorMessage+'</span>);' - } - else - { - errorMessage = 'test("' + result.name + '",<span class="fn">'+errorMessage+'</span>);' - } - var id = idCounter++; - var html = "<div class='testdetail'><div class='testresult "+(result.failed?'failed':'passed')+"'>"+(result.error ? 'Error' : result.failed?('Failed <span class="count">('+failedCount+')</span>'):'Passed')+"</div><div>"+result.name+"</div><div class='clear'></div>"; - html+="<div style='display:none' class='result "+(result.error?'error':'')+"'>"; - html+=errorMessage; - if (result.error) - { - html+="<div class='error_msg'>" + result.error + "</div>"; - } - if (result.logs) - { - html+="<div class='logs'><h1>Test log results:</h1>" + result.logs.join("\n") + "</div>"; - } - html+='<div class="html"><h1>HTML page (after test):</h1><pre><code>'+$.escapeHTML(result.after_dom)+'</code></pre></div>'; - html+="</div></div>"; - - $('#testsuite_detail_all_'+currentSuite).append(html) - if (result.error) - { - $('#testsuite_detail_error_' + currentSuite).append(html) - } - else if (result.failed) - { - $('#testsuite_detail_failed_' + currentSuite).append(html) + $('#testsuite_detail_passed_' + currentSuite).append(html) + } } - else + catch (E) { - $('#testsuite_detail_passed_' + currentSuite).append(html) + App.Util.Logger.error(E); } + break; } - catch (E) - { - $.error(E); - } - break; } } - } + }); }); -}); + +})(jQuery) public/javascripts/driver.js @@ -14,7 +14,7 @@ window.TestMonkey = {}; AppC.config.report_stats=false; } - var testRunnerPlugins = []; + var testRunnerPlugin = null; /** * the plugin is responsible for driving the UI and doing @@ -24,7 +24,7 @@ window.TestMonkey = {}; */ TestMonkey.installTestRunnerPlugin = function(callback) { - testRunnerPlugins.push(callback); + testRunnerPlugin = callback; }; var assertions = {}; @@ -45,6 +45,10 @@ window.TestMonkey = {}; { return runAssertion(args[0]); }); + TestMonkey.installAssertionType('After',function(win,frame,testcase,assertion,args) + { + return runAssertion(args[0]); + }); TestMonkey.installAssertionType('Visible',function(win,frame,testcase,assertion,args) { @@ -142,7 +146,7 @@ window.TestMonkey = {}; } if (!lastPubData) { - return [false,name+" missing data payload: "+$.toJSON(data)]; + return [false,name+" missing data payload: "+swiss.toJSON(data)]; } if (data) { @@ -159,15 +163,14 @@ window.TestMonkey = {}; } } } - return [true,name+'=>'+$.toJSON(data)]; + return [true,name+'=>'+swiss.toJSON(data)]; }); - TestMonkey.fireEvent = function() + function fireEvent() { - var name = arguments[0], args = arguments.length > 1 ? $.makeArray(arguments).slice(1) : []; - $.each(testRunnerPlugins, function() + if (testRunnerPlugin) { - var testRunnerPlugin = this; + var name = arguments[0], args = arguments.length > 1 ? $.makeArray(arguments).slice(1) : []; var fn = testRunnerPlugin[name]; if (fn) { @@ -180,32 +183,7 @@ window.TestMonkey = {}; args.unshift(name); fn.apply(testRunnerPlugin,args); } - else - { - fn = testRunnerPlugin['on' + name.substring(0,1).toUpperCase() + name.substring(1)]; - if (fn) { - fn.apply(testRunnerPlugin, args); - } - } - }); - } - - TestMonkey.fireEventAsync = function() - { - var timeout = 1000; - var args = []; - if (arguments.length > 0) { - if (typeof(arguments[0]) == 'number') { - timeout = arguments[0]; - args = $.makeArray(arguments).slice(1); - } else { - args = $.makeArray(arguments); - } } - - setTimeout(function () { - TestMonkey.fireEvent.apply(null, args); - }, timeout); } var currentDescriptor = null, currentSuite = null; @@ -224,14 +202,14 @@ window.TestMonkey = {}; var it = typeof(arguments[0].push)=='function' ? arguments[0] : arguments; $.each(it,function() { - var descriptor = scope.testSuites[this]; + var descriptor = testSuites[this]; if (descriptor) { suites.push([this,descriptor]); } }); - TestMonkey.fireEvent('beforeTestRunner',suites); + fireEvent('beforeTestRunner',suites); // we first have to run through them so all the tests can be recorded @@ -254,13 +232,14 @@ window.TestMonkey = {}; // set it to the first one in the list currentSuite = null; - if (currentSuite) TestMonkey.fireEvent('beforeTestSuite',suites[0][0]); + if (currentSuite) fireEvent('beforeTestSuite',suites[0][0]); - TestMonkey.fireEvent('beforeTestCases',testCases); + fireEvent('beforeTestCases',testCases); - TestMonkey.fireEvent('beforeAssertionCount'); + fireEvent('beforeAssertionCount'); var assertCount = 0; + $.each(testCases,function() { var testcase = this; @@ -269,7 +248,7 @@ window.TestMonkey = {}; testcase.ready = true; }); - TestMonkey.fireEvent('afterAssertionCount',assertCount); + fireEvent('afterAssertionCount',assertCount); var total = 0, loaded = 0; @@ -326,15 +305,15 @@ window.TestMonkey = {}; { if (currentSuite) { - TestMonkey.fireEvent('afterTestSuite',currentSuite); - var currentD = scope.testSuites[currentSuite]; + fireEvent('afterTestSuite',currentSuite); + var currentD = testSuites[currentSuite]; } currentSuite = nextTestCase.suite; - TestMonkey.fireEvent('beforeTestSuite',currentSuite); + fireEvent('beforeTestSuite',currentSuite); } nextTestCase.ready = false; var testcase = nextTestCase; - TestMonkey.fireEvent('beforeTestCase',testcase); + fireEvent('beforeTestCase',testcase); var descriptor = testcase.descriptor; var error = false; try @@ -353,11 +332,11 @@ window.TestMonkey = {}; { if (currentSuite) { - TestMonkey.fireEvent('afterTestSuite',currentSuite); - var currentD = scope.testSuites[currentSuite]; + fireEvent('afterTestSuite',currentSuite); + var currentD = testSuites[currentSuite]; } - TestMonkey.fireEvent('afterTestCases',testCases); - TestMonkey.fireEvent('afterTestRunner'); + fireEvent('afterTestCases',testCases); + fireEvent('afterTestRunner'); } } @@ -379,14 +358,24 @@ window.TestMonkey = {}; { var win = arguments[0], frame = arguments[1]; var idx = arguments[2], type = arguments[3]||''; - var args = $.makeArray(arguments).splice(4); + + // NWW: IE HAD A PROBLEM WITH SINGLE ARG SPLICE, ADDED 2nd ARG + var args = null; + if (App.Browser.isIE) + { + args = $.makeArray(arguments).splice(4,4); + } + else + { + args = $.makeArray(arguments).splice(4); + } var result = false; var testcase = currentTestCase; var assert = testcase.asserts[idx]; -// alert('internalAssert='+win+',frame='+frame+',idx='+idx+',type='+type); + + var handler = assertions[type]; try { - var handler = assertions[type]; if (handler) { result = handler.apply(this,[win,frame,testcase,assert,args]); @@ -398,19 +387,34 @@ window.TestMonkey = {}; { testcase.results.push({assert:assert,result:false,error:E,message:String(E),idx:idx}); } + + // call end if assetion type is After + // and the 'end' argument is true + if (type == 'After' && args[2] == true) + { + testMonkeyScope.end(!result,false); + } } function getHtml(f) { - var n = $(f.get(0).cloneNode(true)); - // pull out the firebug injected HTML since we don't really want to see that - n.find('#_firebugConsoleInjector,#_firebugConsole').remove(); - return '<html>\n'+jQuery(n).html()+'\n</html>'; + // var n = $(f.get(0).cloneNode(true)); + // // pull out the firebug injected HTML since we don't really want to see that + // n.find('#_firebugConsoleInjector,#_firebugConsole').remove(); + // return '<html>\n'+jQuery(n).html()+'\n</html>'; + return ''; } var currentTestCase = null; var currentTestCaseId = 1; + // //TODO: needed anymore? + // $.fn.assertTestCase = function() + // { + // internalAssert.apply(this,arguments); + // return this; + // }; + // function executeTest(testcase,descriptor) { currentTestCase = testcase; @@ -465,6 +469,7 @@ window.TestMonkey = {}; } this.error = function(E) { + testcase.failed = true; testcase.error = E; testcase.message = "Exception running testcase: "+E; @@ -473,6 +478,9 @@ window.TestMonkey = {}; } this.fail=function(msg) { + App.Util.Logger.info('failed') + + testcase.message = msg; testcase.explicitFailure = true; testcase.results.push({'result':false,'message':testcase.message}); @@ -502,14 +510,17 @@ window.TestMonkey = {}; } } self.teardown(); + var f = getFrame(); - f.find('#__testMonkeySDK,#__testMonkeyJS').remove(); + //f.find('#__testMonkeySDK,#__testMonkeyJS').remove(); + f.find('.testmonkey_libs').remove(); + testcase.after_dom = getHtml(f); try { if (!testcase.running) return; testcase.running = false; - if (failed) + if (failed == true) { testcase.failed = true; } @@ -538,9 +549,10 @@ window.TestMonkey = {}; testcase.message = "Timed out"; testcase.results.push({'result':false,'message':testcase.message}); } - TestMonkey.fireEvent('afterTestCase',testcase,descriptor); + fireEvent('afterTestCase',testcase,descriptor); removeTestFrame(id); executeNextTestCase(); + } catch (E) { @@ -552,67 +564,89 @@ window.TestMonkey = {}; // we keep it at global scope so the execution environment can // easily use the running scope instance window.testMonkeyScope = new window.testScope; - - try + + $.getJSON(App.docRoot + 'tests/manifest.js',function(json) { - jQuery("<iframe style='position:absolute;left:-10px;top:-10px;height:1px;width:1px;' id='" + (id)+"'></iframe>").appendTo("body"); - var body = jQuery("#"+id).contents().find("body").get(0); + var code = '\n'; - if (!body) body = jQuery("#"+id).contents().find("html").get(0); - - var doc = body.ownerDocument; - - var setupCode = "" + - "(function($,scope){\n"+ - " $.noConflict();\n"+ - " $(function(){\n "+ - " $.fn.assertTestCase = function(){ return scope.assertTestCase.apply(this,arguments) }\n" + - " function log() { return scope.log.apply(this,arguments) }\n" + - " function end() { return scope.end.apply(this,arguments) }\n" + - " function fail() { return scope.fail.apply(this,arguments) }\n" + - " function error() { return scope.error.apply(this,arguments) }\n" + - " function assertTestCase() { return scope.assertTestCase.apply(this,arguments) }\n" + - " scope.setup.call(scope.descriptor,window);\n" + - " try{\n" + - ' ('+testcase.code+').call(scope.descriptor);\n' + - " }catch(E){\n" + - " scope.error(E);\n" + - " }\n" + - " scope.completed();\n" + - " });\n " + - "})(window.jQuery,parent.window.testMonkeyScope);\n"; - - // inject our library - var code = "<script id=\"__testMonkeySDK\" type=\"text/javascript\" src=\"" + AppC.sdkJS + "\"></script>\n"; - - // now inject our test execution environment - code += "<script id=\"__testMonkeyJS\" type=\"text/javascript\">" + setupCode + "</script>\n"; - - var jscode = descriptor.content.replace('####MARKER####',code); - - $.info(jscode); - - if (typeof(testcase.timeout)!='undefined') + // load third-party libs needed for tests + $.each(json.libs,function() + { + code += "<script type=\"text/javascript\" class=\"testmonkey_libs\" src=\""+this+"\"></script>\n"; + }); + try { - // run the timer here in case we have problems loading the test HTML code itself - timer=setTimeout(function(){ - testMonkeyScope.end(true,true) - },testcase.timeout); + //jQuery("<iframe style='position:absolute;left:-10px;top:-10px;height:1px;width:1px;' id='" + (id)+"'></iframe>").appendTo("body"); + var body = jQuery('iframe').contents().find("body").get(0); + + if (!body) body = jQuery('iframe').contents().find("html").get(0); + + var doc = body.ownerDocument; + var setupCode = "" + + "(function($,scope){\n"+ + " $.noConflict();\n"+ + " $(function(){\n "+ + " $.fn.assertTestCase = function(){ return scope.assertTestCase.apply(this,arguments) }\n" + + " function log() { return scope.log.apply(this,arguments) }\n" + + " function end() { return scope.end.apply(this,arguments) }\n" + + " function fail() { return scope.fail.apply(this,arguments) }\n" + + " function error() { return scope.error.apply(this,arguments) }\n" + + " function assertTestCase() {return scope.assertTestCase.apply(this,arguments) }\n" + + " scope.setup.call(scope.descriptor,window);\n "; + + // IE 'ISMS + if (App.Browser.isIE) + { + setupCode += "setTimeout(function(){try{\n" + + ' ('+testcase.code+').call(scope.descriptor);\n' + + " }catch(E){\n" + + " scope.error(E);\n" + + " }scope.completed();},500);\n" + + " });\n })(parent.window.jQuery,parent.window.testMonkeyScope);\n"; + } + else + { + setupCode += "try{\n" + + ' ('+testcase.code+').call(scope.descriptor);\n' + + " }catch(E){\n" + + " scope.error(E);\n" + + " }\n" + + " scope.completed();\n" + + " });\n })(window.jQuery,parent.window.testMonkeyScope);\n "; + } + + + // now inject our test execution environment + code+= "<script class=\"testmonkey_libs\" type=\"text/javascript\">" + setupCode + "</script>\n"; + var jscode = descriptor.content.replace('####MARKER####',code); + + // REMOVED TIMEOUT FEATURE - THERE WAS A TIMING ISSUE + // WHERE TESTS WOULD TIMEOUT WHEN THE SHOULD NOT HAVE + // if (typeof(testcase.timeout)!='undefined') + // { + // // run the timer here in case we have problems loading the test HTML code itself + // //timer=setTimeout(function(){ + // // testMonkeyScope.end(true,true) + // //},testcase.timeout); + // } + + // write the test + our bootstrap code + doc.open("text/html","replace"); + doc.writeln(jscode); + doc.close(); + } + catch(E) + { + testcase.failed = true; + testcase.error = E; + testcase.message = "Exception running testcase: "+E; + testcase.results.push({'result':false,'error':E,'message':testcase.message}); + testMonkeyScope.end(true,false); } - // write the test + our bootstrap code - doc.open("text/html","replace"); - doc.writeln(jscode); - doc.close(); - } - catch(E) - { - testcase.failed = true; - testcase.error = E; - testcase.message = "Exception running testcase: "+E; - testcase.results.push({'result':false,'error':E,'message':testcase.message}); - testMonkeyScope.end(true,false); - } + }); + + } scope.extractCodeLine = function (code,expr) @@ -650,12 +684,10 @@ window.TestMonkey = {}; } var testFrameId = 1; - function loadTestFrame(url,fn) { var id = '__testdriver_content_'+(testFrameId++); - url = URI.absolutizeURI(url,AppC.docRoot+'tests/'); - + url = App.URI.absolutizeURI(url,App.docRoot+'tests/'); return jQuery.ajax({ type: "GET", url: url, @@ -667,7 +699,7 @@ window.TestMonkey = {}; var begin = html.indexOf('<head'); if (begin > 0) { - begin = html.indexOf('>',begin+1); + begin = html.indexOf('>',begin); } else { @@ -694,6 +726,7 @@ window.TestMonkey = {}; if (begin>0) start = html.substring(0,begin); var end = html.substring(begin); // we later use marker to indicate where we need to replace content + fn(start + '####MARKER####' + end); } }); @@ -716,19 +749,31 @@ window.TestMonkey = {}; function escapeString(str) { - return $.gsub(str,'"',"\\\""); + return str.gsub('"',"\\\""); } function preProcessCode(code) { var re = /assert(.*?)[\s]?\((.*)?\)/; var _asserts = []; - var newcode = $.gsub(code,re,function(m) + var newcode = code.gsub(re,function(m) { _asserts.push(m[0]); var prefix = m[1] ? '"' + escapeString(m[1]) + '"' : 'null'; var params = m[2] || 'null'; - return 'assertTestCase(' + (_asserts.length-1) + ','+prefix+','+params+')'; + + // if assertion type is after + // setup timeout + if (prefix == '"After"') + { + var args = params.split(","); + var funcString = 'setTimeout(function(){assertTestCase(' + (_asserts.length-1) + ','+prefix+','+params+')},'+args[1]+')'; + return funcString; + } + else + { + return 'assertTestCase(' + (_asserts.length-1) + ','+prefix+','+params+')'; + } }); var asserts = []; $.each(_asserts,function() @@ -778,8 +823,7 @@ window.TestMonkey = {}; }); }; - scope.testSuites = {}; - scope.testSuiteNames = []; + var testSuites = {}; scope.testSuite = function(name,html,descriptor) { @@ -790,10 +834,9 @@ window.TestMonkey = {}; } descriptor.html=html; - scope.testSuiteNames.push(name); - scope.testSuites[name]=descriptor; + testSuites[name]=descriptor; - TestMonkey.fireEvent("addTestSuite",name,descriptor,html); + fireEvent("addTestSuite",name,descriptor,html); this.run = function() { public/javascripts/testmonkey.js b3f3f53f62c0c808b59d18c91575b0a583ff51c0 Jason Stahl jason@jason-stahls-macbook-pro.local http://github.com/jhaynie/testmonkey/commit/dc6ecb3cc9c1ac9e5647760677827f93da719912 dc6ecb3cc9c1ac9e5647760677827f93da719912 2009-01-29T22:19:42-08:00 2009-01-29T22:19:42-08:00 pushing over IE fixes and other changes 3667b77f5f46c8a14f14ea2295883dc86aa97abb Jason Stahl jason@jason-stahls-macbook-pro.local