[Smartfrog-checkins] SF.net SVN: smartfrog: [6564] trunk/core

[<st...@us...>]

Revision: 6564
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6564&view=rev
Author:   steve_l
Date:     2008-05-28 07:07:12 -0700 (Wed, 28 May 2008)

Log Message:
-----------
some ant testing

Modified Paths:
--------------
    trunk/core/common.xml
    trunk/core/extras/ant/test/files/ping.xml
    trunk/core/extras/ant/test/org/smartfrog/tools/ant/test/system/DeployTest.java

Modified: trunk/core/common.xml
===================================================================
--- trunk/core/common.xml	2008-05-28 14:04:31 UTC (rev 6563)
+++ trunk/core/common.xml	2008-05-28 14:07:12 UTC (rev 6564)
@@ -421,9 +421,14 @@
         -set up the classpath. Dont forget to
         include a reference to smartfrog.classpath to get the core stuff
       -->
+    <!-- set to withOutAndErr for more details-->
+    <property name="junit.printsummary" value="off" />
+    <property name="junit.showoutput" value="true" />
+    <!-- set to brief for brief, plain for more -->
+    <property name="junit.printformatter" value="plain" />
     <presetdef name="sf-junit">
-      <junit printsummary="no"
-           fork="true"
+      <junit printsummary="${junit.printsummary}"
+          fork="true"
            forkmode="once"
            includeantruntime="true"
            showoutput="true"
@@ -440,7 +445,7 @@
         <!-- #Tests take system property parameters -->
         <!-- #Formatters for capture and display -->
         <formatter type="xml"/>
-        <formatter type="brief" usefile="false"/>
+        <formatter type="${junit.printformatter}" usefile="false"/>
       </junit>
     </presetdef>
 

Modified: trunk/core/extras/ant/test/files/ping.xml
===================================================================
--- trunk/core/extras/ant/test/files/ping.xml	2008-05-28 14:04:31 UTC (rev 6563)
+++ trunk/core/extras/ant/test/files/ping.xml	2008-05-28 14:07:12 UTC (rev 6564)
@@ -20,6 +20,7 @@
   <!-- at the end of every execution, we force a cleanup -->
   <target name="teardown">
     <sf-stopdaemon failonerror="false"/>
+    <sf-stopdaemon failonerror="false" port="${new.port}"/>
   </target>
 
   <target name="testNoParams">

Modified: trunk/core/extras/ant/test/org/smartfrog/tools/ant/test/system/DeployTest.java
===================================================================
--- trunk/core/extras/ant/test/org/smartfrog/tools/ant/test/system/DeployTest.java	2008-05-28 14:04:31 UTC (rev 6563)
+++ trunk/core/extras/ant/test/org/smartfrog/tools/ant/test/system/DeployTest.java	2008-05-28 14:07:12 UTC (rev 6564)
@@ -132,7 +132,6 @@
      */
     public void testDeployFile() {
         expectBuildExceptionContaining("testDeployFile", "expected timeout", "Timeout");
-        //assertInLog("rootProcess failed to deploy 'app' component");
         assertInLog("FAILED when trying DEPLOY of 'app'");
         assertInLog("Reference not found");
         assertInLog("Unresolved Reference");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.