X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=build.xml;h=0d46989550ab37c8cb5c432dbe6e65a793ad0880;hp=27e039ca5898152897380c5e6f35128c2c47b8c6;hb=6f888ca8a1bbb6aa7669c02fc640077646de2ae8;hpb=3cbcee260d66e5e6748909d4f1f869ef5ce64313

diff --git a/build.xml b/build.xml
index 27e039ca..0d469895 100644
--- a/build.xml
+++ b/build.xml
@@ -6,16 +6,17 @@
     <property name="target" value="1.8"/>
     <property name="source" value="1.8"/>
     <property name="mysqlconnector" value="mysql-connector-java-5.1.31-bin.jar"/>
-    <property name="juintexec" value="junit.jar"/>
+    <property name="juintexec" value="."/>
     <path id="JUnit 4.libraryclasspath">
-        <pathelement location="${juintexec}"/>
+        <pathelement location="${juintexec}/junit.jar"/>
+        <pathelement location="${juintexec}/org.hamcrest.core.jar"/>
     </path>
     <path id="cacert-gigi.classpath">
         <pathelement location="bin"/>
-        <path refid="JUnit 4.libraryclasspath"/>
         <pathelement location="${mysqlconnector}"/>
     </path>
     <path id="cacert-gigi.test.classpath">
+        <pathelement location="bin"/>
         <pathelement location="bintest"/>
         <path refid="JUnit 4.libraryclasspath"/>
         <pathelement location="${mysqlconnector}"/>
@@ -90,13 +91,25 @@
             <classpath refid="cacert-gigi.classpath"/>
         </java>
     </target>
-    <target name="test" depends="build-project-test">
+    
+    <target name="check-generateKeys">
+        <available file="config/keystore.pkcs12" property="keystore.present"/>
+    </target>
+    <target name="generateKeys" depends="check-generateKeys" unless="keystore.present">
+        <exec executable="./generateKeys.sh" dir="doc/scripts"/>
+        <exec executable="./generateTruststore.sh" dir="doc/scripts">
+            <arg value="-noprompt"/>
+        </exec>
+    </target>
+    <target name="test" depends="build-project-test,generateKeys,FetchLocales">
         <mkdir dir="${junit.output.dir}"/>
         <junit fork="yes" printsummary="withOutAndErr">
             <formatter type="xml"/>
             <test name="org.cacert.gigi.TestSSL" todir="${junit.output.dir}"/>
-            <test name="org.cacert.gigi.pages.main.ResgisterPageTest" todir="${junit.output.dir}"/>
-            <classpath refid="cacert-gigi.classpath"/>
+            <test name="org.cacert.gigi.LoginTest" todir="${junit.output.dir}"/>
+            <test name="org.cacert.gigi.pages.main.RegisterPageTest" todir="${junit.output.dir}"/>
+            <test name="org.cacert.gigi.pages.wot.TestAssurance" todir="${junit.output.dir}"/>
+            <classpath refid="cacert-gigi.test.classpath"/>
         </junit>
     </target>
     <target name="junitreport">