Author: olamy
Date: Tue Dec 25 23:13:14 2012
New Revision: 1425784
URL: http://svn.apache.org/viewvc?rev=1425784&view=rev
Log:
different WebDriver depending on selenium.browser sysprop
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/WebDriverTest.java?rev=1425784&r1=1425783&r2=1425784&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
Tue Dec 25 23:13:14 2012
@@ -19,14 +19,17 @@ package org.apache.archiva.web.test;
*/
import junit.framework.Assert;
-import junit.framework.TestCase;
+import org.apache.commons.lang3.StringUtils;
import org.fluentlenium.adapter.FluentTest;
import org.fluentlenium.core.domain.FluentList;
import org.fluentlenium.core.domain.FluentWebElement;
import org.junit.Test;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.ie.InternetExplorerDriver;
+import org.openqa.selenium.safari.SafariDriver;
import java.io.File;
import java.io.FileInputStream;
@@ -71,6 +74,24 @@ public class WebDriverTest
@Override
public WebDriver getDefaultDriver()
{
+ String seleniumBrowser = System.getProperty( "selenium.browser" );
+
+ if ( StringUtils.contains( seleniumBrowser, "chrome" ) )
+ {
+ return new ChromeDriver();
+ }
+
+ if ( StringUtils.contains( seleniumBrowser, "safari" ) )
+ {
+ return new SafariDriver();
+ }
+
+ if ( StringUtils.contains( seleniumBrowser, "iexplore" ) )
+ {
+ return new InternetExplorerDriver();
+ }
+
return new FirefoxDriver();
+
}
}