Changeset 32671 for main/trunk/greenstone3/build.xml

Timestamp:

2018-12-12T19:03:36+13:00 (5 years ago)

Author:

ak19

Message:

Changes necessary to get Sam's basic Selenium tests of the lucene-jdbm-demo collection working again: 1. The change to jquery.min.js is that the first hash character now used to be an at-sign which was deprecated and issued warnings. 2. build.xml now points the Selenium testing java code to the geckodriver, required to run newer firefox which no longer comes with a built-in driver for Selenium. 3. Needed to make changes to the testing code, since XPaths in the XML used to find some elements have changed and also the number of documents in the first page of the Titles classifier, and exact wording of certain search results.

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -4120 +4120 @@
   </target>
     
-    <target name="run-collection-tests">
+  <target name="run-collection-tests">
+    <echo>-DSERVERURL=${default.server.protocol}://${tomcat.server}:${default.tomcat.port}${app.path}${server.default.servlet}</echo>
         <if><bool><not><available file="${basedir}/ext/testing" type="dir"/></not></bool>
             <fail>The testing extension is not available. This is required to perform the tests. It can be acquired from SVN by running the command "svn co http://svn.greenstone.org/gs3-extensions/testing/trunk/src testing" in the ext directory of your Greenstone 3 installation. </fail>
@@ -4131 +4132 @@
                 <echo>Testing @{testjar}</echo>
                 <java classname="org.junit.runner.JUnitCore" fork="true">
+                    <!--<env key="PATH" path="${basedir}/ext/testing/geckodriver:${env.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}/ext/testing/geckodriver"/>
                     <arg value="gstests.TestClass"/>
                     <jvmarg value="-DSERVERURL=${default.server.protocol}://${tomcat.server}:${default.tomcat.port}${app.path}${server.default.servlet} "/>
+                    <!--<jvmarg value="-DGECKO_PATH=${default.server.protocol}://${tomcat.server}:${default.tomcat.port}${app.path}${server.default.servlet} "/>-->
                     <classpath>
                         <fileset dir="${basedir}/ext/testing/lib/java">