Author: kishore
Date: Sun Mar 26 00:20:03 2017
New Revision: 1788696
URL: http://svn.apache.org/viewvc?rev=1788696&view=rev
Log:
Added test support for Firefox Gecko driver.
Modified:
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1788696&r1=1788695&r2=1788696&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Sun Mar 26
00:20:03 2017
@@ -1163,7 +1163,7 @@
<junit fork="true" maxmemory="128m" dir="test-postgresql-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
<jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg
value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
+ <jvmarg value="-Dwebdriver.gecko.driver=${env.SL_FIREFOX_DRIVER}"/>
<jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
@@ -1190,7 +1190,7 @@
<junit fork="true" maxmemory="128m" dir="test-HSQLDB-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
<jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg
value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
+ <jvmarg value="-Dwebdriver.gecko.driver=${env.SL_FIREFOX_DRIVER}"/>
<jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
@@ -1217,7 +1217,7 @@
<junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
<jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg
value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
+ <jvmarg value="-Dwebdriver.gecko.driver=${env.SL_FIREFOX_DRIVER}"/>
<jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
@@ -1244,7 +1244,7 @@
<junit fork="true" maxmemory="128m" dir="test-mysql-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
<jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg
value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
+ <jvmarg value="-Dwebdriver.gecko.driver=${env.SL_FIREFOX_DRIVER}"/>
<jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web-proprietary/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web-proprietary/war/mcf-authority-service.war"/>
Modified:
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java?rev=1788696&r1=1788695&r2=1788696&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
(original)
+++
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
Sun Mar 26 00:20:03 2017
@@ -29,6 +29,7 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.Select;
@@ -45,7 +46,8 @@ public class SeleniumTester
public enum BrowserType
{
- CHROME
+ CHROME,
+ FIREFOX
}
/**
@@ -81,6 +83,15 @@ public class SeleniumTester
options.addArguments("--start-maximized", "--lang=" + language);
driver = new ChromeDriver(options);
break;
+ case FIREFOX:
+ if(System.getProperty("webdriver.gecko.driver") == null
+ || System.getProperty("webdriver.gecko.driver").length() == 0)
+ throw new IllegalStateException(
+ "Please configure your SL_FIREFOX_DRIVER environment variable to
point to the Mozilla Firefox Driver");
+
+ //Create a new instance of Firefox driver
+ driver = new FirefoxDriver();
+ break;
default:
throw new IllegalArgumentException("Unknown browser type");
}
@@ -157,7 +168,16 @@ public class SeleniumTester
{
js =
"$(arguments[0]).closest('.treeview').find('a:first-child').click();";
((JavascriptExecutor)driver).executeScript(js, ele);
- waitUntilAnimationIsDone(".sidebar-menu .treeview.active
.treeview-menu");
+ //waitUntilAnimationIsDone(".sidebar-menu .treeview .treeview-menu");
+ //Wait for a second for the animation to complete.
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
}
//Wait until the menu is link is visible
