From: Roger Meier Date: Fri, 29 Jul 2011 21:08:04 +0000 (+0000) Subject: THRIFT-1247 JavaScript unit test with phantomjs X-Git-Tag: 0.7.0~19 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=0b26725ceb2c47e0b006d50a83f561e175bc6ba8;p=common%2Fthrift.git THRIFT-1247 JavaScript unit test with phantomjs git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1152373 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/lib/js/test/build.xml b/lib/js/test/build.xml old mode 100644 new mode 100755 index 32316a16..c052e640 --- a/lib/js/test/build.xml +++ b/lib/js/test/build.xml @@ -86,6 +86,7 @@ + @@ -93,7 +94,7 @@ - + @@ -104,6 +105,40 @@ + + check if Xvfb is available: + + + + + + + check if phantomjs is available: + + + + + + + + + + + + + + + + Running Unit Tests with headless browser! + + + + + + + + @@ -113,8 +148,7 @@ - - + diff --git a/lib/js/test/phantomjs-qunit.js b/lib/js/test/phantomjs-qunit.js new file mode 100755 index 00000000..d52b5227 --- /dev/null +++ b/lib/js/test/phantomjs-qunit.js @@ -0,0 +1,83 @@ +/* This file is only used by the test suite. + * + * Origin: https://github.com/ariya/phantomjs/blob/master/examples/run-qunit.js + * License: https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD + * + * Inclusion into Apache products is allowed according to http://www.apache.org/legal/3party.html + */ + + +/** + * Wait until the test condition is true or a timeout occurs. Useful for waiting + * on a server response or for a ui change (fadeIn, etc.) to occur. + * + * @param testFx javascript condition that evaluates to a boolean, + * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or + * as a callback function. + * @param onReady what to do when testFx condition is fulfilled, + * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or + * as a callback function. + * @param timeOutMillis the max amount of time to wait. If not specified, 3 sec is used. + */ +function waitFor(testFx, onReady, timeOutMillis) { + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001, //< Default Max Timout is 3s + start = new Date().getTime(), + condition = false, + interval = setInterval(function() { + if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) { + // If not time-out yet and condition not yet fulfilled + condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code + } else { + if(!condition) { + // If condition still not fulfilled (timeout but condition is 'false') + console.log("'waitFor()' timeout"); + phantom.exit(1); + } else { + // Condition fulfilled (timeout and/or condition is 'true') + console.log("'waitFor()' finished in " + (new Date().getTime() - start) + "ms."); + typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled + clearInterval(interval); //< Stop this interval + } + } + }, 100); //< repeat check every 250ms +}; + + +if (phantom.args.length === 0 || phantom.args.length > 2) { + console.log('Usage: phantomjs phantomjs-qunit.js URL'); + phantom.exit(1); +} + +var page = new WebPage(); + +// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this") +page.onConsoleMessage = function(msg) { + console.log(msg); +}; + +page.open(phantom.args[0], function(status){ + if (status !== "success") { + console.log("Unable to access network"); + phantom.exit(1); + } else { + waitFor(function(){ + return page.evaluate(function(){ + var el = document.getElementById('qunit-testresult'); + if (el && el.innerText.match('completed')) { + return true; + } + return false; + }); + }, function(){ + var failedNum = page.evaluate(function(){ + var el = document.getElementById('qunit-testresult'); + console.log(el.innerText); + try { + return el.getElementsByClassName('failed')[0].innerHTML; + } catch (e) { } + return 10000; + }); + phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); + }); + } +}); diff --git a/lib/js/test/src/test/Httpd.java b/lib/js/test/src/test/Httpd.java index e3aad7d6..0ed051e9 100644 --- a/lib/js/test/src/test/Httpd.java +++ b/lib/js/test/src/test/Httpd.java @@ -131,8 +131,12 @@ public class Httpd { body.setContentType("text/html; charset=UTF-8"); response.setEntity(body); } else { + if(target.indexOf("?") != -1) { + target = target.substring(1, target.indexOf("?")); + } + + final File file = new File(this.docRoot, URLDecoder.decode(target, "UTF-8")); - final File file = new File(this.docRoot, URLDecoder.decode(target)); if (!file.exists()) { response.setStatusCode(HttpStatus.SC_NOT_FOUND);