From: Steve L. <st...@us...> - 2004-07-29 14:18:20
|
Update of /cvsroot/smartfrog/core/extras/ant/test/org/smartfrog/tools/ant/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13392/extras/ant/test/org/smartfrog/tools/ant/test Modified Files: StartTest.java Log Message: fixed problems with spawn/timeout and failonerror, which was too brittle. Ant1.6.x is a bit dim about these settings and even setting failonerror to false is viewed as an incompatible option. So we cache these values and then dont set timeout or failonerror if spawn=true. Index: StartTest.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/test/org/smartfrog/tools/ant/test/StartTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** StartTest.java 27 Jul 2004 13:13:40 -0000 1.9 --- StartTest.java 29 Jul 2004 14:18:10 -0000 1.10 *************** *** 23,26 **** --- 23,27 ---- import org.smartfrog.tools.ant.PropertyFile; import org.smartfrog.tools.ant.DeployingTaskBase; + import org.smartfrog.tools.ant.SmartFrogTask; /** *************** *** 64,70 **** */ public void testIncompatibleSettings() { ! expectBuildExceptionContaining("testIncompatibleSettings", ! "spawn and timeout", ! "not compatible with spawn"); } --- 65,71 ---- */ public void testIncompatibleSettings() { ! executeTarget("testIncompatibleSettings"); ! assertInLog(SmartFrogTask.MESSAGE_SPAWNED_DAEMON); ! assertInLog("SmartFrog daemon terminated"); } *************** *** 74,78 **** public void testBadHost() { expectBuildExceptionContaining("testBadHost", "host parameter", ! "host cannot be set on this task"); } --- 75,79 ---- public void testBadHost() { expectBuildExceptionContaining("testBadHost", "host parameter", ! SmartFrogTask.ERROR_HOST_NOT_SETTABLE); } *************** *** 95,106 **** */ public void testSpawn() { ! try { ! executeTarget("testSpawn"); ! assertInLog("Standalone SmartFrog daemon started"); ! assertInLog("SmartFrog daemon terminated"); ! } catch (BuildException e) { ! //older ant versions will not spawn ! assertTrue(e.getMessage().indexOf("not compatible with spawn")>=0); ! } } --- 96,102 ---- */ public void testSpawn() { ! executeTarget("testSpawn"); ! assertInLog(SmartFrogTask.MESSAGE_SPAWNED_DAEMON); ! assertInLog("SmartFrog daemon terminated"); } *************** *** 138,146 **** public void testResource() { executeTarget("testResource"); ! assertInLog("COUNTER: hello - here is a constructed message"); ! assertInLog("value is 99"); ! assertInLog("goodbye"); ! assertInLog("[[elementA, elementB], Message from outerVector, [value is , 99]]"); ! assertInLog("1"); assertTerminationInLog(); } --- 134,138 ---- public void testResource() { executeTarget("testResource"); ! assertInLog("All these moments will be lost in time, like tears in rain."); assertTerminationInLog(); } |