[jboss-svn-commits] JBoss Portal SVN: r5562 - trunk/theme

[jboss-svn-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-11-02 14:09:00 -0500 (Thu, 02 Nov 2006)
New Revision: 5562

Modified:
   trunk/theme/build.xml
Log:
JBPORTAL-1099 - Updating theme tests so they actually execute.

Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml	2006-11-02 17:32:58 UTC (rev 5561)
+++ trunk/theme/build.xml	2006-11-02 19:09:00 UTC (rev 5562)
@@ -139,8 +139,8 @@
    <!--+====================================================================+-->
 
    <target name="compile"
-           description="Compile all source files."
-           depends="_default:compile-classes,
+      description="Compile all source files."
+      depends="_default:compile-classes,
                _default:compile-etc,
                _default:compile-resources">
       <!-- Add module specific elements here. -->
@@ -155,8 +155,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-           description="Generate all target output."
-           depends="compile">
+      description="Generate all target output."
+      depends="compile">
 
       <!-- -->
       <mkdir dir="${build.lib}"/>
@@ -225,7 +225,7 @@
 
    <!-- Packages all the test related artifacts. Note that compilation should have be-->
    <target name="package-tests" depends="jar-test"
-           description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before calling this task.">
+      description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before calling this task.">
 
       <jar jarfile="${build.lib}/theme-test.war">
          <fileset dir="${source.bin}/test/theme-test-war"/>
@@ -258,6 +258,44 @@
 
    <target name="tests" depends="init">
       <property name="build.testlog" value="${module.output}/log"/>
+      <execute-tests>
+         <x-test>
+            <!-- theme tests -->
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.TestLayoutServiceImpl"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.TestPortalThemeImpl"/>
+
+            <!-- theme metadata tests -->
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestLayoutStrategySetMetaData"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestPortalLayoutMetaData"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestPortalThemeMetaData"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestRenderSetMetaData"/>
+
+            <!-- render tests -->
+            <test todir="${test.reports}" name="org.jboss.portal.test.theme.render.TestRenderContext"/>
+         </x-test>
+         <x-classpath>
+            <path refid="oswego.concurrent.classpath"/>
+            <path refid="jboss.jbossxb.classpath"/>
+            <path refid="jbossas/core.libs.classpath"/>
+            <path refid="apache.ant.classpath"/>
+            <path refid="apache.log4j.classpath"/>
+            <path refid="apache.httpclient.classpath"/>
+            <path refid="apache.logging.classpath"/>
+            <path refid="junit.junit.classpath"/>
+            <path refid="jsunit.jsunit.classpath"/>
+            <path refid="jetty.jetty.classpath"/>
+            <path refid="sun.servlet.classpath"/>
+            <path refid="sun.jaf.classpath"/>
+            <path refid="jboss.portal-common.classpath"/>
+            <path refid="jboss.portal-server.classpath"/>
+            <path refid="jboss.portal-jems.classpath"/>
+            <path refid="jboss.portal-theme.classpath"/>
+            <pathelement location="${build.resources}/test"/>
+            <pathelement location="${build.resources}/hibernate"/>
+            <pathelement location="${jboss.portal-test.root}/etc"/>
+            <pathelement location="${build.lib}/portal-theme-test-lib.jar"/>
+         </x-classpath>
+      </execute-tests>
       <!--
          JSUnit TestRunner URL: http://localhost:8080/theme-test/jsunit/testRunner.html
          testPage URL: http://localhost:8080/theme-test/testtheme