[jboss-cvs] JBossAS SVN: r99071 - in branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3: src/test/org/jboss/ejb3/test/persistenceunits and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 6 14:35:29 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-01-06 14:35:29 -0500 (Wed, 06 Jan 2010)
New Revision: 99071
Modified:
branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java
branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java
Log:
EJB3 testsuite fixes (JBPAPP-2997)
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/build-test.xml 2010-01-06 19:34:46 UTC (rev 99070)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/build-test.xml 2010-01-06 19:35:29 UTC (rev 99071)
@@ -3940,6 +3940,10 @@
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"/>
+
+ <!-- ================================================================== -->
+ <!-- Test cases -->
+ <!-- ================================================================== -->
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
@@ -4274,14 +4278,23 @@
<target name="ejb-tests" depends="init" description="Execute all tests">
+ <!-- create custom configuration -->
+ <create-config baseconf="all" newconf="ejb" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ <include name="farm/**"/>
+ </patternset>
+ </create-config>
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <start-jboss conf="ejb" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
+ <wait-on-shutdown conf="ejb"/>
</target>
@@ -4597,14 +4610,23 @@
</target>
<target name="entity-tests" depends="init" description="Execute all tests">
+ <!-- create custom configuration -->
+ <create-config baseconf="all" newconf="entity" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ <include name="farm/**"/>
+ </patternset>
+ </create-config>
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <start-jboss conf="entity" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
+ <wait-on-shutdown conf="entity"/>
</target>
<target name="no-start-jboss-entity-tests" depends="init" description="Execute all tests">
@@ -5224,6 +5246,9 @@
description="Executes the default target (most)."
depends="jars"/>
+ <target name="reports"
+ description="Produces test reports in html and text."
+ depends="tests-report-html, tests-report-text"/>
<target name="tests-report-html" depends="compile-stylesheets">
<mkdir dir="${build.reports}/html"/>
@@ -5309,13 +5334,23 @@
</target>
<target name="iiop-tests" depends="init" description="Execute all tests">
- <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <!-- create custom configuration -->
+ <create-config baseconf="all" newconf="iiop" jboss.dist="${ejb3.dist}">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
+ <include name="farm/**"/>
+ </patternset>
+ </create-config>
+
+ <start-jboss conf="iiop" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
<stop-jboss jboss.dist="${ejb3.dist}"/>
- <wait-on-shutdown conf="all"/>
+ <wait-on-shutdown conf="iiop"/>
</target>
<target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java 2010-01-06 19:34:46 UTC (rev 99070)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/EntityTestBean.java 2010-01-06 19:35:29 UTC (rev 99071)
@@ -77,7 +77,8 @@
List<Entity1> result = manager1.createNamedQuery(Entity1.FIND_ALL).getResultList();
for (Entity1 e : result)
{
- log.info("*** testSharedEntity result=" + e.getData());
+ log.info("*** testSharedEntity result = (omit)") ;
+ // log.info("*** testSharedEntity result=" + e.getData());
}
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java 2010-01-06 19:34:46 UTC (rev 99070)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/ejb3/src/test/org/jboss/ejb3/test/persistenceunits/ServiceBean.java 2010-01-06 19:35:29 UTC (rev 99071)
@@ -56,7 +56,8 @@
List<Entity1> result = manager.createNamedQuery(Entity1.FIND_ALL).getResultList();
for (Entity1 e : result)
{
- log.info("*** testSharedEntity result=" + e.getData());
+ log.info("*** testSharedEntity result= (omit)");
+ // log.info("*** testSharedEntity result=" + e.getData());
}
}
}
More information about the jboss-cvs-commits
mailing list