Merge branch '#88-update-maven-dependencies' into develop

Xceptance · May 21, 2019 · f8c52bc · f8c52bc
2 parents f32efef + f1c2915
commit f8c52bc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,15 +17,21 @@
 	<developers>
 		<developer>
 			<name>Marcus Kaufmann</name>
-			<email>neodymium@xceptance.com</email>
 			<organization>Xceptance Software Technologies GmbH</organization>
 			<organizationUrl>https://www.xceptance.com</organizationUrl>
+			<roles>
+				<role>former developer</role>
+			</roles>
 		</developer>
 		<developer>
 			<name>Marcel Pfotenhauer</name>
 			<email>neodymium@xceptance.com</email>
 			<organization>Xceptance Software Technologies GmbH</organization>
 			<organizationUrl>https://www.xceptance.com</organizationUrl>
+			<roles>
+				<role>architect</role>
+        		<role>developer</role>
+			</roles>
 		</developer>
 	</developers>
 
@@ -47,8 +53,8 @@
 		<maven.compiler.source.version>1.8</maven.compiler.source.version>
 		<maven.compiler.target.version>1.8</maven.compiler.target.version>
 		<surefire.version>2.22.1</surefire.version>
-		<allure.version>2.10.0</allure.version>
-		<cucumber.version>4.3.0</cucumber.version>
+		<allure.version>2.12.0</allure.version>
+		<cucumber.version>4.3.1</cucumber.version>
 		<log4j.version>2.11.2</log4j.version>
 	</properties>
 
@@ -246,7 +252,7 @@
 		<dependency>
 			<groupId>com.codeborne</groupId>
 			<artifactId>selenide</artifactId>
-			<version>5.2.2</version>
+			<version>5.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

diff --git a/...va/com/xceptance/neodymium/module/statement/browser/multibrowser/BrowserRunnerHelper.java b/...va/com/xceptance/neodymium/module/statement/browser/multibrowser/BrowserRunnerHelper.java
@@ -171,7 +171,6 @@ private static FirefoxBinary createFirefoxBinary(final String pathToBrowser)
      *             if <a href="https://github.com/Xceptance/neodymium-library/wiki/Selenium-grid">Selenium grid</a> is
      *             used
      */
-    @SuppressWarnings("unchecked")
     public static WebDriver createWebdriver(final BrowserConfiguration config) throws MalformedURLException
     {
         final MutableCapabilities capabilities = config.getCapabilities();

diff --git a/src/main/java/com/xceptance/neodymium/util/SelenideAddons.java b/src/main/java/com/xceptance/neodymium/util/SelenideAddons.java
@@ -1,7 +1,5 @@
 package com.xceptance.neodymium.util;
 
-import static com.codeborne.selenide.Selenide.$$;
-
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -22,6 +20,8 @@
 import com.codeborne.selenide.logevents.SelenideLog;
 import com.codeborne.selenide.logevents.SelenideLogger;
 
+import static com.codeborne.selenide.Selenide.$$;
+
 /**
  * Additional helpers for limits chained lookup in Selenide. Contribute that later back to Selenide if it proves to
  * work, so it can become API or better fully integrated so we don't need that workaround concept.
@@ -229,7 +229,7 @@ public static Condition matchAttribute(final String attributeName, final String
             @Override
             public String toString()
             {
-                return name + " '" + regex + '\'';
+                return this.getName() + " '" + regex + '\'';
             }
 
             @Override

diff --git a/src/test/java/com/xceptance/neodymium/util/SelenideAddonsTest.java b/src/test/java/com/xceptance/neodymium/util/SelenideAddonsTest.java
@@ -1,7 +1,5 @@
 package com.xceptance.neodymium.util;
 
-import static com.codeborne.selenide.Selenide.$;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,6 +15,8 @@
 import com.xceptance.neodymium.NeodymiumRunner;
 import com.xceptance.neodymium.module.statement.browser.multibrowser.Browser;
 
+import static com.codeborne.selenide.Selenide.$;
+
 @RunWith(NeodymiumRunner.class)
 @Browser("Chrome_headless")
 public class SelenideAddonsTest
@@ -114,7 +114,7 @@ public void testWrapSoftAssertionError()
         SelenideLogger.addListener("testListener", new LogEventListener()
         {
             @Override
-            public void onEvent(LogEvent currentLog)
+            public void afterEvent(LogEvent currentLog)
             {
                 SelenideLog log = (SelenideLog) currentLog;
                 if (log.getStatus().equals(EventStatus.FAIL))
@@ -123,6 +123,12 @@ public void onEvent(LogEvent currentLog)
                     Assert.assertTrue("Selenide log event not matching", log.getError().getMessage().startsWith(errMessage));
                 }
             }
+
+            @Override
+            public void beforeEvent(LogEvent currentLog)
+            {
+                // ignore
+            }
         });
 
         Selenide.open("https://blog.xceptance.com/");