[jboss-cvs] jboss-portal/core ...
Julien Viet
julien at jboss.com
Sun Jul 30 08:36:20 EDT 2006
User: julien
Date: 06/07/30 08:36:20
Modified: core build.xml
Log:
JBPORTAL-973 : Portlet instance container integration testing
JBPORTAL-972 : Portlet stateful invoker testing
Revision Changes Path
1.129 +70 -10 jboss-portal/core/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/build.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- build.xml 25 Jul 2006 21:45:45 -0000 1.128
+++ build.xml 30 Jul 2006 12:36:20 -0000 1.129
@@ -62,6 +62,7 @@
<!-- Configure thirdparty libraries -->
&libraries;
+
<path id="library.classpath">
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.cache.classpath"/>
@@ -136,7 +137,7 @@
</path>
<path id="aop.classpath">
- <pathelement path="${jboss.artifacts.lib}/jboss-aspect-library.jar"/>
+ <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
<pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
<path refid="javassist.javassist.classpath"/>
<path refid="oswego.concurrent.classpath"/>
@@ -226,6 +227,7 @@
<include name="org/jboss/portal/core/deployment/jboss/ObjectDeployment.class"/>
<include name="org/jboss/portal/core/deployment/jboss/PortletAppDeployment.class"/>
<include name="org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.class"/>
+ <include name="org/jboss/portal/core/impl/portlet/state/StatefulPortletInvoker.class"/>
<include name="org/jboss/portal/core/hibernate/SessionFactoryBinder.class"/>
</aopc>
@@ -264,14 +266,6 @@
</fileset>
</jar>
- <!-- portal-core-test-lib.jar -->
- <jar jarfile="${build.lib}/portal-core-test-lib.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/**"/>
- </fileset>
- <fileset dir="${build.resources}/portal-core-test-jar"/>
- </jar>
-
<!-- jboss-portal.sar -->
<copy todir="${build.resources}/jboss-portal">
<fileset dir="${build.resources}/portal-core-sar"/>
@@ -388,6 +382,17 @@
tofile="${build.lib}/jboss-portal.sar"/>
</target>
+ <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed -->
+ <target name="package-tests" depends="init">
+ <!-- portal-core-test-lib.jar -->
+ <jar jarfile="${build.lib}/portal-core-test-lib.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/portal/test/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/portal-core-test-jar"/>
+ </jar>
+ </target>
+
<target name="datasource" depends="init">
<copy file="${source.resources}/setup/portal-ds.xml" tofile="${build.resources}/setup/portal-hsqldb-ds.xml">
<filterset>
@@ -510,6 +515,61 @@
<delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/>
</target>
+ <target name="tests" depends="init, _buildmagic:configure:deployment">
+ <antcall target="test-blah"/>
+ </target>
+
+ <target name="test-blah" depends="init">
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <echo message="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <execute-tests>
+ <x-sysproperty>
+<!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
+-->
+ <sysproperty key="jboss.aop.path"
+ value="${build.resources}/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
+ <sysproperty key="jboss.aop.class.path" value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ </x-sysproperty>
+ <x-test>
+ <test name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"/>
+ <test name="org.jboss.portal.test.core.state.StatefulPortletInvokerTestCase"/>
+ </x-test>
+ <x-classpath>
+ <pathelement location="${build.lib}/portal-core-lib.jar"/>
+ <pathelement location="${build.lib}/portal-core-test-lib.jar"/>
+ <pathelement location="${build.resources}/jboss-portal.sar"/>
+ <pathelement location="${jboss.portal-test.root}/etc"/>
+
+ <path refid="apache.collections.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="aop.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="hsqldb.hsqldb.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="asm.asm.classpath"/>
+
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <pathelement location="${nekohtml.nekohtml.lib}/nekohtml.jar"/>
+ <pathelement location="${dbunit.dbunit.lib}/dbunit.jar"/>
+ <pathelement location="${jdbc.connectors.lib}/mysql-connector-java.jar"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+
<target name="test" depends="init">
<property name="build.testlog" value="${module.output}/log"/>
@@ -548,7 +608,7 @@
<!--<sysproperty key="jboss.aop.path" value="${build.resources}/portal-core-sar/portal-aop.xml;${source.etc}/jboss-aop/base-aop.xml"/>-->
<sysproperty key="jboss.aop.path"
value="${build.resources}/portal-core-sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
- <sysproperty key="jboss.aop.class.path" value="${jboss.artifacts.lib}/jboss-aspect-library.jar"/>
+ <sysproperty key="jboss.aop.class.path" value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
<!--<test name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>-->
<!--<test name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase"/>-->
More information about the jboss-cvs-commits
mailing list