[jboss-cvs] jboss-portal/portlet ...
Julien Viet
julien at jboss.com
Sun Jul 16 18:51:01 EDT 2006
User: julien
Date: 06/07/16 18:51:01
Modified: portlet build.xml
Log:
- extracted common stuff to run tests into a macro available in all modules
Revision Changes Path
1.129 +81 -202 jboss-portal/portlet/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/build.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- build.xml 16 Jul 2006 17:40:51 -0000 1.128
+++ build.xml 16 Jul 2006 22:51:01 -0000 1.129
@@ -8,7 +8,7 @@
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
]>
-<!-- $Id: build.xml,v 1.128 2006/07/16 17:40:51 julien Exp $ -->
+<!-- $Id: build.xml,v 1.129 2006/07/16 22:51:01 julien Exp $ -->
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -482,55 +482,12 @@
</target>
<target name="test-jsr168" depends="init">
-
- <property name="build.testlog" value="${module.output}/log"/>
-
- <echo><![CDATA[
- ${build.reports}
- ${build.testlog}
- ${module.output}
- ${junit.printsummary}
- ${junit.batchtest.haltonerror}
- ${junit.batchtest.haltonfailure}
- ${junit.batchtest.fork}
- ${junit.timeout}
- ${junit.jvm}
- ]]></echo>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <junit
- dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <formatter type="plain" usefile="false"/>
- <formatter
- classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
- extension="${jboss-junit-configuration}.xml"/>
-
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
-
- <!-- definition of the property for keeping results between configuration -->
- <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
-
-
+ <execute-tests>
+ <x-sysproperty>
<sysproperty key="test.root" value="${build.lib}"/>
<sysproperty key="test.uri" value="/test/redirect/"/>
-
- <!--
- <jvmarg value="${junit.jvm.options}"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- -->
-
+ </x-sysproperty>
+ <x-test>
<!--Spec TCK Assertions tests-->
<test name="org.jboss.portal.test.portlet.jsr168.tck.dispatcher.DispatcherTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.tck.portletconfig.PortletConfigTestSuite"/>
@@ -543,7 +500,6 @@
<test name="org.jboss.portal.test.portlet.jsr168.tck.portleturl.PortletURLTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.tck.windowstates.WindowStatesTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.tck.portletcontext.PortletContextTestSuite"/>
-
<!--API Tests-->
<test name="org.jboss.portal.test.portlet.jsr168.api.portletconfig.PortletConfigAPITestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.api.portletmode.PortletModeAPITestSuite"/>
@@ -558,7 +514,6 @@
<test name="org.jboss.portal.test.portlet.jsr168.api.renderrequest.RenderRequestAPITestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.api.actionresponse.ActionResponseAPITestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.api.renderresponse.RenderResponseAPITestSuite"/>
-
<!--Ext Tests-->
<test name="org.jboss.portal.test.portlet.jsr168.ext.preferences.PreferencesTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.ext.session.SessionTestSuite"/>
@@ -567,11 +522,10 @@
<test name="org.jboss.portal.test.portlet.jsr168.ext.portletmode.PortletModeTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.ext.portletconfig.PortletConfigTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.ext.dispatcher.DispatcherTestSuite"/>
-
<!--Test Framework test-->
<!--<test name="org.jboss.portal.test.framework.basic.BasicTestCase"/>-->
-
- <classpath>
+ </x-test>
+ <x-classpath>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
@@ -582,57 +536,20 @@
<pathelement location="${build.resources}"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
- </classpath>
- </junit>
-
+ </x-classpath>
+ </execute-tests>
</target>
<target name="test-info" depends="init">
-
- <property name="build.testlog" value="${module.output}/log"/>
-
- <echo><![CDATA[
- ${build.reports}
- ${build.testlog}
- ${module.output}
- ${junit.printsummary}
- ${junit.batchtest.haltonerror}
- ${junit.batchtest.haltonfailure}
- ${junit.batchtest.fork}
- ${junit.timeout}
- ${junit.jvm}
- ]]></echo>
- <mkdir dir="${build.testlog}"/>
- <junit
- dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <!--<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"/>-->
-
- <formatter type="plain" usefile="false"/>
- <!-- <formatter type="xml" usefile="${junit.formatter.usefile}"/>-->
- <formatter
- classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
- extension="${jboss-junit-configuration}.xml"/>
-
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
-
- <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
-
-
+ <execute-tests>
+ <x-test>
+ <test name="org.jboss.portal.test.portlet.info.InfoTestSuite"/>
+ </x-test>
+ <x-sysproperty>
<sysproperty key="test.root" value="${build.lib}"/>
<sysproperty key="test.uri" value="/test/redirect/"/>
-
- <test name="org.jboss.portal.test.portlet.info.InfoTestSuite"/>
-
- <classpath>
+ </x-sysproperty>
+ <x-classpath>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
@@ -644,54 +561,17 @@
<pathelement location="${build.resources}"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
- </classpath>
- </junit>
-
+ </x-classpath>
+ </execute-tests>
</target>
<target name="test2" depends="init">
-
- <property name="build.testlog" value="${module.output}/log"/>
-
- <echo><![CDATA[
- ${build.reports}
- ${build.testlog}
- ${module.output}
- ${junit.printsummary}
- ${junit.batchtest.haltonerror}
- ${junit.batchtest.haltonfailure}
- ${junit.batchtest.fork}
- ${junit.timeout}
- ${junit.jvm}
- ]]></echo>
- <mkdir dir="${build.testlog}"/>
- <junit
- dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <!--<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"/>-->
-
- <formatter type="plain" usefile="false"/>
- <!-- <formatter type="xml" usefile="${junit.formatter.usefile}"/>-->
- <formatter
- classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
- extension="${jboss-junit-configuration}.xml"/>
-
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
-
- <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
-
-
+ <execute-tests>
+ <x-sysproperty>
<sysproperty key="test.root" value="${build.lib}"/>
<sysproperty key="test.uri" value="/test/redirect/"/>
-
+ </x-sysproperty>
+ <x-test>
<!--<test name="org.jboss.portal.test.portlet.ha.session.SessionTestSuite"/>-->
<!--<test name="org.jboss.portal.test.portlet.info.InfoTestSuite"/>-->
<!--<test name="org.jboss.portal.test.portlet.session.SessionSynchronizationTestCase"/>-->
@@ -704,8 +584,8 @@
<!--<test name="org.jboss.portal.test.portlet.info.InfoTestSuite"/>-->
<!--<test name="org.jboss.portal.test.portlet.deployment.UnmarshallerTestCase"/>-->
<test name="org.jboss.portal.test.portlet.PortletRequestDecoderTestCase"/>
-
- <classpath>
+ </x-test>
+ <x-classpath>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
@@ -717,9 +597,8 @@
<pathelement location="${build.resources}"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
- </classpath>
- </junit>
-
+ </x-classpath>
+ </execute-tests>
</target>
<target name="reports" depends="init">
More information about the jboss-cvs-commits
mailing list