[jboss-cvs] jbosstest build.xml

[Dimitris A. <an...@us...>]

  User: andd    
  Date: 05/02/03 13:47:18

  Modified:    .        build.xml
  Log:
  DeploymentService testcases with their own server configuration
  
  Revision  Changes    Path
  1.446     +84 -2     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.445
  retrieving revision 1.446
  diff -u -r1.445 -r1.446
  --- build.xml	1 Feb 2005 22:55:16 -0000	1.445
  +++ build.xml	3 Feb 2005 21:47:17 -0000	1.446
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.445 2005/02/01 22:55:16 bwang00 Exp $ -->
  +<!-- $Id: build.xml,v 1.446 2005/02/03 21:47:17 andd Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -525,7 +525,14 @@
      <patternset id="jaxr.includes">
         <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/>
      </patternset>
  -
  +   <!-- Tests needing deployment service setup -->
  +   <patternset id="deployment-service.includes">
  +      <include name="org/jboss/test/deployment/test/*TestCase.class"/>
  +   </patternset>
  +   <patternset id="deployment-service.excludes">
  +      <exclude name="org/jboss/test/deployment/test/*TestCase.class"/>
  +   </patternset>
  +   
      <!-- Tests that are currently broken -->
      <patternset id="badtest.excludes">
         <exclude name="org/jboss/test/aop/test/RemotingUnitTestCase"/>
  @@ -548,6 +555,7 @@
         <patternset refid="tc-ssl.excludes"/>
         <patternset refid="iiop.excludes"/>
         <patternset refid="jbossxb.excludes"/>
  +      <patternset refid="deployment-service.excludes"/>
      </patternset>
   
      <!-- A target that allows for conditional dependency on the compilation and
  @@ -951,6 +959,80 @@
         </junit>
   
      </target>
  +   
  +   <!--
  +     | Tests DeploymentService
  +   -->
  +   <target name="deployment-service-tests"
  +      description="Tests targeting the deployment service">
  +      <!-- Create configuration -->
  +      <create-config baseconf="default" newconf="deployment-service">
  +         <patternset>
  +            <include name="conf/**"/>
  +            <include name="deploy/jbossweb-tomcat55.sar/**"/>
  +            <include name="deploy/jmx-console.war/**"/>
  +            <include name="deploy/jbossjca-service.xml"/>
  +            <include name="deploy/jboss-local-jdbc.rar"/>
  +            <include name="deploy/jmx-invoker-service.xml"/>
  +            <include name="lib/**"/>
  +         </patternset>
  +      </create-config>
  +      <!-- overlay the deployment-service stuff -->
  +      <copy todir="${jboss.dist}/server/deployment-service/conf">
  +         <fileset dir="${jboss.dist}/docs/examples/varia/deployment-service">
  +            <include name="templates/**"/>
  +         </fileset>
  +      </copy>
  +      <copy todir="${jboss.dist}/server/deployment-service/deploy">
  +         <fileset dir="${jboss.dist}/docs/examples/varia/deployment-service">
  +            <include name="deployment-service.sar"/>
  +         </fileset>
  +      </copy>      
  +      <start-jboss-os conf="deployment-service"/>      
  +      <wait-on-host/>
  +      <antcall target="deployment-service-unit-tests">
  +         <param name="jboss-junit-configuration" value="DeploymentService"/>
  +      </antcall>
  +      <stop-jboss/>
  +   </target>
  +   
  +   <target name="deployment-service-unit-tests">
  +      <junit dir="${module.output}"
  +         printsummary="${junit.printsummary}"
  +         haltonerror="${junit.haltonerror}"
  +         haltonfailure="${junit.haltonfailure}"
  +         fork="${junit.fork}"
  +         timeout="${junit.timeout}"
  +         jvm="${junit.jvm}">
  +
  +         <jvmarg value="${junit.jvm.options}"/>
  +         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  +         <sysproperty key="build.testlog" value="${build.testlog}"/>
  +         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  +         <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
  +
  +         <classpath>
  +            <pathelement location="${build.classes}"/>
  +            <pathelement location="${build.resources}"/>
  +            <path refid="tests.classpath"/>
  +         </classpath>
  +
  +         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
  +            usefile="${junit.formatter.usefile}"
  +            extension="-${jboss-junit-configuration}.xml"/>
  +
  +         <batchtest todir="${build.reports}"
  +            haltonerror="${junit.batchtest.haltonerror}"
  +            haltonfailure="${junit.batchtest.haltonfailure}"
  +            fork="${junit.batchtest.fork}">
  +
  +            <fileset dir="${build.classes}">
  +               <patternset refid="deployment-service.includes"/>
  +            </fileset>
  +         </batchtest>
  +      </junit>
  +   </target>
  +   
      <!--
         | Standard tests that should run successfully against a default JBoss
         | server distribution build.