[utest commit] r10 - in trunk: bin bin/www bin/www/files bin/www/tests run src src/tests/iterations src/tests/re...
codesite...@google.com
Date: Sat Aug 30 05:24:58 2008
New Revision: 10
Added:
trunk/bin/
trunk/bin/www/
trunk/bin/www/files/
trunk/bin/www/files/real.html
trunk/bin/www/index.html
trunk/bin/www/swfobject.js
trunk/bin/www/tests/ (props changed)
trunk/run/Iteration2.hxml
trunk/run/RequestTest.hxml
trunk/run/RequestTest.sh
Removed:
trunk/run/Request1.hxml
trunk/run/Request1.sh
trunk/src/Test.hx
trunk/tests/
Modified:
trunk/run/Iteration1.hxml
trunk/src/tests/iterations/Iteration2.hx
trunk/src/tests/requests/RequestTest.hx
Log:
changed folder structure
added/fixed build files for Iteration1, Iteration2 and RequestTest
RequestTest works as expected
Added: trunk/bin/www/files/real.html
==============================================================================
--- (empty file)
+++ trunk/bin/www/files/real.html Sat Aug 30 05:24:58 2008
@@ -0,0 +1 @@
+<html><head><title></title></head><body></body></html>
\ No newline at end of file
Added: trunk/bin/www/index.html
==============================================================================
--- (empty file)
+++ trunk/bin/www/index.html Sat Aug 30 05:24:58 2008
@@ -0,0 +1,77 @@
+<html>
+<head><title>example</title>
+<style>
+iframe {
+ border: 0; padding: 0; margin: 0;
+ width: 100%; height: 100%;
+}
+
+.label {
+ padding: 2px;
+ font-weight: bold;
+ font-size: 7pt;
+ background-color: #000000;
+ color: #ffffff;
+ text-align: center;
+}
+
+.window {
+ font-family: Verdana;
+ font-size: 9pt;
+ float:left;
+ border: 1px solid #aaa;
+ margin: 0 2px 2px 0;
+}
+
+.window .cont {
+ width: 410px;
+ height: 240px;
+ overflow: auto;
+}
+</style>
+</head>
+<body>
+
+<div class="window">
+ <div class="label">JavaScript</div>
+ <div id="js_container" class="cont">
+ <pre><div id="haxe:trace"></div></pre>
+ </div>
+</div>
+<div class="window">
+ <div class="label">Neko</div>
+ <div id="neko_container" class="cont"><iframe
src="tests/main.n"></iframe></div>
+</div>
+<div class="window">
+ <div class="label">Php</div>
+ <div id="php_container" class="cont"><iframe
src="tests/main.php"></iframe></div>
+</div>
+<div class="window">
+ <div class="label">Flash 9</div>
+ <div id="flash9_container" class="cont">Flash 9</div>
+</div>
+<div class="window">
+ <div class="label">Flash 8</div>
+ <div id="flash8_container" class="cont">Flash 8</div>
+</div>
+<div class="window">
+ <div class="label">Flash 7</div>
+ <div id="flash7_container" class="cont">Flash 7</div>
+</div>
+<div class="window">
+ <div class="label">Flash 6</div>
+ <div id="flash6_container" class="cont">Flash 6</div>
+</div>
+
+<script type="text/javascript" src="tests/main.js"></script>
+<script type="text/javascript" src="swfobject.js" ></script>
+<script type="text/javascript">
+(function() {
+ for(var ver=6;ver<10;ver++) {
+ var el = document.getElementById("flash"+ver+"_container");
+ (new SWFObject("tests/mainf"+ver+".swf", "flashmovie"+ver,
el.offsetWidth, el.offsetHeight, ver, "#ffffff")).write(el);
+ }
+})();
+</script>
+</body>
+</html>
Added: trunk/bin/www/swfobject.js
==============================================================================
--- (empty file)
+++ trunk/bin/www/swfobject.js Sat Aug 30 05:24:58 2008
@@ -0,0 +1,8 @@
+/**
+ * SWFObject v1.5: Flash Player detection and embed -
http://blog.deconcept.com/swfobject/
+ *
+ * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT
License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof
deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof
deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new
Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new
Object();this.variables=new Object();this.attributes=new
Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new
deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var
q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var
_c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return
this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return
this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return
this.variables[_15];},getVariables:function(){return
this.variables;},getVariablePairs:function(){var _16=new Array();var
key;var _18=this.getVariables();for(key in
_18){_16[_16.length]=key+"="+_18[key];}return
_16;},getSWFHTML:function(){var
_19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="<embed
type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\"
width=\""+this.getAttribute("width")+"\"
height=\""+this.getAttribute("height")+"\"
style=\""+this.getAttribute("style")+"\"";_19+="
id=\""+this.getAttribute("id")+"\"
name=\""+this.getAttribute("id")+"\" ";var _1a=this.getParams();for(var key
in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}var
_1c=this.getVariablePairs().join("&");if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="<object
id=\""+this.getAttribute("id")+"\"
classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\"
width=\""+this.getAttribute("width")+"\"
height=\""+this.getAttribute("height")+"\"
style=\""+this.getAttribute("style")+"\">";_19+="<param name=\"movie\"
value=\""+this.getAttribute("swf")+"\" />";var _1d=this.getParams();for(var
key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}var
_1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="<param
name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}return
_19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var
_21=new
deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+"
- Flash Player
Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect|
|this.getAttribute("doExpressInstall")||
this.installedVer.versionIsValid(this.getAttribute("version"))){var
n=(typeof
_20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return
true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return
false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new
deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var
x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new
deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|
\s)+/,"").replace(/(\s+r|
\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows
CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new
ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new
deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var
axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var
axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new
deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return
_23;}}try{axo=new
ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new
deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return
_23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.major<fv.major){return
false;}if(this.major>fv.major){return true;}if(this.minor<fv.minor){return
false;}if(this.minor>fv.minor){return true;}if(this.rev<fv.rev){return
false;}return true;};deconcept.util={getRequestParameter:function(_2b){var
q=document.location.search||document.location.hash;if(_2b==null){return
q;}if(q){var _2d=q.substring(1).split("&");for(var
i=0;i<_2d.length;i++){if(_2d[i].substring(0,_2d[i].indexOf("="))==_2b){return
_2d[i].substring((_2d[i].indexOf("=")+1));}}}return "";}};deconcept.SWFObjectUtil.cleanupSWFs=function(){var
_2f=document.getElementsByTagName("OBJECT");for(var
i=_2f.length-1;i>=0;i--){_2f[i].style.display="none";for(var x in
_2f[i]){if(typeof
_2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return
document.all[id];};}var
getQueryParamValue=deconcept.util.getRequestParameter;var
FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject;
\ No newline at end of file
Modified: trunk/run/Iteration1.hxml
==============================================================================
--- trunk/run/Iteration1.hxml (original)
+++ trunk/run/Iteration1.hxml Sat Aug 30 05:24:58 2008
@@ -1,55 +1,48 @@
# Neko
--neko ../bin/main.n
--main tests.Iteration1
--debug
--cp ../
-
---next
+-neko ../bin/www/tests/main.n
+-main tests.iterations.Iteration1
+-cp ../src
+
+--next
# PHP
--php ../bin
--main tests.Iteration1
--debug
--cp ../
+-php ../bin/www/tests
+-main tests.iterations.Iteration1
+-cp ../src
--php-front main.php
-
---next
+
+--next
# F9
--swf9 ../bin/mainf9.swf
--main tests.Iteration1
--debug
--cp ../
+-swf9 ../bin/www/tests/mainf9.swf
+-main tests.iterations.Iteration1
+-cp ../src
-swf-header 410:240:120:ffffff
-
---next
+
+--next
# F8
--swf ../bin/mainf8.swf
--main tests.Iteration1
--debug
--cp ../
+-swf ../bin/www/tests/mainf8.swf
+-main tests.iterations.Iteration1
+-cp ../src
-swf-version 8
-swf-header 410:240:120:ffffff
-
---next
+
+--next
# F7
--swf ../bin/mainf7.swf
--main tests.Iteration1
--debug
--cp ../
+-swf ../bin/www/tests/mainf7.swf
+-main tests.iterations.Iteration1
+-cp ../src
-swf-version 7
-swf-header 410:240:120:ffffff
-
---next
-#
--swf ../bin/mainf6.swf
--main tests.Iteration1
--debug
--cp ../
+
+--next
+# F6
+-swf ../bin/www/tests/mainf6.swf
+-main tests.iterations.Iteration1
+-cp ../src
-swf-version 6
-swf-header 410:240:120:ffffff
-
---next
+
+--next
# JS
--js ../bin/main.js
--main tests.Iteration1
--debug
--cp ../
+-js ../bin/www/tests/main.js
+-main tests.iterations.Iteration1
+-cp ../src
Added: trunk/run/Iteration2.hxml
==============================================================================
--- (empty file)
+++ trunk/run/Iteration2.hxml Sat Aug 30 05:24:58 2008
@@ -0,0 +1,48 @@
+# Neko
+-neko ../bin/www/tests/main.n
+-main tests.iterations.Iteration2
+-cp ../src
+
+--next
+# PHP
+-php ../bin/www/tests
+-main tests.iterations.Iteration2
+-cp ../src
+--php-front main.php
+
+--next
+# F9
+-swf9 ../bin/www/tests/mainf9.swf
+-main tests.iterations.Iteration2
+-cp ../src
+-swf-header 410:240:120:ffffff
+
+--next
+# F8
+-swf ../bin/www/tests/mainf8.swf
+-main tests.iterations.Iteration2
+-cp ../src
+-swf-version 8
+-swf-header 410:240:120:ffffff
+
+--next
+# F7
+-swf ../bin/www/tests/mainf7.swf
+-main tests.iterations.Iteration2
+-cp ../src
+-swf-version 7
+-swf-header 410:240:120:ffffff
+
+--next
+# F6
+-swf ../bin/www/tests/mainf6.swf
+-main tests.iterations.Iteration2
+-cp ../src
+-swf-version 6
+-swf-header 410:240:120:ffffff
+
+--next
+# JS
+-js ../bin/www/tests/main.js
+-main tests.iterations.Iteration2
+-cp ../src
Added: trunk/run/RequestTest.hxml
==============================================================================
--- (empty file)
+++ trunk/run/RequestTest.hxml Sat Aug 30 05:24:58 2008
@@ -0,0 +1,48 @@
+# Neko
+-neko ../bin/www/tests/main.n
+-main tests.requests.RequestTest
+-cp ../src
+
+--next
+# PHP
+-php ../bin/www/tests
+-main tests.requests.RequestTest
+-cp ../src
+--php-front main.php
+
+--next
+# F9
+-swf9 ../bin/www/tests/mainf9.swf
+-main tests.requests.RequestTest
+-cp ../src
+-swf-header 410:240:120:ffffff
+
+--next
+# F8
+-swf ../bin/www/tests/mainf8.swf
+-main tests.requests.RequestTest
+-cp ../src
+-swf-version 8
+-swf-header 410:240:120:ffffff
+
+--next
+# F7
+-swf ../bin/www/tests/mainf7.swf
+-main tests.requests.RequestTest
+-cp ../src
+-swf-version 7
+-swf-header 410:240:120:ffffff
+
+--next
+# F6
+-swf ../bin/www/tests/mainf6.swf
+-main tests.requests.RequestTest
+-cp ../src
+-swf-version 6
+-swf-header 410:240:120:ffffff
+
+--next
+# JS
+-js ../bin/www/tests/main.js
+-main tests.requests.RequestTest
+-cp ../src
Added: trunk/run/RequestTest.sh
==============================================================================
--- (empty file)
+++ trunk/run/RequestTest.sh Sat Aug 30 05:24:58 2008
@@ -0,0 +1,6 @@
+# edit to deploy somewhere else... note that Request1.hx also has a
hardcoded url
+DEPLOY_DIR=/var/www/utest/
+
+rm -rf $DEPLOY_DIR*
+haxe RequestTest.hxml
+cp -r ../bin/* $DEPLOY_DIR
Modified: trunk/src/tests/iterations/Iteration2.hx
==============================================================================
--- trunk/src/tests/iterations/Iteration2.hx (original)
+++ trunk/src/tests/iterations/Iteration2.hx Sat Aug 30 05:24:58 2008
@@ -11,17 +11,19 @@
public function testRunnerRun() {
var r = new Runner();
r.fixtures.add(new TestFixture(new TestClass(), "assertTrue"));
+ r.onProgress = function(runner, result, done, totals) {
+ trace(done == 1 ? "OK @1" : "FAIL");
+ };
r.run();
- trace(r.results.length == 1 ? "OK @1" : "FAIL");
}
// #2
public function testAssertCreateAsync() {
var r = new Runner();
r.fixtures.add(new TestFixture(new TestClass(), "assertAsync"));
- r.onComplete = function(r){
- trace(r.results.length == 1 ? "OK @2" : "FAIL");
- }
+ r.onProgress = function(runner, result, done, totals) {
+ trace(done == 1 ? "OK @2" : "FAIL");
+ };
r.run();
}
Modified: trunk/src/tests/requests/RequestTest.hx
==============================================================================
--- trunk/src/tests/requests/RequestTest.hx (original)
+++ trunk/src/tests/requests/RequestTest.hx Sat Aug 30 05:24:58 2008
@@ -2,6 +2,7 @@
import utest.Assert;
import utest.Runner;
+import utest.ui.text.TraceReport;
#if php
import php.Web;
@@ -13,8 +14,14 @@
class RequestTest {
static inline var TIMEOUT = 500;
-
public function new();
+
+ public static function main() {
+ var runner = new Runner();
+ runner.addCase(new RequestTest());
+ var report = new TraceReport(runner);
+ runner.run();
+ }
public function testWorkingHttp() {
var requestor = new haxe.Http( getUrl("real.html") );