ADD: testcases for real mail.

[gigi.git] / build.xml
diff --git a/build.xml b/build.xml

index 0515ddcff94fffc853891e18c786774db0b22e90..84d5e8399de4f2a0ab560f30bc5389650fbfbbec 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -66,6 +66,8 @@
         </target>
         <target name="clean-test">
                 <delete dir="bintest" />
+               <delete dir="cocoReport" failonerror="false"/>
+
         </target>
         <target depends="clean,clean-test" name="cleanall" />
         <target depends="build-project, native" name="build" />
@@ -149,11 +151,17 @@
                         <arg value="-noprompt" />
                 </exec>
         </target>
-       <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack">
+       <target name="reset-db">
+               <copy file="config/test.properties" tofile="config/gigi.properties"/>
+               <java classname="org.cacert.gigi.util.DatabaseManager">
+                       <classpath refid="cacert-gigi.classpath" />
+               </java>
+       </target>
+       <target name="test" depends="build-project-test,generateKeys,FetchLocales,pack,reset-db">
                 <delete failonerror="false">
                         <fileset dir=".">
-                       <include name="jacoco.exec"/>
-                       <include name="tester.exec"/>
+                               <include name="jacoco.exec"/>
+                               <include name="tester.exec"/>
                         </fileset>
                 </delete>
                 <mkdir dir="${junit.output.dir}" />
@@ -188,20 +196,22 @@
                         </executiondata>
  
                         <structure name="CAcert gigi">
-                               <classfiles>
-                                       <fileset dir="bin/org/cacert/gigi"/>
-                               </classfiles>
-                               <sourcefiles encoding="UTF-8">
-                                       <fileset dir="src/org/cacert/gigi"/>
-                               </sourcefiles>
-                       </structure>
-                       <structure name="CAcert testcases">
-                               <classfiles>
-                                       <fileset dir="bintest/org/cacert/gigi"/>
-                               </classfiles>
-                               <sourcefiles encoding="UTF-8">
-                                       <fileset dir="tests/org/cacert/gigi"/>
-                               </sourcefiles>
+                               <group name="Server">
+                                       <classfiles>
+                                               <fileset dir="bin/org/cacert/gigi" />
+                                       </classfiles>
+                                       <sourcefiles encoding="UTF-8">
+                                               <fileset dir="src/org/cacert/gigi" />
+                                       </sourcefiles>
+                               </group>
+                               <group name="Testcases">
+                                       <classfiles>
+                                               <fileset dir="bintest/org/cacert/gigi" />
+                                       </classfiles>
+                                       <sourcefiles encoding="UTF-8">
+                                               <fileset dir="tests/org/cacert/gigi" />
+                                       </sourcefiles>
+                               </group>
                         </structure>
  
                         <html destdir="cocoReport"/>