Changeset 32672

Timestamp:

2018-12-12T19:06:34+13:00 (5 years ago)

Author:

ak19

Message:

Tidying up after previous commit

Files:

• gs3-extensions/testing/trunk/src/src/org/greenstone/gsdl3/testing/GSTestingUtil.java (modified) (1 diff)
• main/trunk/greenstone3/build.xml (modified) (1 diff)
• main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/tests/src/gstests/TestClass.java (modified) (2 diffs)

gs3-extensions/testing/trunk/src/src/org/greenstone/gsdl3/testing/GSTestingUtil.java

@@ -103 +103 @@
     public static void loadCollectionByName(WebDriver driver, String collection)
     {
-        //WebElement demoColLinkElem = findElementByXPath(driver, "//div[contains(concat(' ', normalize-space(@class), ' '), 'collectionLinkText')]/a[descendant::text()='" + collection + "']");
-        //List<WebElement> demoColLinkElems = findElementsByXPath(driver, "//div[contains(concat(' ', normalize-space(@class), ' '), 'collectionLinkText')]/a[descendant::text()='" + collection + "']");
-        //demoColLinkElems.get(0).click();
-
         WebElement demoColLinkElem = findElementByXPath(driver, "//div[contains(concat(' ', normalize-space(@class), ' '), 'collectionLinkText')][descendant::text()='" + collection + "']");
         demoColLinkElem.click();

main/trunk/greenstone3/build.xml

@@ -4132 +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">

main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/tests/src/gstests/TestClass.java

@@ -15 +15 @@
 public class TestClass
 {
-    /*static {
-    System.setProperty("webdriver.gecko.driver", "/Scratch/ak19/gs3-svn-13Sep2018/ext/testing/geckodriver");
-    }*/
-    
     //TODO: Do these dynamically
     private static final int NUMBER_OF_CLASSIFIERS = 4;
@@ -41 +37 @@
     {
         //https://stackoverflow.com/questions/38676719/selenium-using-java-the-path-to-the-driver-executable-must-be-set-by-the-webdr
-        //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
-        //System.setProperty("webdriver.gecko.driver", "/Scratch/ak19/gs3-svn-13Sep2018/ext/testing/geckodriver");
-        
+        // GS3's build.xml would have set the webdriver.gecko.driver path System.Property to
+        // the location of Firefox' geckodriver executable when launching this test class already.
+        // So now we can continue to just do:
         _driver.get(System.getProperty("SERVERURL"));