[jboss-cvs] JBossAS SVN: r109413 - branches/JBPAPP_5_1_datagrid/testsuite/imports/config.

[jboss-cvs-commits at lists.jboss.org]

Author: rachmatowicz at jboss.com
Date: 2010-11-22 16:22:42 -0500 (Mon, 22 Nov 2010)
New Revision: 109413

Modified:
   branches/JBPAPP_5_1_datagrid/testsuite/imports/config/tests-clustering.xml
Log:
Add in one-test-clustering-datagrid-core-tests target.

Modified: branches/JBPAPP_5_1_datagrid/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/imports/config/tests-clustering.xml	2010-11-22 18:47:07 UTC (rev 109412)
+++ branches/JBPAPP_5_1_datagrid/testsuite/imports/config/tests-clustering.xml	2010-11-22 21:22:42 UTC (rev 109413)
@@ -983,6 +983,7 @@
       datagrid stuff (located here for now)
       ************************************* 
   -->
+	
   <patternset id="cluster.datagrid.includes">
 	<include name="org/jboss/test/cluster/datagrid/**/*TestCase.class"/>
   </patternset>
@@ -999,13 +1000,11 @@
 
   <target name="tests-clustering-datagrid-core-tests" description="Starts servers, executes tests, stops servers">
 
-   <!-- create the server configs -->
    <antcall target="tests-clustering-datagrid-configure" inheritRefs="true"/>	
   	
    <server:start name="datagrid-0"/>
    <server:start name="datagrid-1"/>
 
-  <!-- run the tests -->
    <antcall target="tests-clustering-datagrid-execute">
      <param name="cluster.datagrid.includes.refid" value="${cluster.datagrid.includes}"/>
      <param name="jboss-junit-configuration" value="datagrid"/>
@@ -1093,4 +1092,89 @@
 	</junit>
   </target>
 	
+	
+  <!-- debugging test targets (one-test) -->	
+	
+	
+	  <target name="one-test-clustering-datagrid-core-tests" description="Starts servers, executes a test, stops servers">
+
+	   <antcall target="tests-clustering-datagrid-configure" inheritRefs="true"/>	
+	  	
+	   <server:start name="datagrid-0"/>
+	   <server:start name="datagrid-1"/>
+
+	   <antcall target="one-test-clustering-datagrid-execute">
+	     <param name="test" value="${test}"/>
+	     <param name="jboss-junit-configuration" value="datagrid"/>
+	   </antcall>
+
+	   <server:stop name="datagrid-1"/>
+	   <server:stop name="datagrid-0"/>
+	   	
+	  </target>	
+
+	
+	  <!-- Executes a singletest in a datagrid environment -->  
+	  <target name="one-test-clustering-datagrid-execute" description="JUnit task to execute a single test against the datagrid">
+		   	
+		<mkdir dir="${build.reports}"/>
+		<mkdir dir="${build.testlog}"/>
+		<junit dir="${module.output}"
+		   printsummary="${junit.printsummary}"
+		   haltonerror="${junit.haltonerror}"
+		   haltonfailure="${junit.haltonfailure}"
+		   fork="${junit.fork}"
+		   timeout="${junit.timeout}"
+		   jvm="${junit.jvm}"
+		   failureProperty="tests.failure">
+
+		   <sysproperty key="java.net.preferIPv4Stack" value="true"/>
+		         
+		   <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
+		   <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+		   <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+		   <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
+		   <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+		   <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
+		   <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+		   <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
+		   <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+		   <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
+		   <sysproperty key="build.testlog" value="${build.testlog}"/>
+		   <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+		   <!-- Pass along any jbosstest.* system properties -->
+		   <syspropertyset>
+		     <propertyref prefix="jbosstest."/>
+		   </syspropertyset>
+
+		   <!--Lets pass some parameters from local.properties file as system properties-->
+		   <syspropertyset>
+		      <propertyref prefix="org.apache."/>
+		   </syspropertyset>
+		   <syspropertyset>
+		      <propertyref prefix="apache"/>
+		   </syspropertyset>
+		   <syspropertyset>
+		      <propertyref prefix="node"/>
+		   </syspropertyset>
+
+		   <classpath>
+		      <pathelement location="${build.classes}"/>
+		      <pathelement location="${build.resources}"/>
+		      <path refid="tests.classpath"/>
+		   </classpath>
+
+		   <!-- definition of the property for keeping results between configuration -->
+		   <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+		   <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" />
+
+	       <test todir="${build.reports}" name="${test}"
+	             haltonerror="${junit.batchtest.haltonerror}"
+	             haltonfailure="${junit.batchtest.haltonfailure}"
+	             fork="${junit.batchtest.fork}"/>
+
+		</junit>
+	  </target>
+		
+	
 </project>