[jboss-cvs] JBossAS SVN: r64937 - branches/Branch_4_2/ejb3.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Aug 28 18:13:24 EDT 2007


Author: bstansberry at jboss.com
Date: 2007-08-28 18:13:24 -0400 (Tue, 28 Aug 2007)
New Revision: 64937

Modified:
   branches/Branch_4_2/ejb3/build-test.xml
Log:
[EJBTHREE-1013] Run clustered session tests with buddy replication enabled

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-08-28 22:10:40 UTC (rev 64936)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-08-28 22:13:24 UTC (rev 64937)
@@ -135,6 +135,7 @@
       <path refid="trove.classpath"/>
       <path refid="xdoclet.xdoclet.classpath"/>
       <path refid="apache.ant.classpath"/>
+      <path refid="apache.ant.junit.classpath"/>
       <path refid="oswego.concurrent.classpath"/>
       <path refid="junit.junit.classpath"/>
       <path refid="apache.log4j.classpath"/>
@@ -3412,6 +3413,16 @@
             <isset property="test.jndi.url"/>
          </not>
       </condition>
+
+      <condition property="jboss-junit-configuration" value="${test.extension}">
+         <isset property="test.extension"/>         
+      </condition>
+
+      <condition property="jboss-junit-configuration" value="">
+         <not>  
+            <isset property="test.extension"/>         
+         </not>  
+      </condition>
       
       <junit dir="${module.output}"
          printsummary="yes"
@@ -3474,7 +3485,10 @@
 
          <formatter type="plain" usefile="true"/>
          <formatter type="xml" usefile="true" unless="test.extension"/>
-         <formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
+         <!--formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/-->
+         <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>  
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="false"
@@ -4056,12 +4070,12 @@
       <antcall target="test-clustered-entity"/>
       <antcall target="test-cluster-session"/>
 
-      <!--
-         Test in test-cluster-session shuts down both nodes. It needs to shut down one
-         anyway as part of the tests, so simplest is to shut down the other from within
-         the test rather than figure out what to shut down here.
-      -->
       <antcall target="tests-clustering-shutdown"/>
+	   
+      <!-- Rerun the tests with buddy replication turned off 
+           Disabled for now until we get JBC 1.4.1.SP4 or later integrated 
+      <antcall target="clustered-buddyrepl-test"/>
+       -->
 
    </target>
 
@@ -4200,18 +4214,23 @@
    </target>
 
    <target name="test-cluster-session">
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="clusteredsession"/>
-         <param name="jvmargs" value=""/>
-         <!--
-         <param name="jvmargs"
-                value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=n,suspend=n"/>
-         -->
-      </antcall>
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="ejbthree921"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
+	         
+       <property name="buddy-replication-extension" value="BR-disabled"/> 
+	   
+	   <antcall target="test-with-jvmargs" inheritRefs="true">
+	      <param name="test" value="clusteredsession"/>
+	      <param name="jvmargs" value=""/>
+	      <param name="test.extension" value="${buddy-replication-extension}"/> 
+	      <!--
+	      <param name="jvmargs"
+	             value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=n,suspend=n"/>
+	      -->
+	   </antcall>
+	   <antcall target="test-with-jvmargs" inheritRefs="true">
+	      <param name="test" value="ejbthree921"/>
+	      <param name="jvmargs" value=""/>
+	      <param name="test.extension" value="${buddy-replication-extension}"/> 
+	   </antcall>
 
    </target>
    
@@ -4355,6 +4374,7 @@
    <macrodef name="create-ejb3-cluster-node"
       description="Create a simplified cluster configuration for ejb3 testing">
       <attribute name="conf"/>
+      <attribute name="conf-src" description="The name of the tests-config to copy or the baseconf" default="@{conf}"/>
       <attribute name="host" default="${node0}"/>
       <attribute name="jboss.dist" default="${jboss.dist}"
          description="The jboss dist root directory" />
@@ -4370,6 +4390,10 @@
                <include name="deploy/ejb3-interceptors-aop.xml"/>
             </fileset>
          </copy>
+         <echo message="Overwriting config descriptors" />
+         <copy todir="@{jboss.dist}/server/@{conf}" overwrite="true" failonerror="false">
+            <fileset dir="${build.resources}/test-configs/@{conf-src}" />
+        </copy>
         <antcall target="modify-ejb3-repl_sync">
              <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
         </antcall>
@@ -4383,6 +4407,24 @@
            replace="REPL_SYNC"/>
    </target>
 
+   <target name="clustered-buddyrepl-test">
+      <create-ejb3-cluster-node conf="clustered-ejb3-BR-0" conf-src="buddy-repl" jboss.dist="${ejb3.dist}"/>
+      <create-ejb3-cluster-node conf="clustered-ejb3-BR-1" conf-src="buddy-repl"  jboss.dist="${ejb3.dist}"/>
+
+      <start-jboss conf="clustered-ejb3-BR-0" host="${node0}" jvmargs="-Xmx512M"/>
+      <start-jboss conf="clustered-ejb3-BR-1" host="${node1}" jvmargs="-Xmx512M"/>
+
+      <antcall target="tests-clustering-wait"/>
+
+      <antcall target="test-cluster-session" inheritRefs="true">
+         <param name="buddy-replication-extension" value="BR-enabled"/>
+      </antcall>
+
+      <stop-jboss url="${node0.jndi.url}"/>
+      <stop-jboss url="${node1.jndi.url}"/>
+
+   </target>
+
    <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}">
       <create-ejb3-cluster-node conf="node0" jboss.dist="${ejb3.dist}"/>
       <start-jboss conf="node0" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>




More information about the jboss-cvs-commits mailing list