Author: julien(a)jboss.com Date: 2007-09-15 09:29:47 -0400 (Sat, 15 Sep 2007) New Revision: 8286 Modified: modules/web/trunk/testsuite/build.xml modules/web/trunk/tools/lib/explode.jar modules/web/trunk/web/build.xml modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml modules/web/trunk/web/src/resources/test/config/servers.xml Log: update web module to have the testsuite run and produce correct reports for several containers Modified: modules/web/trunk/testsuite/build.xml =================================================================== --- modules/web/trunk/testsuite/build.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/testsuite/build.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -43,21 +43,13 @@ &defaults; &libraries; +<!-- <path id="portal.task.classpath"> <pathelement location="${project.tools}/lib/ant.jar"/> <pathelement location="${project.tools}/lib/explode.jar"/> - <pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/> </path> +--> - <taskdef - name="deploy" - classname="org.jboss.portal.common.ant.Deploy" - classpathref="portal.task.classpath"/> - <taskdef - name="undeploy" - classname="org.jboss.portal.common.ant.Undeploy" - classpathref="portal.task.classpath"/> - <target name="init"> <mkdir dir="${log.dir}"/> <mkdir dir="${reports.dir}"/> @@ -67,6 +59,7 @@ <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> </target> + <!-- copy all logs to testsuite/output/logs --> <target name="copy-logs"> <copy todir="${log.dir}"> @@ -110,6 +103,9 @@ <!-- executes all modules' tests --> <target name="tests" depends="init"> + <antcall target="internal-test-module"> + <param name="module" value="web"/> + </antcall> <antcall target="reports"/> </target> @@ -126,8 +122,8 @@ <target name="clean"> <!-- remove generated test xml files --> <delete> - <fileset dir="../common" includes="*.log"/> - <fileset dir="../common" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + <fileset dir="../test" includes="*.log"/> + <fileset dir="../test" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> </delete> <!-- remove testsuite output dir --> <delete includeEmptyDirs="true" quiet="true"> Modified: modules/web/trunk/tools/lib/explode.jar =================================================================== (Binary files differ) Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/build.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -253,6 +253,12 @@ </target> <target name="cargo.jboss.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 + reason, the class initiating the loading of the RemoteTestDriver class is + org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84) + --> <cargo containerId="jboss42x" home="${jboss-4.2.home}" @@ -298,7 +304,6 @@ <path location="${apache.log4j.lib}/log4j.jar"/> <path location="${oswego.concurrent.lib}/concurrent.jar"/> <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> - <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> <path location="${sun.jaf.lib}/activation.jar"/> <path location="${junit.junit.lib}/junit.jar"/> <path location="${build.lib}/portal-web-lib.jar"/> @@ -330,7 +335,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss-4.2"/> + <param name="server.name" value="RemoteJBoss_4_2"/> </antcall> <antcall target="cargo.jboss.stop"> </antcall> @@ -343,7 +348,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat-6.0"/> + <param name="server.name" value="RemoteTomcat_6_0"/> </antcall> <antcall target="cargo.tomcat.stop"> </antcall> @@ -397,7 +402,11 @@ <execute-tests> <x-test> - <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase"> + <zest + todir="${test.reports}" + name="org.jboss.portal.test.web.spi.SPITestCase" + outfile="TEST-${server.name}.org.jboss.portal.test.web.spi.SPITestCase" + id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${server.name}"> <parameter name="serverName" value="${server.name}"/> </zest> </x-test> @@ -434,4 +443,5 @@ </x-classpath> </execute-tests> </target> + </project> Modified: modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java 2007-09-15 13:29:47 UTC (rev 8286) @@ -52,6 +52,19 @@ /** . */ private JUnitAdapter adapter; + /** . */ + private SPITestConfig config; + + public SPITestConfig getConfig() + { + return config; + } + + public void setConfig(SPITestConfig config) + { + this.config = config; + } + public Deployer getDeployer() { return deployer; Modified: modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml =================================================================== --- modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -83,6 +83,7 @@ <property name="deployer"><inject bean="Deployer"/></property> <property name="nodeManager"><inject bean="NodeManager"/></property> <property name="adapter"><inject bean="JUnitAdapter"/></property> + <property name="config"><inject bean="Config"/></property> </bean> </deployment> Modified: modules/web/trunk/web/src/resources/test/config/servers.xml =================================================================== --- modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -1,6 +1,6 @@ <servers> <server> - <server-name>RemoteTomcat-6.0</server-name> + <server-name>RemoteTomcat_6_0</server-name> <node> <node-id>default</node-id> <service> @@ -22,7 +22,7 @@ </node> </server> <server> - <server-name>RemoteJBoss-4.2</server-name> + <server-name>RemoteJBoss_4_2</server-name> <node> <node-id>default</node-id> <service>