[jboss-cvs] JBossAS SVN: r62974 - branches/Branch_4_2/testsuite.

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

Author: dimitris at jboss.org
Date: 2007-05-10 18:05:05 -0400 (Thu, 10 May 2007)
New Revision: 62974

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
exclude compatibility tests that need access to jboss.jar and use a jboss-test.jar compiled with javac.source/target = 1.4

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-05-10 21:12:35 UTC (rev 62973)
+++ branches/Branch_4_2/testsuite/build.xml	2007-05-10 22:05:05 UTC (rev 62974)
@@ -2835,7 +2835,7 @@
     <test-compatibility-pooledInvokers client-version="4_0_4_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
     <test-compatibility-pooledInvokers client-version="4_0_5_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
     <test-compatibility-pooledInvokers client-version="4_0_x" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>    
+    <test-compatibility-pooledInvokers client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
   </target>
 
   <macrodef name="test-compatibility-pooledInvokers">
@@ -2910,6 +2910,14 @@
       <path>
         <fileset dir="${build.classes14}">
           <include name="${parameter-filter}"/>
+          <!-- The following test excluded because they need jboss.jar to
+               access the following classes not included with the client libs:
+               org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQueryMetaData
+               org/jboss/metadata/ClientMetaData -->
+          <exclude name="org/jboss/test/client/test/MetaDataUnitTestCase.class"/>
+          <exclude name="org/jboss/test/cmp2/commerce/QueryTest.class"/>
+          <exclude name="org/jboss/test/cmp2/commerce/LimitOffsetTest.class"/>
+          <exclude name="org/jboss/test/cmp2/commerce/CompleteUnitTestCase.class"/>
         </fileset>
       </path>
     </pathconvert>
@@ -2935,12 +2943,10 @@
         <pathelement location="${build.classes14}"/>
         <pathelement location="${build.resources}"/>
         <fileset dir="${current-version-dir}" includes="*.jar"/>
-        <!-- The following classes are needed for the test
+        <!-- compiled with javac.source/target = 1.4 since
         org/jboss/test/JBossTestCase (from jboss-test.jar)
-
-        org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQueryMetaData
-        org/jboss/metadata/ClientMetaData (both from jboss.jar)
-        -->
+        is needed for the tests -->
+        <path refid="jboss.test.classpath"/>
       </classpath>
       <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}"
         extension="-${test-name}_${matrix-configuration}.xml"/>