[jboss-cvs] JBossAS SVN: r111908 - in branches/JBPAPP_5_1/testsuite: imports and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 2 22:04:29 EDT 2011
Author: bmaxwell
Date: 2011-08-02 22:04:28 -0400 (Tue, 02 Aug 2011)
New Revision: 111908
Added:
branches/JBPAPP_5_1/testsuite/imports/config/tests-jbpapp6517.xml
Modified:
branches/JBPAPP_5_1/testsuite/build.xml
branches/JBPAPP_5_1/testsuite/imports/config/configs.xml
branches/JBPAPP_5_1/testsuite/imports/sections/deployers.xml
branches/JBPAPP_5_1/testsuite/imports/server-config.xml
Log:
[JBPAPP-6517] testcase for EAR and other top level deployments should be Atomic
Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml 2011-08-03 02:02:46 UTC (rev 111907)
+++ branches/JBPAPP_5_1/testsuite/build.xml 2011-08-03 02:04:28 UTC (rev 111908)
@@ -1713,6 +1713,8 @@
<antcall target="tests-classloader-leak"/>
<antcall target="tests-clustered-classloader-leak"/>
-->
+
+ <antcall target="tests-jbpapp6517"/>
<antcall target="tests-report"/>
<!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
Modified: branches/JBPAPP_5_1/testsuite/imports/config/configs.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/configs.xml 2011-08-03 02:02:46 UTC (rev 111907)
+++ branches/JBPAPP_5_1/testsuite/imports/config/configs.xml 2011-08-03 02:04:28 UTC (rev 111908)
@@ -15,4 +15,5 @@
<import file="tests-password-mask.xml"/>
<import file="tests-crash-recovery.xml"/>
<import file="tests-secured.xml"/>
+<import file="tests-jbpapp6517.xml"/>
</project>
Copied: branches/JBPAPP_5_1/testsuite/imports/config/tests-jbpapp6517.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/imports/config/tests-jbpapp6517.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-jbpapp6517.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-jbpapp6517.xml 2011-08-03 02:04:28 UTC (rev 111908)
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+
+<!--
+ | Targets that run the jbpapp6517 - CheckSubDeploymentCompleteDeployer tests
+-->
+<project name="jbpapp6517.tests" xmlns:server="http://jboss.org/ns/test/ant/server">
+
+ <!-- jbpapp6517 -->
+ <patternset id="jbpapp6517-1.includes">
+ <include name="org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.class"/>
+ </patternset>
+ <patternset id="jbpapp6517-2.includes">
+ <include name="org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.class"/>
+ </patternset>
+ <patternset id="jbpapp6517-3.includes">
+ <include name="org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.class"/>
+ </patternset>
+ <patternset id="jbpapp6517-4.includes">
+ <include name="org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.class"/>
+ </patternset>
+
+ <!-- jbpapp6517 start -->
+ <target name="tests-jbpapp6517" description="Tests JBPAPP-6517 CheckSubDeploymentCompleteDeployer tests">
+
+ <create-config baseconf="default" newconf="jbpapp6517">
+ <patternset>
+ <include name="**/*"/>
+ </patternset>
+ </create-config>
+
+ <!-- set jmx user/pass to admin=admin -->
+ <copy file="${source.resources}/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties" overwrite="true" todir="${jboss.dist}/server/jbpapp6517/conf/props/" />
+
+ <!-- default case -->
+ <server:start name="jbpapp6517"/>
+ <run-junit junit.patternset="jbpapp6517-1.includes" junit.configuration="jbpapp6517"/>
+ <server:stop name="jbpapp6517"/>
+
+ <!-- test 1 check all -->
+ <server:start name="jbpapp6517"/>
+ <run-junit junit.patternset="jbpapp6517-2.includes" junit.configuration="jbpapp6517"/>
+ <server:stop name="jbpapp6517"/>
+
+ <!-- test 2 check ear -->
+ <server:start name="jbpapp6517"/>
+ <run-junit junit.patternset="jbpapp6517-3.includes" junit.configuration="jbpapp6517"/>
+ <server:stop name="jbpapp6517"/>
+
+ <!-- test 3 check sar -->
+ <server:start name="jbpapp6517"/>
+ <run-junit junit.patternset="jbpapp6517-4.includes" junit.configuration="jbpapp6517"/>
+ <server:stop name="jbpapp6517"/>
+
+ </target>
+ <!-- jbpapp6517 end -->
+</project>
Modified: branches/JBPAPP_5_1/testsuite/imports/sections/deployers.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/deployers.xml 2011-08-03 02:02:46 UTC (rev 111907)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/deployers.xml 2011-08-03 02:04:28 UTC (rev 111908)
@@ -394,7 +394,47 @@
file="${build.resources}/deployers/failed/empty-jboss-beans.xml"/>
<copy tofile="${build.lib}/deployers-failing-jboss-beans.xml"
file="${build.resources}/deployers/failed/failing-jboss-beans.xml"/>
-
+
+ <!-- JBPAPP-6517 -->
+ <!-- mcbean -->
+ <jar destfile="${build.lib}/jbpapp-6517-bean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployment/jbpapp6517/mcbean/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/org/jboss/test/deployment/jbpapp6517/mcbean/">
+ <include name="META-INF/jboss-beans.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- ejb3 -->
+ <jar destfile="${build.lib}/jbpapp-6517-ejb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployment/jbpapp6517/ejb3/*"/>
+ </fileset>
+ </jar>
+
+ <!-- ear -->
+ <ear destfile="${build.lib}/jbpapp-6517.ear"
+ appxml="${build.resources}/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml"
+ update="true">
+ <fileset dir="${build.lib}">
+ <include name="jbpapp-6517-bean.jar"/>
+ <include name="jbpapp-6517-ejb.jar"/>
+ </fileset>
+
+ <fileset dir="${build.resources}/org/jboss/test/deployment/jbpapp6517/ear/">
+ <include name="META-INF/jboss-app.xml"/>
+ </fileset>
+ </ear>
+
+ <!-- sar -->
+ <jar destfile="${build.lib}/jbpapp-6517.sar">
+ <fileset dir="${build.lib}">
+ <include name="jbpapp-6517-bean.jar"/>
+ <include name="jbpapp-6517-ejb.jar"/>
+ </fileset>
+ </jar>
+
</target>
</project>
Modified: branches/JBPAPP_5_1/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/server-config.xml 2011-08-03 02:02:46 UTC (rev 111907)
+++ branches/JBPAPP_5_1/testsuite/imports/server-config.xml 2011-08-03 02:04:28 UTC (rev 111908)
@@ -1298,6 +1298,18 @@
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
</server>
+ <!-- jbpapp6517 -->
+ <server name="jbpapp6517" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
+ <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ </server>
<server name="cluster-profilesvc-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
More information about the jboss-cvs-commits
mailing list