Changeset 32672 for main

Show
Ignore:
Timestamp:
12.12.2018 19:06:34 (7 months ago)
Author:
ak19
Message:

Tidying up after previous commit

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32671 r32672  
    41324132                <echo>Testing @{testjar}</echo> 
    41334133                <java classname="org.junit.runner.JUnitCore" fork="true"> 
    4134                     <!--<env key="PATH" path="${basedir}/ext/testing/geckodriver:${env.PATH}"/>--> 
    41354134                    <!--https://stackoverflow.com/questions/38676719/selenium-using-java-the-path-to-the-driver-executable-must-be-set-by-the-webdr--> 
    41364135                    <sysproperty key="webdriver.gecko.driver" path="${basedir}/ext/testing/geckodriver"/> 
    41374136                    <arg value="gstests.TestClass"/> 
    41384137                    <jvmarg value="-DSERVERURL=${default.server.protocol}://${tomcat.server}:${default.tomcat.port}${app.path}${server.default.servlet} "/> 
    4139                     <!--<jvmarg value="-DGECKO_PATH=${default.server.protocol}://${tomcat.server}:${default.tomcat.port}${app.path}${server.default.servlet} "/>--> 
    41404138                    <classpath> 
    41414139                        <fileset dir="${basedir}/ext/testing/lib/java"> 
  • main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/tests/src/gstests/TestClass.java

    r32671 r32672  
    1515public class TestClass 
    1616{ 
    17     /*static { 
    18     System.setProperty("webdriver.gecko.driver", "/Scratch/ak19/gs3-svn-13Sep2018/ext/testing/geckodriver"); 
    19     }*/ 
    20      
    2117    //TODO: Do these dynamically 
    2218    private static final int NUMBER_OF_CLASSIFIERS = 4; 
     
    4137    { 
    4238        //https://stackoverflow.com/questions/38676719/selenium-using-java-the-path-to-the-driver-executable-must-be-set-by-the-webdr 
    43         //if you didn't update the Path system variable to add the full directory path to the executable as above mentioned then doing this directly through code 
    44         //System.setProperty("webdriver.gecko.driver", "/Scratch/ak19/gs3-svn-13Sep2018/ext/testing/geckodriver"); 
    45          
     39        // GS3's build.xml would have set the webdriver.gecko.driver path System.Property to 
     40        // the location of Firefox' geckodriver executable when launching this test class already. 
     41        // So now we can continue to just do: 
    4642        _driver.get(System.getProperty("SERVERURL")); 
    4743