Repository: archiva Updated Branches: refs/heads/master c002211a1 -> c424149d1
Adding Null checks for selenium Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/32acbe20 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/32acbe20 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/32acbe20 Branch: refs/heads/master Commit: 32acbe20f3be17af2e3ec02dee40345ecd5c61e9 Parents: c002211 Author: Martin Stockhammer <[email protected]> Authored: Fri Mar 30 17:32:16 2018 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Fri Mar 30 17:32:16 2018 +0200 ---------------------------------------------------------------------- .../apache/archiva/web/test/parent/AbstractSeleniumTest.java | 8 ++++++-- .../archiva/web/test/tools/ArchivaSeleniumExecutionRule.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/32acbe20/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java ---------------------------------------------------------------------- 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 082c4b3..48a1361 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 @@ -88,16 +88,20 @@ public abstract class AbstractSeleniumTest baseUrl = WebdriverUtility.getBaseUrl()+"/index.html?request_lang=en"; open( baseUrl, browser, seleniumHost, seleniumPort, maxWaitTimeInMs, remoteSelenium ); + Assert.assertNotNull( getWebDriver() ); getWebDriver().manage().window().maximize(); assertAdminCreated(); } /** - * this method is called by the Rule after executing a tests + * this method is called by the Rule after executing a test */ public void close() { - getWebDriver().close(); + if (getWebDriver()!=null) + { + getWebDriver( ).close( ); + } } /** http://git-wip-us.apache.org/repos/asf/archiva/blob/32acbe20/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java index f8c107f..b44b918 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java @@ -52,7 +52,7 @@ public class ArchivaSeleniumExecutionRule String fileName = ( (AbstractSeleniumTest) target ).captureScreenShotOnFailure( e, method.getMethod().getName(), target.getClass().getName() ); - + log.info("Screenshot: "+fileName); throw new RuntimeException( e.getMessage() + " see screenShot file:" + fileName, e ); } finally
