[jboss-cvs] JBossAS SVN: r63008 - trunk/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 11 18:13:23 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-11 18:13:23 -0400 (Fri, 11 May 2007)
New Revision: 63008
Modified:
trunk/testsuite/build.xml
Log:
tests-aop-scoped need to start the server
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-05-11 21:49:48 UTC (rev 63007)
+++ trunk/testsuite/build.xml 2007-05-11 22:13:23 UTC (rev 63008)
@@ -81,16 +81,16 @@
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
-
+
&libraries;
&testsuite-libraries;
-
+
<!-- define jbossws classpath explicitly because jbossws/lib contains other integration layers as well -->
<path id="jbossws.integration.classpath">
<pathelement path="${jboss.jbossws.lib}/jbossws-jboss42-integration.jar"/>
<pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
</path>
-
+
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="apache.avalon.classpath"/>
@@ -145,17 +145,17 @@
<!-- xml binding -->
<path refid="xmlunit.xmlunit.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
-
+
<!-- For classloader leak tests -->
<path refid="jboss.profiler.jvmti.classpath"/>
-
+
</path>
<!-- ======= -->
<!-- Modules -->
&modules;
-
+
<!-- ======= -->
<!-- InternalServer -->
<!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
@@ -279,7 +279,7 @@
<!-- Classpath to build and run the tests -->
<path id="tests.classpath">
<fileset dir="${jboss.dist}/client">
- <include name="**/*.jar"/>
+ <include name="**/*.jar"/>
</fileset>
<pathelement path="${classpath}"/>
@@ -662,7 +662,7 @@
<!-- Tests needing IIOP setup -->
<patternset id="iiop.includes">
<include name="org/jboss/test/*iiop/test/*TestCase.class"/>
- <exclude name="org/jboss/test/txiiop/test/*TestCase.class"/>
+ <exclude name="org/jboss/test/txiiop/test/*TestCase.class"/>
</patternset>
<patternset id="iiop.excludes">
<exclude name="org/jboss/test/*iiop/test/*"/>
@@ -691,7 +691,7 @@
</patternset>
<!-- jbossmessaging includes -->
<patternset id="jbossmessaging.includes">
- <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
+ <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
<include name="org/jboss/test/jbossmessaging/perf/*StressTestCase.class"/>
<include name="org/jboss/test/jbossmessaging/ra/*UnitTestCase.class"/>
<include name="org/jboss/test/jms/integration/**/*Test.class"/>
@@ -829,7 +829,7 @@
<!-- JMS agnostic tests need to be identified -->
<exclude name="org/jboss/test/jbossmq/**"/>
<!-- JBAS-2026 -->
- <exclude name="org/jboss/test/jmx/test/JarInSarJSR77UnitTestCase.class"/>
+ <exclude name="org/jboss/test/jmx/test/JarInSarJSR77UnitTestCase.class"/>
</patternset>
<patternset id="aop-with-classloader.excludes">
@@ -992,14 +992,14 @@
<server:start name="cluster-${jboss-junit-configuration}-1"/>
<echo message="Going to call target tests-clustering-unit for non-HTTP tests"/>
-
+
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.non.http.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
</antcall>
-
+
<echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, with BR)"/>
<antcall target="tests-clustering-unit">
@@ -1033,7 +1033,7 @@
<server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
<sleep seconds="4"/>
-
+
<echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, with BR)"/>
<antcall target="tests-clustering-sync-configure"/>
@@ -1238,14 +1238,14 @@
<!-- Create the sso enabled tomcat config starting with the all config -->
<create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster1"/>
-
+
<echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
<http-cluster-node-config-change conf="tomcat-sso-cluster0" useBuddyRepl="false"/>
<http-cluster-node-config-change conf="tomcat-sso-cluster1" useBuddyRepl="false"/>
<server:start name="tomcat-sso-cluster0"/>
<server:start name="tomcat-sso-cluster1"/>
-
+
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
<param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
@@ -1255,7 +1255,7 @@
<server:stop name="tomcat-sso-cluster1"/>
<!-- Do it again with BR enabled -->
-
+
<create-cluster-sso-node newconf="tomcat-sso-cluster-br0"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster-br1"/>
@@ -1265,7 +1265,7 @@
<server:start name="tomcat-sso-cluster-br0"/>
<server:start name="tomcat-sso-cluster-br1"/>
-
+
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
<param name="jboss-junit-configuration" value="tomcat-sso-cluster-br"/>
@@ -1273,7 +1273,7 @@
<server:stop name="tomcat-sso-cluster-br0"/>
<server:stop name="tomcat-sso-cluster-br1"/>
-
+
</target>
<!-- Tests that require the attribute "UseJBossWebLoader" set to true -->
@@ -1302,7 +1302,7 @@
description="Tomcat tests requiring Federation configured">
<!-- Create the federation enabled tomcat config starting with the default config -->
<create-config baseconf="default" newconf="tomcat-federation">
- <patternset>
+ <patternset>
<include name="conf/**"/>
<include name="deployers/**"/>
<include name="deploy/ROOT.war/**"/>
@@ -2364,7 +2364,7 @@
<copy file="${build.resources}/messaging/test-destinations-full-service.xml"
todir="${jboss.dist}/server/jacc/deploy" />
-->
-
+
<server:start name="jacc"/>
<mkdir dir="${build.reports}"/>
@@ -2569,8 +2569,8 @@
<!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
<sysproperty key="jboss-junit-configuration" value="tests-compatibility"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-compatibility.xml"/>
<batchtest todir="${build.reports}"
@@ -2615,8 +2615,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/-->
<sysproperty key="jboss-junit-configuration" value="tests-treecacheaop-unit"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-treecacheaop-unit.xml"/>
<batchtest todir="${build.reports}"
@@ -2679,8 +2679,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-treecacheaopc-unit"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-treecacheaopc-unit.xml"/>
<batchtest todir="${build.reports}"
@@ -2724,8 +2724,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-baseaop-unit"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-baseaop-unit.xml"/>
<batchtest todir="${build.reports}"
@@ -2766,8 +2766,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-jbossmx-implementation"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-jbossmx-implementation.xml"/>
<batchtest todir="${build.reports}"
@@ -2811,10 +2811,10 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-jbossmx-performance"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-jbossmx-performance.xml"/>
-
+
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
haltonfailure="${junit.batchtest.haltonfailure}"
@@ -2855,7 +2855,7 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-jbossmx-compliance"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}"
extension="-tests-jbossmx-compliance.xml"/>
@@ -2919,8 +2919,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-iiop"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-iiop.xml"/>
<batchtest todir="${build.reports}"
@@ -2964,8 +2964,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-xml-unit"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-xml-unit.xml"/>
<batchtest todir="${build.reports}"
@@ -3009,8 +3009,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/-->
<sysproperty key="jboss-junit-configuration" value="tests-stax"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-stax.xml"/>
<batchtest todir="${build.reports}"
@@ -3068,8 +3068,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-webservice"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-webservice.xml"/>
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -3170,8 +3170,8 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-scout-jaxr"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
extension="-tests-scout-jaxr.xml"/>
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -3190,44 +3190,16 @@
<!-- The scoped AOP tests need a classloader hook -->
<target name="tests-aop-scoped"
- description="AOP tests requiring a native classloader hook"
- depends="tests-aop-scoped-jdk14,tests-aop-scoped-jdk50">
- </target>
- <target name="tests-aop-scoped-jdk14"
- description="AOP tests requiring a native classloader hook for JDK 1.4"
- unless="HAVE_JDK_1.5">
+ description="AOP tests requiring a native classloader hook">
- <!-- Generate the JDK 1.4 classloader hook -->
- <java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader">
- <classpath>
- <path refid="javassist.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </classpath>
- <arg value="${jboss.dist}/bin/woven-classloader"/>
- </java>
- <!-- copy across the jdk 1.4 pluggable instrumentor -->
- <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/>
- <server:start name="scoped-aop-jdk14"/>
-
- <antcall target="run-tests-aop-scoped" inheritRefs="true"/>
-
- <server:stop name="scoped-aop-jdk14"/>
-
- <delete dir="${jboss.dist}/bin/woven-classloader"/>
- <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/>
- </target>
- <target name="tests-aop-scoped-jdk50"
- description="AOP tests requiring a native classloader hook for JDK 5.0"
- if="HAVE_JDK_1.5">
-
<!-- copy across the pluggable instrumentor -->
- <!--copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
- <server:start name="scoped-aop-jdk50"/-->
+ <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
+ <server:start name="scoped-aop-jdk50"/>
<antcall target="run-tests-aop-scoped" inheritRefs="true"/>
- <!--server:stop name="scoped-aop-jdk50"/>
+ <server:stop name="scoped-aop-jdk50"/>
- <delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/-->
+ <delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/>
</target>
<target name="tests-aop-scoped-generated-advisor"
description="AOP tests requiring a native classloader hook for JDK 5.0"
@@ -3278,7 +3250,7 @@
-->
<target name="tests-jbossmessaging"
description="Run JMS tests against the Messaging JMS provider">
-
+
<!-- unpack the integration tests from jms-integration-tests, packed as thirdparty libraries -->
<unzip src="${jboss.jms.integration.tests.lib}/jms-integration-tests.jar" dest="${build.classes}"/>
<copy todir="${build.lib}">
@@ -3333,7 +3305,7 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-jbossmessaging"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}"
extension="-tests-jbossmessaging.xml"/>
@@ -3379,7 +3351,7 @@
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
<sysproperty key="jboss-junit-configuration" value="tests-db"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}"
extension="-tests-db.xml"/>
@@ -3460,7 +3432,7 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/${test}/**/*TestCase.class"/>
- <patternset refid="badtest.excludes"/>
+ <patternset refid="badtest.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -3819,21 +3791,21 @@
<sleep seconds="5"/>
<delete file="${jboss.dist}/server/minimal/deploy/shutdown.sar" />
<sleep seconds="7"/>
-
+
<!-- minimal -->
<server:start name="all"/>
<server:stop name="all"/>
-
+
<!-- tests-apache-tomcat-clustering -->
<create-cluster-node conf="node0"/>
<server:start name="node0" />
<create-cluster-node conf="node1"/>
<server:start name="node1"/>
-
+
<server:stop name="node0"/>
<server:stop name="node1"/>
<apache location="${apache.location}" action-type="stop"/>
-
+
<!-- Test the default UDP stack -->
<antcall target="tests-clustering-configure">
<param name="jboss-junit-configuration" value="udp"/>
@@ -3842,7 +3814,7 @@
<server:start name="cluster-udp-1"/>
<server:stop name="cluster-udp-0"/>
<server:stop name="cluster-udp-1"/>
-
+
<!-- Test a TCP stack.-->
<antcall target="tests-clustering-configure">
<param name="jboss-junit-configuration" value="tcp"/>
@@ -3851,7 +3823,7 @@
<server:start name="cluster-tcp-1"/>
<server:stop name="cluster-tcp-0"/>
<server:stop name="cluster-tcp-1"/>
-
+
<!-- Test a TCP_NIO stack.-->
<antcall target="tests-clustering-configure">
<param name="jboss-junit-configuration" value="tcp_nio"/>
@@ -3860,7 +3832,7 @@
<server:start name="cluster-tcp_nio-1"/>
<server:stop name="cluster-tcp_nio-0"/>
<server:stop name="cluster-tcp_nio-1"/>
-
+
<!-- Test the field UDP stack -->
<antcall target="tests-clustering-field-configure">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
@@ -3868,11 +3840,11 @@
<param name="jbosstest.cluster.node0.config" value="cluster-field-udp-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-field-udp-1"/>
</antcall>
-
+
<server:start name="cluster-field-udp-0"/>
<server:start name="cluster-field-udp-1"/>
<server:stop name="cluster-field-udp-0"/>
- <server:stop name="cluster-field-udp-1"/>
+ <server:stop name="cluster-field-udp-1"/>
<!-- Test the field TCP stack -->
<antcall target="tests-clustering-field-configure">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
@@ -3880,11 +3852,11 @@
<param name="jbosstest.cluster.node0.config" value="cluster-field-tcp-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-field-tcp-1"/>
</antcall>
-
+
<server:start name="cluster-field-tcp-0"/>
<server:start name="cluster-field-tcp-1"/>
<server:stop name="cluster-field-tcp-0"/>
- <server:stop name="cluster-field-tcp-1"/>
+ <server:stop name="cluster-field-tcp-1"/>
<!-- Test the field TCP_NIO stack -->
<antcall target="tests-clustering-field-configure">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
@@ -3892,7 +3864,7 @@
<param name="jbosstest.cluster.node0.config" value="cluster-field-tcp_nio-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-field-tcp_nio-1"/>
</antcall>
-
+
<server:start name="cluster-field-tcp_nio-0"/>
<server:start name="cluster-field-tcp_nio-1"/>
<server:stop name="cluster-field-tcp_nio-0"/>
@@ -3901,29 +3873,29 @@
<!-- Create the sso enabled tomcat config starting with the all config -->
<create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster1"/>
-
+
<echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
<http-cluster-node-config-change conf="tomcat-sso-cluster0" useBuddyRepl="false"/>
<http-cluster-node-config-change conf="tomcat-sso-cluster1" useBuddyRepl="false"/>
-
+
<server:start name="tomcat-sso-cluster0"/>
<server:start name="tomcat-sso-cluster1"/>
-
+
<server:stop name="tomcat-sso-cluster0"/>
<server:stop name="tomcat-sso-cluster1"/>
-
+
<!-- Do it again with BR enabled -->
-
+
<create-cluster-sso-node newconf="tomcat-sso-cluster-br0"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster-br1"/>
-
+
<echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
<http-cluster-node-config-change conf="tomcat-sso-cluster-br0" useBuddyRepl="true"/>
<http-cluster-node-config-change conf="tomcat-sso-cluster-br1" useBuddyRepl="true"/>
-
+
<server:start name="tomcat-sso-cluster-br0"/>
<server:start name="tomcat-sso-cluster-br1"/>
-
+
<server:stop name="tomcat-sso-cluster-br0"/>
<server:stop name="tomcat-sso-cluster-br1"/>
@@ -3938,7 +3910,7 @@
<include name="deploy/jmx-invoker-service.xml"/>
</patternset>
</create-config>
-
+
<server:start name="tomcat-webctx"/>
<server:stop name="tomcat-webctx"/>
@@ -3947,7 +3919,7 @@
<create-all-cluster-node conf="binding-manager2" ports="ports-02"/>
<server:start name="binding-manager1"/>
<server:start name="binding-manager2"/>
-
+
<server:stop name="binding-manager1"/>
<server:stop name="binding-manager2"/>
</target>
More information about the jboss-cvs-commits
mailing list