<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"/>
+ <pathelement location="${mysqlconnector}"/>
+ </path>
+ <path id="cacert-gigi.test.classpath">
+ <pathelement location="bin"/>
+ <pathelement location="bintest"/>
<path refid="JUnit 4.libraryclasspath"/>
<pathelement location="${mysqlconnector}"/>
</path>
<target name="init">
<mkdir dir="bin"/>
+ <mkdir dir="bintest"/>
+
<copy includeemptydirs="false" todir="bin">
<fileset dir="lib/servlet-api">
<exclude name="**/*.launch"/>
<exclude name="**/*.java"/>
</fileset>
</copy>
- <copy includeemptydirs="false" todir="bin">
+ <copy includeemptydirs="false" todir="bintest">
<fileset dir="tests">
<exclude name="**/*.launch"/>
<exclude name="**/*.java"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
<src path="lib/servlet-api"/>
<src path="lib/jetty"/>
+ <src path="lib/jtar"/>
<src path="src"/>
<src path="util"/>
- <src path="tests"/>
<classpath refid="cacert-gigi.classpath"/>
</javac>
</target>
+ <target depends="init" name="build-project-test">
+ <echo message="${ant.project.name}: ${ant.file}"/>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="bintest" includeantruntime="false" source="${source}" target="${target}">
+ <src path="tests"/>
+ <classpath refid="cacert-gigi.test.classpath"/>
+ </javac>
+ </target>
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
<target name="FetchLocales">
<java classname="org.cacert.gigi.util.FetchLocales" failonerror="true" fork="yes">
<classpath refid="cacert-gigi.classpath"/>
</java>
</target>
- <target name="TestSSL">
+
+ <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}"/>
- <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}"/>
+ <classpath refid="cacert-gigi.test.classpath"/>
</junit>
</target>
<target name="junitreport">