Changeset 32705 for gs3-extensions/testing/trunk/src/build.xml

Timestamp:

2018-12-17T23:33:18+13:00 (5 years ago)

Author:

ak19

Message:

1. Implemented (and testing as I implement) more of the GSGUITestingUtil helper functions. Most of the File Menu is done. Unfortunately can't yet commit the EDT corrections in GLI as at least one of them requires a more complex solution, possibly with a SwingWorker as there's conflict with the ProgressBar. 2. infrastructure for JUnit reports. Not working yet despite the inclusion of necessary jar, will investigate this later.

File:

• gs3-extensions/testing/trunk/src/build.xml (modified) (7 diffs)

gs3-extensions/testing/trunk/src/build.xml

@@ -6 +6 @@
 
   <property name="gli.home" value="${env.GSDL3SRCHOME}/gli"/>
+
+  <!-- define ext.test.folder so we can move some targets into toplevel GS3 ant build file -->
+  <property name="ext.test.folder" value="${basedir}" />
+  
+  <!-- where the reports will go -->
+  <property name="test.reports" value="${ext.test.folder}/reports" />
   
   <target name="build-util-jar" depends="needs-gs3-setup, needs-make-gli-jar">
-    <mkdir dir="${basedir}/build"/>
-    <javac srcdir="${basedir}/src"
-       destdir="${basedir}/build"
+    <mkdir dir="${ext.test.folder}/build"/>
+    <javac srcdir="${ext.test.folder}/src"
+       destdir="${ext.test.folder}/build"
        includeantruntime="${compile.includeantruntime}">
       <classpath>
-    <fileset dir="${basedir}/lib/java">
+    <fileset dir="${ext.test.folder}/lib/java">
       <include name="*.jar"/>
     </fileset>
@@ -22 +28 @@
       <include name="org/greenstone/gsdl3/testing/*.java"/>         
     </javac>
-    <jar destfile="${basedir}/lib/java/GSTestingUtil.jar">
-      <fileset dir="${basedir}/build">
+    <jar destfile="${ext.test.folder}/lib/java/GSTestingUtil.jar">
+      <fileset dir="${ext.test.folder}/build">
     <include name="org/greenstone/gsdl3/testing/**"/>             
       </fileset>
@@ -58 +64 @@
 <target name="compile-tutorials-tests" depends="needs-gs3-setup, needs-make-gli-jar">
 
-  <mkdir dir="${basedir}/build"/>
+  <mkdir dir="${ext.test.folder}/build"/>
   <javac
-      srcdir="${basedir}/src"
-      destdir="${basedir}/build"
+      srcdir="${ext.test.folder}/src"
+      destdir="${ext.test.folder}/build"
       includeantruntime="${compile.includeantruntime}">
     <classpath>
-      <fileset dir="${basedir}/lib/java">
+      <fileset dir="${ext.test.folder}/lib/java">
     <include name="*.jar"/>
       </fileset>
@@ -73 +79 @@
     <include name="gstests/tutorials/*.java"/>
   </javac>
-  <jar destfile="${basedir}/tutorial-tests.jar">
-    <fileset dir="${basedir}/build">
+  <jar destfile="${ext.test.folder}/tutorial-tests.jar">
+    <fileset dir="${ext.test.folder}/build">
       <include name="gstests/tutorials/**"/>
     </fileset>
@@ -84 +90 @@
 
 <!-- https://stackoverflow.com/questions/10704324/how-to-add-to-classpath-all-classes-from-set-of-directories-in-ant -->
-<path id="tutorials.path">  
-  <fileset dir="${basedir}/lib/java">
+<path id="tutorials.path">
+
+  <!-- Includes ant-nodeps-1.8.1 from 2010 that replaces 2005's optional.jar of ant
+       for generating reports -->
+  <fileset dir="${ext.test.folder}/lib/java">
     <include name="*.jar"/>
   </fileset>
-  <!--<fileset dir="${basedir}/build">      
+  <!--<fileset dir="${ext.test.folder}/build">      
     <include name="gstests/tutorials/**/*.class"/>
   </fileset>-->
-  <files includes="${basedir}/tutorial-tests.jar"/>
+  <files includes="${ext.test.folder}/tutorial-tests.jar"/>
 
   <!-- To run GLI, need GLI.jar and its help jars and folder: classes folder, apache.jar, jna.jar, jna-platform.jar, qfslib.jar, rsyntaxtextarea.jar -->
@@ -114 +123 @@
   <java classname="org.junit.runner.JUnitCore" dir="${gli.home}" fork="true" maxmemory="256m" classpathref="tutorials.path">
     <!--https://stackoverflow.com/questions/38676719/selenium-using-java-the-path-to-the-driver-executable-must-be-set-by-the-webdr-->
-    <sysproperty key="webdriver.gecko.driver" path="${basedir}/geckodriver"/>
+    <sysproperty key="webdriver.gecko.driver" path="${ext.test.folder}/geckodriver"/>
     <arg value="gstests.tutorials.RunGLITest"/>
     <!-- TODO: for now hardcoding the GS3 URL. Toplevel build.xml can properly construct this
@@ -120 +129 @@
     <jvmarg value="-DSERVERURL=http://127.0.0.1:8383/greenstone3/library "/>
   </java>
-  
-  
+
+  <!-- create reports dir if it doesn't exist -->
+  <mkdir dir="${test.reports}"/>
+  <!--
+      https://junit.org/junit4/faq.html#running_6
+      How do I use Ant to create HTML test reports?
+  -->
+  <junitreport todir="${test.reports}">
+    <fileset dir="${test.reports}">
+      <include name="TEST-*.xml" />
+    </fileset>
+    <report todir="${test.reports}" />
+  </junitreport>
 </target>
+
+<!-- TODO: check if after testing GLI we may need to ensure tomcat stopped? -->
 
 </project>