[jboss-cvs] JBossAS SVN: r87935 - in branches/JBPAPP_4_2_0_GA_CP/testsuite: imports and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 28 06:04:21 EDT 2009
Author: jcosta at redhat.com
Date: 2009-04-28 06:04:21 -0400 (Tue, 28 Apr 2009)
New Revision: 87935
Added:
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml
Modified:
branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/test-jars.xml
Log:
JBQA-1512 - Added support for EJB3 in the compatibility matrix tests
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2009-04-28 10:00:40 UTC (rev 87934)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2009-04-28 10:04:21 UTC (rev 87935)
@@ -3508,14 +3508,14 @@
<test-compatibility client-version="4_2_0_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
<test-compatibility client-version="4_2_1_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
<test-compatibility client-version="4_2_x" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_2_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_2_0_GA_CP01_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_2_0_GA_CP02_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_2_0_GA_CP03_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_2_0_GA_CP04_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_3_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_3_0_GA_CP01_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
- <test-compatibility client-version="4_3_0_GA_CP02_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
+ <test-compatibility client-version="4_2_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_2_0_GA_CP01_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_2_0_GA_CP02_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_2_0_GA_CP03_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_2_0_GA_CP04_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_3_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_3_0_GA_CP01_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
+ <test-compatibility client-version="4_3_0_GA_CP02_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="all"/>
<!-- testing interoperating with clients using the pooled invokers -->
<test-compatibility-pooled-invokers client-version="4_0_3" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
@@ -3526,12 +3526,12 @@
<test-compatibility-pooled-invokers client-version="4_2_0_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_1_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_x" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
- <test-compatibility-pooled-invokers client-version="4_2_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_2_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_0_GA_CP01_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_0_GA_CP02_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_0_GA_CP03_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_2_0_GA_CP04_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
- <test-compatibility-pooled-invokers client-version="4_3_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_3_0_GA_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_3_0_GA_CP01_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_3_0_GA_CP02_EAP" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
</target>
@@ -3546,7 +3546,7 @@
<wait-on-host/>
<antcall target="tests-standard-unit-matrix-version-pooled">
<param name="matrix-configuration" value="@{client-version}"/>
- <param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
+ <param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
<param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
<param name="client-serialization-flag" value="@{client-serialization-flag}"/>
</antcall>
@@ -3566,7 +3566,7 @@
<wait-on-host/>
<antcall target="tests-standard-unit-matrix-version">
<param name="matrix-configuration" value="@{client-version}"/>
- <param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
+ <param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
<param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
<param name="client-serialization-flag" value="@{client-serialization-flag}"/>
</antcall>
@@ -3576,26 +3576,33 @@
</macrodef>
<target name="tests-standard-unit-matrix-version">
- <execute-matrix-unit test-name="testbyvalue" parameter-filter="org/jboss/test/testbyvalue/test/**/*TestCase.class"/>
- <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/>
- <execute-matrix-unit test-name="bmp" parameter-filter="org/jboss/test/bmp/**/*TestCase.class"/>
- <execute-matrix-unit test-name="cmp2" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/>
- <execute-matrix-unit test-name="jms" parameter-filter="org/jboss/test/jbossmq/test/JBossMQUnitTest.class"/>
- <execute-matrix-unit test-name="jbm" parameter-filter="org/jboss/test/jbossmessaging/test/JBossJMSUnitTestCase.class"/>
+ <execute-matrix-unit test-name="bank" parameter-filter="org/jboss/ejb3/test/bank/**/*TestCase.class" classes="${build.classes}"/>
+ <execute-matrix-unit test-name="testbyvalue" parameter-filter="org/jboss/test/testbyvalue/test/**/*TestCase.class" classes="${build.classes14}"/>
+ <!--
+ <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class" classes="${build.classes14}"/>
+ <execute-matrix-unit test-name="bmp" parameter-filter="org/jboss/test/bmp/**/*TestCase.class" classes="${build.classes14}"/>
+ <execute-matrix-unit test-name="cmp2" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class" classes="${build.classes14}"/>
+ <execute-matrix-unit test-name="jms" parameter-filter="org/jboss/test/jbossmq/test/JBossMQUnitTest.class" classes="${build.classes14}"/>
+ <execute-matrix-unit test-name="jbm" parameter-filter="org/jboss/test/jbossmessaging/test/JBossJMSUnitTestCase.class" classes="${build.classes14}"/>
+ -->
</target>
<target name="tests-standard-unit-matrix-version-pooled">
- <execute-matrix-unit test-name="pooled-invoker" parameter-filter="org/jboss/test/pooled/test/**/BeanStressTestCase.class"/>
+ <!--
+ <execute-matrix-unit test-name="pooled-invoker" parameter-filter="org/jboss/test/pooled/test/**/BeanStressTestCase.class" classes="${build.classes14}"/>
+ -->
</target>
<macrodef name="execute-matrix-unit">
<attribute name="test-name"/>
<attribute name="parameter-filter"/>
+ <attribute name="classes"/>
<sequential>
<!-- this requires antcall as a property can't be redefined -->
<antcall target="execute-matrix-unit-target">
<param name="test-name" value="@{test-name}"/>
<param name="parameter-filter" value="@{parameter-filter}"/>
+ <param name="classes" value="@{classes}"/>
</antcall>
</sequential>
</macrodef>
@@ -3603,12 +3610,12 @@
<target name="execute-matrix-unit-target">
<echo message=">>>>>> Executing test=${test-name} filter=${parameter-filter}"/>
<pathconvert pathSep="," dirSep="/" property="jbosstest.hometest">
- <path location="${build.classes14}"/>
+ <path location="${classes}"/>
</pathconvert>
<pathconvert pathSep="," dirSep="/" property="jbosstest.executionlist">
<path>
- <fileset dir="${build.classes14}">
+ <fileset dir="${classes}">
<include name="${parameter-filter}"/>
<!-- The following test excluded because they need jboss.jar to
access the following classes not included with the client libs:
@@ -3640,7 +3647,7 @@
<propertyref prefix="jbosstest."/>
</syspropertyset>
<classpath>
- <pathelement location="${build.classes14}"/>
+ <pathelement location="${classes}"/>
<pathelement location="${build.resources}"/>
<fileset dir="${current-version-dir}" includes="*.jar"/>
<!-- compiled with javac.source/target = 1.4 since
Added: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml 2009-04-28 10:04:21 UTC (rev 87935)
@@ -0,0 +1,20 @@
+<project name="tests-ejb30-jars">
+ <target name="_jars-ejb30">
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/bank-ejb30.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/bank/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/bank/ejbutil/*.class"/>
+ </fileset>
+ <fileset dir="../ejb3/src/resources/test/bank/">
+ <include name="META-INF/*.xml"/>
+ <include name="bank-ejb3-interceptors-aop.xml"/>
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ </jar>
+ </target>
+</project>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/test-jars.xml 2009-04-28 10:00:40 UTC (rev 87934)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/test-jars.xml 2009-04-28 10:04:21 UTC (rev 87935)
@@ -71,6 +71,7 @@
<import file="sections/xa.xml"/>
<import file="sections/xslt.xml"/>
<import file="sections/byvalue.xml"/>
+ <import file="sections/ejb30.xml"/>
<import file="sections/jbm.xml"/>
<!--
@@ -156,6 +157,7 @@
_jars-xa,
_jars-xslt,
_jars-byvalue,
+ _jars-ejb30,
_jars-jbm
">
</target>
More information about the jboss-cvs-commits
mailing list