[jboss-cvs] JBossAS SVN: r104273 - tags/EWP_5_0_1/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 27 13:32:44 EDT 2010
Author: fnasser at redhat.com
Date: 2010-04-27 13:32:44 -0400 (Tue, 27 Apr 2010)
New Revision: 104273
Modified:
tags/EWP_5_0_1/testsuite/build.xml
Log:
Added options to run the testsuite for EWP, excluding some tests which uses features absent from EWP. (jcosta at redhat.com)
Modified: tags/EWP_5_0_1/testsuite/build.xml
===================================================================
--- tags/EWP_5_0_1/testsuite/build.xml 2010-04-27 17:30:27 UTC (rev 104272)
+++ tags/EWP_5_0_1/testsuite/build.xml 2010-04-27 17:32:44 UTC (rev 104273)
@@ -372,7 +372,7 @@
<!-- path refid="hibernate3.classpath"/ -->
<pathelement path="${jboss.dist.common.lib}/hibernate-core.jar" />
<pathelement path="${jboss.dist.common.lib}/hibernate-jmx.jar" />
- <pathelement path="${jboss.dist.common.lib}/hibernate-ehcache.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-ehcache.jar" />
<pathelement path="${jboss.dist.common.lib}/hibernate-oscache.jar" />
<pathelement path="${jboss.dist.common.lib}/hibernate-swarmcache.jar" />
<pathelement path="${jboss.dist.common.lib}/hibernate-c3p0.jar" />
@@ -783,6 +783,14 @@
<propertyref prefix="jbosstest."/>
</propertyset>
+ <!-- Choose between EAP and EWP build -->
+ <condition property="build.ewp">
+ <and>
+ <isset property="version.name"/>
+ <equals arg1="${version.name}" arg2="EWP"/>
+ </and>
+ </condition>
+
<target name="init">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
@@ -1155,20 +1163,20 @@
</patternset>
<!-- Tests needing jrmp invoker -->
<patternset id="jrmp-invoker.includes">
- <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/>
+ <include name="org/jboss/test/cts/test/BmpUnitTestCase.class" unless="build.ewp"/>
<!--include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/-->
- <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/>
+ <include name="org/jboss/test/cts/test/CmpUnitTestCase.class" unless="build.ewp"/>
<include name="org/jboss/test/cts/test/CtsCmp2UnitTestCase.class"/>
- <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class"/>
- <include name="org/jboss/test/cts/test/LocalEjbTestCase.class"/>
- <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class"/>
+ <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class" unless="build.ewp"/>
+ <include name="org/jboss/test/cts/test/LocalEjbTestCase.class" unless="build.ewp"/>
+ <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class" unless="build.ewp"/>
<!--include name="org/jboss/test/cts/test/MDBInvoker.class"/-->
<!--include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/-->
<!--include name="org/jboss/test/cts/test/SessionInvoker.class"/-->
- <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class"/>
- <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/>
- <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/>
- <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/>
+ <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class" unless="build.ewp"/>
+ <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class" unless="build.ewp"/>
+ <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class" unless="build.ewp"/>
+ <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class" unless="build.ewp"/>
<include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/>
<include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/>
</patternset>
@@ -1187,7 +1195,7 @@
<include name="**/test/jmx/test/Secure*TestCase.class"/>
<include name="**/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.class"/>
<include name="**/test/perf/test/SecurePerfStressTestCase.class"/>
- <include name="**/test/timer/test/SecureTimerUnitTestCase.class"/>
+ <include name="**/test/timer/test/SecureTimerUnitTestCase.class" unless="build.ewp"/>
<include name="**/test/security/test/client/*UnitTestCase.class"/>
</patternset>
<patternset id="security.excludes">
@@ -1201,7 +1209,7 @@
<exclude name="**/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
<exclude name="**/test/jrmp/test/DynLoadingFromSARUnpackedUnitTestCase.class"/>
<exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/>
- <exclude name="**/test/timer/test/SecureTimerUnitTestCase.class"/>
+ <exclude name="**/test/timer/test/SecureTimerUnitTestCase.class" unless="build.ewp"/>
<exclude name="**/test/web/security/authorization/XACMLWeb*.class"/>
<exclude name="**/test/security/test/client/*UnitTestCase.class"/>
<exclude name="**/test/profileservice/testsecure/*UnitTestCase.class"/>
@@ -1316,6 +1324,81 @@
<exclude name="org/jboss/test/spring/test/*TestCase.class"/>
</patternset>
+ <!-- Remove tests known to not work with EWP -->
+ <patternset id="ewp.excludes">
+ <!-- Don't forget the if="build.ewp" ! -->
+
+ <!-- EWP doesn't ships JMS -->
+ <exclude name="org/jboss/test/client/test/AppClientUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/BmpUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/CmpUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/CtsCmp2OptionDUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/MDBUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/StatelessSessionBrokenCreateUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/ee5client/unit/AppClientUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/ejb3/jbas6239/unit/RunAsMDBUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/ejb/lifecycle/test/*.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/invokers/test/MultiInvokersUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jacc/test/EJBSpecUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jacc/test/WebIntegrationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jbossmessaging/**/*.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jca/test/ExecuteJMSDuringRollbackStressTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jca/test/TransactionActiveUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jms/**/*.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jmsra/**/*.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/jmx/test/RedeployStressTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/mdbsessionpoolclear/test/MDBUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/mdb/test/MDBUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/messagedriven/**/*.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/naming/test/ENCUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/naming/test/NamingStressTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/profileservice/override/restart/test/JmsDestinationRestartUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/profileservice/override/test/ConnectionFactoryOverrideTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/refs/test/ResourceResolutionUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/security/test/client/SecurityClientUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/security/test/EJBSpecUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/timer/test/*.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/web/test/EncAnnotationsUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/web/test/EncXmlUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/web/test/JSFInjectionUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/web/test/JSPAnnotationENCUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class" if="build.ewp"/>
+
+ <!-- EWP doesn't ships bsh.jar -->
+ <exclude name="org/jboss/test/deployers/seam/test/SeamDvdExampleUnitTestCase.class" if="build.ewp"/>
+
+ <!-- EWP doesn't ships management console (console-mgr.sar) -->
+ <exclude name="org/jboss/test/console/jbas3861/*.class" if="build.ewp"/>
+
+ <!-- Depends on lots of things which aren't shipped with EWP, like jms-ra.rar, jmx-remoting.sar, jsr88-service.xml -->
+ <exclude name="org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.class" if="build.ewp"/>
+
+ <!-- Missing uuid-key-generator.sar -->
+ <exclude name="org/jboss/test/cmp2/optimisticlock/test/OptimisticLockUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cmp2/passivation/test/EntityPassivationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cmp2/keygen/test/KeyGenerationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cmp2/fkmapping/test/FKMappingUnitTestCase.class" if="build.ewp"/>
+
+ <!-- Uses InvalidationManager, not available in EWP -->
+ <exclude name="org/jboss/test/cluster/multicfg/ejb2/test/CacheInvalidationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/cmp2/cacheinvalidation/test/CacheInvalidationUnitTestCase.class" if="build.ewp"/>
+
+ <!-- HTTP invokers -->
+ <exclude name="org/jboss/test/hello/test/*.class" if="build.ewp"/>
+ </patternset>
+
<!-- Tests that are currently broken -->
<patternset id="badtest.excludes">
<exclude name="org/jboss/test/aop/test/RemotingUnitTestCase"/>
@@ -1331,22 +1414,22 @@
<exclude name="org/jboss/test/deployers/ear/test/EmbeddedDatasourceUnitTestCase.class"/>
<!-- Test of old farming implementation -->
<exclude name="org/jboss/test/cluster/multicfg/test/ClusterFileTransferTestCase.class"/>
- <!-- Unfinished test of clustered deployment via profile service -->
+ <!-- Unfinished test of clustered deployment via profile service -->
<exclude name="org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeployUnitTestCase.class"/>
<!-- JASPI needs revisiting -->
<exclude name="org/jboss/test/web/test/JASPIFormAuthUnitTestCase.class"/>
- <!-- New diagnostic test that has transient failures; needs further work -->
- <exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionMemoryLeakTestCase.class"/>
+ <!-- New diagnostic test that has transient failures; needs further work -->
+ <exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionMemoryLeakTestCase.class"/>
- <!-- Exclude some classloader leak tests on Sun VM only; they should run on JRockit, OpenJDK -->
- <exclude name="org/jboss/test/classloader/leak/test/AopPreparedClassesClassloaderLeakUnitTestCase.class" if="sun-vm"/>
- <exclude name="org/jboss/test/cluster/classloader/leak/test/*Field*TestCase.class" if="sun-vm"/>
+ <!-- Exclude some classloader leak tests on Sun VM only; they should run on JRockit, OpenJDK -->
+ <exclude name="org/jboss/test/classloader/leak/test/AopPreparedClassesClassloaderLeakUnitTestCase.class" if="sun-vm"/>
+ <exclude name="org/jboss/test/cluster/classloader/leak/test/*Field*TestCase.class" if="sun-vm"/>
<!-- JBAS-6582, http://lists.jboss.org/pipermail/jboss-development/2008-December/013254.html -->
<exclude name="org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.class"/>
- <exclude name="org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.class"/>
- <exclude name="org/jboss/test/ejb3/jbpapp2260/unit/MessageInflowTransactionUnitTestCase.class"/>
+ <exclude name="org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.class"/>
+ <exclude name="org/jboss/test/ejb3/jbpapp2260/unit/MessageInflowTransactionUnitTestCase.class"/>
<!-- JBAS-6792 fix temporarily reverted -->
@@ -1355,6 +1438,9 @@
<!-- jmx-remoting.sar is now disabled for security reasons -->
<exclude name="org/jboss/test/jmx/test/JMXConnectorUnitTestCase.class"/>
+
+ <!-- if we are testing EWP, we need to exclude some tests -->
+ <patternset refid="ewp.excludes"/>
</patternset>
<patternset id="aop-with-classloader.excludes">
@@ -1397,12 +1483,54 @@
<antcall target="jars" inheritRefs="true"/>
</target>
+ <!--
+ This is an ugly hack, but our only option. In EWP, there's nothing like
+ the "all" profile. So, we take "production", which contains "everything" for
+ the distribution, but we use some configuration files from "default", as
+ "production" is secured and optimized, so some options are disabled
+ -->
+ <target name="create-profiles-for-ewp" if="build.ewp">
+ <copy todir="${jboss.dist}/server/testing">
+ <fileset dir="${jboss.dist}/server/production"/>
+ </copy>
+
+ <copy file="${jboss.dist}/server/default/deploy/jca-jboss-beans.xml"
+ tofile="${jboss.dist}/server/testing/deploy/jca-jboss-beans.xml" overwrite="true"/>
+
+ <copy file="${jboss.dist}/server/default/conf/jboss-service.xml"
+ tofile="${jboss.dist}/server/testing/conf/jboss-service.xml" overwrite="true"/>
+
+ <copy file="${jboss.dist}/server/default/deploy/hdscanner-jboss-beans.xml"
+ tofile="${jboss.dist}/server/testing/deploy/hdscanner-jboss-beans.xml" overwrite="true"/>
+
+ <copy todir="${jboss.dist}/server/all">
+ <fileset dir="${jboss.dist}/server/testing"/>
+ </copy>
+
+ <copy todir="${jboss.dist}/server/minimal">
+ <fileset dir="${jboss.dist}/server/testing"/>
+ </copy>
+
+ <copy todir="${jboss.dist}/server/standard">
+ <fileset dir="${jboss.dist}/server/testing"/>
+ </copy>
+
+ <copy todir="${jboss.dist}/server/web">
+ <fileset dir="${jboss.dist}/server/testing"/>
+ </copy>
+
+ <delete dir="${jboss.dist}/server/default"/>
+ <copy todir="${jboss.dist}/server/default">
+ <fileset dir="${jboss.dist}/server/testing"/>
+ </copy>
+ </target>
+
<!-- The top level entry point for all tests that can be run against
variations of the standard jboss dist. This does not include long
running benchmark oriented tests.
-->
<target name="tests" description="Execute all non-benchmark tests."
- depends="maybejars">
+ depends="maybejars,create-profiles-for-ewp">
<record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
<property name="nojars" value="true"/>
<antcall target="jboss-minimal-tests" />
@@ -1465,7 +1593,7 @@
</target>
<target name="jboss-minimal-tests"
- description="Validate the minimal config">
+ description="Validate the minimal config" unless="build.ewp">
<server:start name="minimal"/>
<copy file="${build.lib}/shutdown.sar"
todir="${jboss.dist}/server/minimal/deploy" />
@@ -2794,7 +2922,7 @@
<!--
| IIOP test cases that should run successfully
-->
- <target name="tests-iiop">
+ <target name="tests-iiop" unless="build.ewp">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
@@ -3072,7 +3200,7 @@
| JBoss server distribution build that contains jaxr.
-->
<!-- Test for JAXR under the Web Services Umbrella -->
- <target name="tests-scout-jaxr" >
+ <target name="tests-scout-jaxr" unless="build.ewp">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
@@ -3215,7 +3343,7 @@
<!-- Starts two servers, run few simultaneous tests, kill the server only once and get the results of all the tests -->
<target name="tests-jbossmessaging-cluster"
- description="Run JBM in cluster">
+ description="Run JBM in cluster" unless="build.ewp">
<delete dir="${jboss.dist}/server/jbm-cluster1" />
<delete dir="${jboss.dist}/server/jbm-cluster2" />
@@ -3314,7 +3442,7 @@
| Run JMS tests against the Messaging JMS provider
-->
<target name="tests-jbossmessaging"
- description="Run JMS tests against the Messaging JMS provider">
+ description="Run JMS tests against the Messaging JMS provider" unless="build.ewp">
<!-- Create a separate messaging config -->
<create-config baseconf="default" newconf="jbossmessaging">
@@ -4227,4 +4355,6 @@
</junit>
</target>
+
+ <target name="check-build-type"><echo message="build.ewp is ${build.ewp} and version is ${version} and version.name is ${version.name}"/></target>
</project>
More information about the jboss-cvs-commits
mailing list