[jboss-cvs] JBossAS SVN: r92584 - branches/JBPAPP_5_0/testsuite.

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

Author: jcosta at redhat.com
Date: 2009-08-19 15:11:16 -0400 (Wed, 19 Aug 2009)
New Revision: 92584

Modified:
   branches/JBPAPP_5_0/testsuite/build.xml
Log:
JBPAPP-2494 - Some fixes to the classpath of the compat matrix

Modified: branches/JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/build.xml	2009-08-19 18:56:47 UTC (rev 92583)
+++ branches/JBPAPP_5_0/testsuite/build.xml	2009-08-19 19:11:16 UTC (rev 92584)
@@ -352,6 +352,29 @@
       <path refid="tests.compile.classpath"/>
    </path>
 
+   <!-- The classpath for the compatibility matrix -->
+   <path id="compatmatrix.classpath">
+     <pathelement location="${build.classes}"/>
+     <pathelement location="${build.resources}"/>
+     <fileset dir="${jboss.dist}/client">
+       <include name="jboss-deployers-client-spi.jar"/>
+       <include name="jboss-deployers-core-spi.jar"/>
+       <include name="jboss-client.jar"/>
+       <include name="jboss-security-spi.jar"/>
+       <include name="jboss-appclient.jar"/>
+       <include name="jboss-messaging-client.jar"/>
+       <include name="jbosssx-client.jar"/>
+      </fileset>
+
+     <path refid="jboss.test.classpath"/>
+     <path refid="jboss.jboss.cl.classpath"/>
+     <path refid="jboss.microcontainer.classpath"/>
+     <path refid="jboss.jboss.reflect.classpath"/>
+     <path refid="jboss.jboss.mdr.classpath"/>
+
+     <fileset dir="${current-version-dir}" includes="*.jar"/>
+   </path>
+
    <!-- Packages to include when generating api documentation -->
    <property name="javadoc.packages" value="org.jboss.*"/>
 
@@ -3655,6 +3678,8 @@
      <test-compatibility client-version="5_0_1_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility client-version="5_1_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility client-version="5_0_0_GA_EAP_CR2" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility client-version="5_0_0_GA_EAP_CR1_SIGNED" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility client-version="5_0_0_GA_EAP_CR1_UNSIGNED" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
 
      <!-- testing interoperating with clients using the pooled invokers -->
      <test-compatibility-pooled-invokers client-version="4_2_3_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
@@ -3664,6 +3689,8 @@
      <test-compatibility-pooled-invokers client-version="5_0_1_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility-pooled-invokers client-version="5_1_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
      <test-compatibility-pooled-invokers client-version="5_0_0_GA_EAP_CR2" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility-pooled-invokers client-version="5_0_0_GA_EAP_CR1_SIGNED" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+     <test-compatibility-pooled-invokers client-version="5_0_0_GA_EAP_CR1_UNSIGNED" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
    </target>
  
   <macrodef name="test-compatibility-pooled-invokers">
@@ -3709,8 +3736,8 @@
   </macrodef>
  
    <target name="tests-standard-unit-matrix-version">
+     <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/>
      <execute-matrix-unit test-name="ejb3" parameter-filter="org/jboss/test/ejb3/**/unit/*TestCase.class"/>
-     <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/>
      <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"/>
@@ -3784,11 +3811,7 @@
          <propertyref prefix="jbosstest."/>
        </syspropertyset>
        <classpath>
-         <pathelement location="${build.classes}"/>
-         <pathelement location="${build.resources}"/>
-         <fileset dir="${current-version-dir}" includes="*.jar"/>
-         <path refid="tests.classpath"/>
-         <path refid="tests.compile.classpath"/>
+         <path refid="compatmatrix.classpath"/>
        </classpath>
        <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}"
          extension="-${test-name}_${matrix-configuration}.xml"/>