Author: julien(a)jboss.com Date: 2007-09-17 16:32:44 -0400 (Mon, 17 Sep 2007) New Revision: 8299 Modified: modules/web/trunk/testsuite/build.xml modules/web/trunk/tools/etc/buildfragments/buildmagic.ent modules/web/trunk/web/build.xml modules/web/trunk/web/src/resources/test/config/servers.xml Log: added support for test of jboss 4.2.0 and 4.2.1 Modified: modules/web/trunk/testsuite/build.xml =================================================================== --- modules/web/trunk/testsuite/build.xml 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/testsuite/build.xml 2007-09-17 20:32:44 UTC (rev 8299) @@ -123,7 +123,7 @@ <!-- remove generated test xml files --> <delete> <fileset dir="../web" includes="*.log"/> - <fileset dir="../web" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + <fileset dir="../web" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt,output/cargo/*"/> </delete> <!-- remove testsuite output dir --> <delete includeEmptyDirs="true" quiet="true"> Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:32:44 UTC (rev 8299) @@ -83,15 +83,24 @@ <!-- Setup the environment --> <property environment="env"/> - <!-- Define jboss home --> - <condition property="jboss-4.2.home" value="${env.JBOSS_4_2_HOME}"> + <!-- Define JBoss homes --> + + <condition property="jboss-4.2.0.home" value="${env.JBOSS_4_2_0_HOME}"> <and> <not> - <isset property="jboss-4.2.home"/> + <isset property="jboss-4.2.0.home"/> </not> - <isset property="env.JBOSS_4_2_HOME"/> + <isset property="env.JBOSS_4_2_0_HOME"/> </and> </condition> + <condition property="jboss-4.2.1.home" value="${env.JBOSS_4_2_1_HOME}"> + <and> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + <isset property="env.JBOSS_4_2_1_HOME"/> + </and> + </condition> <!-- Define tomcat home --> <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/web/build.xml 2007-09-17 20:32:44 UTC (rev 8299) @@ -322,7 +322,7 @@ </taskdef> </target> - <target name="cargo.jboss.start" depends="cargo.setup"> + <target name="cargo.jboss-4.2.start" depends="cargo.setup"> <!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown @@ -331,9 +331,9 @@ --> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - output="${cargo.log.dir}/cargo.jboss.server.log" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -350,11 +350,11 @@ </cargo> </target> - <target name="cargo.jboss.stop" depends="cargo.setup"> + <target name="cargo.jboss-4.2.stop" depends="cargo.setup"> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="stop"> <configuration> <property name="cargo.rmi.port" value="1099"/> @@ -362,12 +362,85 @@ </cargo> </target> - <target name="cargo.tomcat.start" depends="cargo.setup"> + <target name="tests.jboss-4.2.container-servlet" depends="init" if="${test.jboss-4.2.home.variable-name}"> + <echo message="Starting JBoss 4.2 container-servlet tests with ${test.jboss-4.2.home}"/> + <antcall target="cargo.jboss-4.2.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-4.2.name}"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-container-servlet"/> + </antcall> + <antcall target="cargo.jboss-4.2.stop"> + </antcall> + </target> + + <target name="tests.jboss-4.2.generic" depends="init" if="${test.jboss-4.2.home.variable-name}"> + <echo message="Starting JBoss 4.2 generic tests with ${test.jboss-4.2.home}"/> + <antcall target="cargo.jboss-4.2.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-4.2.name}"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-generic"/> + </antcall> + <antcall target="cargo.jboss-4.2.stop"> + </antcall> + </target> + + <target name="tests.jboss-4.2" depends="init"> + + <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> + <condition> + <and> + <not> + <isset property="jboss-4.2.0.home"/> + </not> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + </and> + </condition> + </fail> + + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_0-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> + </antcall> + + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_1-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> + </antcall> + + <antcall target="tests.jboss-4.2.generic"> + <param name="test.id" value="JBoss-4_2_0-generic"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> + </antcall> + + <antcall target="tests.jboss-4.2.generic"> + <param name="test.id" value="JBoss-4_2_1-generic"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> + </antcall> + + </target> + + <target name="cargo.tomcat-6.start" depends="cargo.setup"> <cargo - containerId="tomcat5x" - home="${tomcat-6.0.home}" - output="${cargo.log.dir}/cargo.tomcat.server.log" - log="${cargo.log.dir}/cargo.tomcat.log" + containerId="tomcat5x" + home="${test.tomcat-6.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.start.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -381,106 +454,85 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>--> - <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> <deployable type="war" file="${test.spi.server.path}"/> </configuration> </cargo> </target> - <target name="cargo.tomcat.stop" depends="cargo.setup"> + <target name="cargo.tomcat-6.stop" depends="cargo.setup"> <cargo containerId="tomcat5x" - home="${tomcat-6.0.home}" - log="${cargo.log.dir}/cargo.tomcat.log" + home="${test.tomcat-6.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> </configuration> </cargo> </target> - <target name="tests" depends="init"> - <antcall target="tests.local"/> - <antcall target="tests.jboss.container-servlet"/> - <antcall target="tests.jboss.generic"/> - <antcall target="tests.tomcat.container-servlet"/> - <antcall target="tests.tomcat.generic"/> - </target> + <target name="tests.tomcat-6" depends="init"> - <target name="tests.jboss" depends="init"> - <antcall target="tests.jboss.container-servlet"/> - </target> + <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <condition> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + </and> + </condition> + </fail> - <target name="tests.jboss.container-servlet" depends="init"> - <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> - <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> - <antcall target="cargo.jboss.start"> - <param name="cargo.wait" value="false"/> - <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + <antcall target="tests.tomcat-6.container-servlet"> + <param name="test.id" value="Tomcat-6_0-container-servlet"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="RemoteJBoss_4_2"/> - <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-container-servlet"/> - <param name="test.type" value="container-servlet"/> + <antcall target="tests.tomcat-6.generic"> + <param name="test.id" value="Tomcat-6_0-generic"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> </antcall> - <antcall target="cargo.jboss.stop"> - </antcall> </target> - <target name="tests.jboss.generic" depends="init"> - <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> - <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> - <antcall target="cargo.jboss.start"> + <target name="tests.tomcat-6.container-servlet" depends="init" if="${test.tomcat-6.home.variable-name}"> + <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> + <antcall target="cargo.tomcat-6.start"> <param name="cargo.wait" value="false"/> - <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-generic/test-spi-server.war"/> - </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="RemoteJBoss_4_2"/> - <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-generic"/> - <param name="test.type" value="generic"/> - </antcall> - <antcall target="cargo.jboss.stop"> - </antcall> - </target> - - <target name="tests.tomcat" depends="init"> - <antcall target="tests.tomcat.container-servlet"/> - </target> - - <target name="tests.tomcat.container-servlet" depends="init"> - <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> - <antcall target="cargo.tomcat.start"> - <param name="cargo.wait" value="false"/> <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> <param name="test.server.name" value="RemoteTomcat_6_0"/> <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-container-servlet"/> - <param name="test.type" value="container-servlet"/> </antcall> - <antcall target="cargo.tomcat.stop"> + <antcall target="cargo.tomcat-6.stop"> </antcall> </target> - <target name="tests.tomcat.generic" depends="init"> - <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> - <antcall target="cargo.tomcat.start"> + <target name="tests.tomcat-6.generic" depends="init" if="${test.tomcat-6.home.variable-name}"> + <fail unless="test.tomcat-6.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> + <echo message="Starting Tomcat 6 generic tests with ${test.tomcat-6.home}"/> + <antcall target="cargo.tomcat-6.start"> <param name="cargo.wait" value="false"/> <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-generic/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> <param name="test.server.name" value="RemoteTomcat_6_0"/> <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-generic"/> - <param name="test.type" value="generic"/> </antcall> - <antcall target="cargo.tomcat.stop"> + <antcall target="cargo.tomcat-6.stop"> </antcall> </target> + <target name="tests" depends="init"> + <antcall target="tests.local"/> + <antcall target="tests.jboss-4.2"/> + <antcall target="tests.tomcat-6"/> + </target> + <target name="tests.local" depends="init"> <execute-tests> <x-test> @@ -526,8 +578,8 @@ <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase" - outfile="TEST-${test.server.name}-${test.type}.org.jboss.portal.test.web.spi.SPITestCase" - id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${test.server.name},type=${test.type}"> + outfile="TEST-${test.id}.org.jboss.portal.test.web.spi.SPITestCase" + id="org.jboss.portal.test.web.spi.SPITestCase,${test.id}"> <parameter name="serverName" value="${test.server.name}"/> </zest> </x-test> Modified: modules/web/trunk/web/src/resources/test/config/servers.xml =================================================================== --- modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-17 20:32:44 UTC (rev 8299) @@ -22,7 +22,7 @@ </node> </server> <server> - <server-name>RemoteJBoss_4_2</server-name> + <server-name>RemoteJBoss_4_2_0</server-name> <node> <node-id>default</node-id> <service> @@ -39,4 +39,22 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_4_2_1</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss4x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> </servers>