[MOBY-guts] biomoby commit

[Martin Senger]

senger
Mon Mar  3 06:34:17 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv3170/xmls

Modified Files:
	junit.xml 
Log Message:
* more work on junit testing and its infrastructure
* removing some compiler warnings from generated data types
* better use of caching in skeleton generator

moby-live/Java/xmls junit.xml,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/junit.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/xmls/junit.xml	2008/03/02 12:45:27	1.3
+++ /home/repository/moby/moby-live/Java/xmls/junit.xml	2008/03/03 11:34:17	1.4
@@ -15,7 +15,8 @@
 <!-- The main entry point to junit testing. If tests are successful,    -->
 <!-- it does nothing. It only reports when a failure occured.           -->
 <!-- ================================================================== -->
-<target name="test-junit" if="test.failure" depends="do-junit,do-junit-2"
+<target name="test-junit" if="test.failure"
+  depends="samples,compile-tests,do-junit,do-junit-2"
   description="Run the junit test cases">
   <fail message="There were test failures." />
 </target>
@@ -34,6 +35,7 @@
 </target>
   
 <!-- this is the core: here is the testing done -->
+<!-- [ maintained by Paul Gordon ]              -->
 <target name="do-junit" if="junit.is.present" depends="junit-present">
 
   <junit
@@ -73,7 +75,11 @@
 
 <!-- this is the core: here is the testing done -->
 <!-- (put here only relatively fast tests)      -->
-<target name="do-junit-2" if="junit.is.present" depends="junit-present,compile-tests">
+<!-- [ maintained by Martin Senger ]            -->
+<target name="do-junit-2" if="junit.is.present" depends="junit-present,samples,dojunit2">
+</target>
+
+<target name="dojunit2"  if="junit.is.present" depends="compile-tests">
 
   <junit
     printsummary="yes"
@@ -85,6 +91,9 @@
       <path refid="dependency.classpath"/>
       <pathelement path="${classes.datatypes}"/>
       <pathelement path="${build.test}"/>
+      <pathelement path="${classes.datatypes}"/>
+      <pathelement path="${classes.skeletons}"/>
+      <pathelement path="${classes.samples}"/>
       <pathelement path="${junit.resources}"/>
     </classpath>
     <jvmarg value="-Dlog4j.configuration=file:${log4j.configuration}"/>
@@ -92,6 +101,7 @@
     <batchtest todir="${test.report.dir}">
       <fileset dir="${build.test}">
         <include name="**/MobyParserTest.*"/>
+        <include name="**/ServicesTest.*"/>
       </fileset>
       <!--      <fileset dir="${build.test}" includes="**/*Test.*" /> -->
     </batchtest>