diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2017-06-09 22:24:54 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2017-06-09 22:24:54 +0200 |
| commit | f242578be0635b7487976c6c0187acb4f70a0b27 (patch) | |
| tree | 8d4ff9cde4b8afe3a516670455a6001d708e8863 /archiva-modules/archiva-web/archiva-webapp-test/src/test | |
| parent | 85352aae7d53a6de4f8839987025d1ec643c7f04 (diff) | |
| download | archiva-f242578be0635b7487976c6c0187acb4f70a0b27.tar.gz archiva-f242578be0635b7487976c6c0187acb4f70a0b27.zip | |
Fixing maven config for remote selenium server
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp-test/src/test')
2 files changed, 6 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java index 698d6a045..2cfe0705c 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java @@ -59,7 +59,7 @@ public abstract class AbstractSeleniumTest public String browser = System.getProperty( "browser" ); public String baseUrl = - "http://localhost:" + System.getProperty( "tomcat.maven.http.port" ) + "/archiva/index.html?request_lang=en"; + "http://localhost:" + System.getProperty( "container.http.port" ) + "/archiva/index.html?request_lang=en"; public int maxWaitTimeInMs = Integer.getInteger( "maxWaitTimeInMs" ); @@ -67,7 +67,7 @@ public abstract class AbstractSeleniumTest public int seleniumPort = Integer.getInteger( "seleniumPort", 4444 ); - public boolean remoteSelenium = Boolean.parseBoolean( System.getProperty( "remoteSelenium", "false" ) ); + public boolean remoteSelenium = Boolean.parseBoolean( System.getProperty( "seleniumRemote", "false" ) ); WebDriver webDriver = null; diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java index 0f3af86bb..12546c340 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/WebdriverUtility.java @@ -62,6 +62,10 @@ public class WebdriverUtility } public static WebDriver newWebDriver(String seleniumBrowser, String seleniumHost, int seleniumPort, boolean seleniumRemote) { + log.info("WebDriver {}, {}, {}, {}", seleniumBrowser, seleniumHost, seleniumPort, seleniumRemote); + if (seleniumRemote && StringUtils.isEmpty( seleniumHost )) { + throw new IllegalArgumentException( "seleniumHost must be set, when seleniumRemote=true" ); + } try { if ( StringUtils.contains(seleniumBrowser, "chrome")) { |