[jboss-cvs] JBossAS SVN: r89295 - branches/JBPAPP_4_2_0_GA_CP/testsuite.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 22 12:16:25 EDT 2009


Author: jcosta at redhat.com
Date: 2009-05-22 12:16:25 -0400 (Fri, 22 May 2009)
New Revision: 89295

Modified:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
Log:
JBQA-2311 - Added more tests to compat matrix

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2009-05-22 16:11:45 UTC (rev 89294)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2009-05-22 16:16:25 UTC (rev 89295)
@@ -3499,6 +3499,7 @@
         <include name="lib/**"/>
       </patternset>
     </create-config>
+
     <!-- test interoperating with clients using the legacy rmi invokers -->
     <test-compatibility client-version="3_2_8SP1" client-jdk="${jdk15}" client-serialization-flag="-Dorg.jboss.j2ee.Serialization" serialization-flag="-Dnone" server-config="legacy-invokers"/>
     <test-compatibility client-version="3_2_x"    client-jdk="${jdk15}" client-serialization-flag="-Dorg.jboss.j2ee.Serialization" serialization-flag="-Dnone" server-config="legacy-invokers"/>
@@ -3506,6 +3507,7 @@
     <test-compatibility client-version="4_0_2"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="legacy-invokers"/>
     <test-compatibility client-version="4_0_3"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="legacy-invokers"/>
     <test-compatibility client-version="4_0_3SP1" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="legacy-invokers"/>
+
     <!-- testing interoperating with clients using the unified invokers over jboss remoting -->
     <test-compatibility client-version="4_0_4_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
     <test-compatibility client-version="4_0_5_GA" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" server-config="default"/>
@@ -3514,13 +3516,13 @@
     <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="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"/>
+    <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"/>
@@ -3581,13 +3583,37 @@
   </macrodef>
 
   <target name="tests-standard-unit-matrix-version">
+    <execute-matrix-unit test-name="sec" parameter-filter="**/test/security/test/*UnitTestCase.class" classes="${build.classes}"/>
     <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="jbm" parameter-filter="org/jboss/test/jbossmessaging/test/JBossJMSUnitTestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="management" parameter-filter="org/jboss/test/management/test/*TestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="hibernate" parameter-filter="org/jboss/test/hibernate/test/*TestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="transactions" parameter-filter="org/jboss/test/tm/test/TransactionManagerUnitTestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="webservice" parameter-filter="org/jboss/test/webservice/**/*TestCase.class" classes="${build.classes}"/>
+  	
+    <!-- Security tests -->
+    <execute-matrix-unit test-name="sec-auth" parameter-filter="**/test/security/test/auth/*UnitTestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec-ejb" parameter-filter="**/test/security/test/ejb/*TestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec-jmx" parameter-filter="**/test/jmx/test/Secure*TestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec-perf" parameter-filter="**/test/perf/test/SecurePerfStressTestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec-timer" parameter-filter="**/test/timer/test/SecureTimerUnitTestCase.class" classes="${build.classes}"/>
+
+    <!-- Fix them: -->
+    <!--
+    <execute-matrix-unit test-name="sec-jmx-rmi" parameter-filter="**/test/jmx/test/RMIAdaptorAuth*TestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec-naming" parameter-filter="**/test/naming/test/Security*" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec" parameter-filter="**/test/security/test/*UnitTestCase.class" classes="${build.classes}"/>
+    <execute-matrix-unit test-name="sec-jca" parameter-filter="**/test/jca/test/SecurityContextUnitTestCase.class" classes="${build.classes}"/>
+    -->
+  	
+    <!-- Deprecated -->
+    <!--
     <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">
@@ -3643,6 +3669,12 @@
       <sysproperty key="jboss-junit-configuration" value="${test-name}_${matrix-configuration}"/>
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
       <sysproperty key="jbosstest.server.host" value="${node0}"/>
+
+      <sysproperty key="jbosstest.secure" value="false"/>
+      <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
+      <sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/security/tst.keystore"/>
+      <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+
       <!-- Pass along any jbosstest.* system properties -->
       <syspropertyset>
         <propertyref prefix="jbosstest."/>
@@ -3655,6 +3687,25 @@
         org/jboss/test/JBossTestCase (from jboss-test.jar)
         is needed for the tests -->
         <path refid="jboss.test.classpath"/>
+
+        <!-- External elements needed by compatibility matrix -->
+        <path refid="apache.xerces.classpath"/> <!-- For webservices -->
+
+        <path refid="hibernate3.classpath"/> <!-- For Hibernate -->
+        <path refid="jgroups.jgroups.classpath"/> <!-- For Hibernate -->
+
+        <path refid="objectweb.joramtests.classpath"/> <!-- For JBossJMSUnitTestCase -->
+        <path refid="jboss.aop.classpath"/> <!-- For JBossJMSUnitTestCase -->
+        <path refid="jboss.messaging.classpath"/> <!-- For JBossJMSUnitTestCase -->
+        <path refid="jboss.remoting.classpath"/> <!-- For JBossJMSUnitTestCase -->
+        <path refid="javassist.classpath"/> <!-- For JBossJMSUnitTestCase -->
+        <path refid="jboss.common.classpath"/> <!-- For JBossJMSUnitTestCase -->
+        <path refid="trove.classpath"/> <!-- For JBossJMSUnitTestCase -->
+
+        <pathelement location="../management/output/classes"/> <!-- For management tests -->
+        <pathelement location="../security/output/classes/"/> <!-- For sec-* tests -->
+        <pathelement location="../security/src/tests/org/jboss/test/"/> <!-- For sec-* tests -->
+
       </classpath>
       <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}"
         extension="-${test-name}_${matrix-configuration}.xml"/>




More information about the jboss-cvs-commits mailing list