Update of /cvsroot/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24155
Modified Files:
build.xml
Log Message:
added JUnit testsuite in test directory, remember to copy junit.jar to your Ant/lib directory
Index: build.xml
===================================================================
RCS file: /cvsroot/bprocessor/model/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml 16 Aug 2005 11:42:35 -0000 1.5
--- build.xml 28 Sep 2005 12:28:45 -0000 1.6
***************
*** 1,4 ****
<project name="model" default="compile" basedir=".">
-
<target name="init">
<property name="name" value="model"/>
--- 1,3 ----
***************
*** 15,23 ****
<property name="lib.dir" value="${basedir}/lib"/>
<property name="dist.dir" value="${basedir}/dist"/>
<property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" />
<property name="build.compiler" value="modern"/>
-
</target>
--- 14,22 ----
<property name="lib.dir" value="${basedir}/lib"/>
<property name="dist.dir" value="${basedir}/dist"/>
+ <property name="test.dir" value="${basedir}/test"/>
<property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" />
<property name="build.compiler" value="modern"/>
</target>
***************
*** 45,48 ****
--- 44,48 ----
<echo message=""/>
<mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dir}/code"/>
</target>
***************
*** 79,87 ****
</taskdef>
<xjc schema="${conf.dir}/bprocessor.xsd"
! target="${build.dir}"
package="net.sourceforge.bprocessor.model.xml">
<arg value="-nv"/>
</xjc>
! <javac srcdir="${build.dir}" destdir="${build.dir}" deprecation="yes"
debug="yes"
includes="net/**">
--- 79,87 ----
</taskdef>
<xjc schema="${conf.dir}/bprocessor.xsd"
! target="${build.dir}/code"
package="net.sourceforge.bprocessor.model.xml">
<arg value="-nv"/>
</xjc>
! <javac srcdir="${build.dir}/code" destdir="${build.dir}/code" deprecation="yes"
debug="yes"
includes="net/**">
***************
*** 91,95 ****
</javac>
<delete>
! <fileset dir="${build.dir}">
<include name="**/*.java"/>
</fileset>
--- 91,95 ----
</javac>
<delete>
! <fileset dir="${build.dir}/code">
<include name="**/*.java"/>
</fileset>
***************
*** 132,135 ****
--- 132,137 ----
<fileset dir="${src.dir}"
includes="**/*.java"/>
+ <fileset dir="${test.dir}"
+ includes="**/*.java"/>
</checkstyle>
</target>
***************
*** 146,150 ****
<target name="jar" depends="compile">
<mkdir dir="${dist.dir}"/>
! <copy todir="${build.dir}">
<fileset dir="${conf.dir}">
<include name="**/*.properties"/>
--- 148,152 ----
<target name="jar" depends="compile">
<mkdir dir="${dist.dir}"/>
! <copy todir="${build.dir}/code">
<fileset dir="${conf.dir}">
<include name="**/*.properties"/>
***************
*** 152,156 ****
</copy>
<jar jarfile="${dist.dir}/${name}.jar"
! basedir="${build.dir}"
compress="true"
includes="**/*"
--- 154,158 ----
</copy>
<jar jarfile="${dist.dir}/${name}.jar"
! basedir="${build.dir}/code"
compress="true"
includes="**/*"
***************
*** 189,191 ****
--- 191,230 ----
<delete file="${basedir}/${name}-${version}.tar"/>
</target>
+
+ <target name="test" depends="dist">
+ <mkdir dir="${build.dir}/test"/>
+ <javac srcdir="${test.dir}" destdir="${build.dir}/test" deprecation="yes"
+ debug="yes"
+ includes="net/**">
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${dist.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <junit>
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${dist.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${build.dir}/test"/>
+ </classpath>
+
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${basedir}">
+ <fileset dir="${test.dir}">
+ <include name="**/*Test*.java"/>
+ <exclude name="**/AllTests.java"/>
+ </fileset>
+ </batchtest>
+
+ </junit>
+ </target>
</project>
|
