[jboss-cvs] JBossAS SVN: r87530 - projects/ejb3/trunk/testsuite.

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

Author: bstansberry at jboss.com
Date: 2009-04-19 00:12:31 -0400 (Sun, 19 Apr 2009)
New Revision: 87530

Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
Log:
[EJBTHREE-1053] Port test from Branch_4_2; include as a known issue
[EJBTHREE-1346] Respect disabling @Clustered via jboss.xml
[EJBTHREE-1807] Simplify creation of ejbthree1807.jar for test

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2009-04-19 04:11:10 UTC (rev 87529)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2009-04-19 04:12:31 UTC (rev 87530)
@@ -4271,18 +4271,27 @@
 		</jar>
 	</target>
 
-  <target name="ejbthree1807"
-      description="Builds all jar files required to test EJBTHREE-1807.">
-      <delete file="${build.lib}/ejbthree1807.jar"/>
+   <target name="ejbthree1346">
+
+      <delete file="${build.lib}/ejbthree1346.jar"/>
       <mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree1807.jar">
+      <jar jarfile="${build.lib}/ejbthree1346.jar">
          <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1807/*.class"/>
+            <include name="org/jboss/ejb3/test/ejbthree1346/*.class"/>
+            <include name="org/jboss/ejb3/test/clusteredsession/NodeAnswer.class"/>
+            <include name="org/jboss/ejb3/test/clusteredsession/util/*.class"/>
          </fileset>
+         <fileset dir="${resources}/test/ejbthree1346">
+            <include name="META-INF/*.xml"/>
+         </fileset>
       </jar>
    </target>
 
+   <target name="ejbthree1807">
+  	   <build-simple-jar name="ejbthree1807"/>
+   </target>
+
    
    <target name="jars" depends="statefulproxyfactoryoverride, removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
       concurrent,
@@ -4312,7 +4321,8 @@
       timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
       composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
       localcall, interceptors, interceptors2, interceptors3, iiop, clientinterceptor,
-      statelesscreation, changexml, externalrefscoped, singleton, ejbthree1671, ejbthree1677, ejbthree1629, ejbthree1807"/>
+      statelesscreation, changexml, externalrefscoped, singleton, ejbthree1671, ejbthree1677, ejbthree1629, 
+   	  ejbthree1807, ejbthree1346"/>
 
    <target name="test" depends="init" if="test"
       description="Execute all tests in the given test directory.">
@@ -5288,6 +5298,18 @@
 
      <antcall target="test-clustered-entity"/>
      <antcall target="test-cluster-session"/>
+      
+     <antcall target="test-with-jvmargs" inheritRefs="true">
+         <param name="test" value="ejbthree1346"/>
+         <param name="jvmargs" value=""/>
+         <param name="test.extension" value="BR-disabled"/> 
+     </antcall>
+      
+     <antcall target="test-with-jvmargs" inheritRefs="true">
+         <param name="test" value="ejbthree1053"/>
+         <param name="jvmargs" value=""/>
+     	   <!-- Not "test-extension" param or ingnoring the known-issue won't work -->
+     </antcall>
 
      <server:stop name="clustered-ejb3-totalrep-0"/>
      <server:stop name="clustered-ejb3-totalrep-1"/>