Merge pull request #200 from telekom/bugfix/platform-cap

Fixed setting platform attribute to DesktopWebDriverRequest

driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/DesktopWebDriverCapabilities.java

@@ -22,14 +22,15 @@
 package eu.tsystems.mms.tic.testframework.webdrivermanager;
 
 import eu.tsystems.mms.tic.testframework.utils.CertUtils;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
 @Deprecated
 public final class DesktopWebDriverCapabilities extends WebDriverCapabilities {
 
@@ -88,7 +89,6 @@ static DesiredCapabilities createCapabilities(final WebDriverManagerConfig confi
         }
 
         desktopWebDriverRequest.getPlatformName()
-                .map(StringUtils::isNotBlank)
                 .ifPresent(s -> {
                     desiredCapabilities.setCapability(CapabilityType.PLATFORM_NAME, s);
                     desiredCapabilities.setCapability(CapabilityType.PLATFORM, s);

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/AbstractWebDriverConfiguration.java

@@ -20,6 +20,8 @@
  */
 package eu.tsystems.mms.tic.testframework.webdrivermanager;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -64,7 +66,9 @@ public AbstractWebDriverConfiguration setBaseUrl(URL baseUrl) {
     }
 
     public void setPlatformName(String platformName) {
-        this.platformName = platformName;
+        if (StringUtils.isNotEmpty(platformName)) {
+            this.platformName = platformName;
+        }
     }
 
     public Optional<String> getPlatformName() {

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverManagerConfig.java

@@ -96,7 +96,7 @@ private void initBrowser() {
         }
 
         if (StringUtils.isBlank(this.getPlatformName().orElse(null))) {
-            this.setPlatformName(PropertyManager.getProperty(TesterraProperties.BROWSER_PLATFORM, null));
+            this.setPlatformName(PropertyManager.getProperty(TesterraProperties.BROWSER_PLATFORM, ""));
         }
     }
 

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverSessionsManager.java

@@ -19,7 +19,7 @@
  * under the License.
  *
  */
- package eu.tsystems.mms.tic.testframework.webdrivermanager;
+package eu.tsystems.mms.tic.testframework.webdrivermanager;
 
 import eu.tsystems.mms.tic.testframework.constants.TesterraProperties;
 import eu.tsystems.mms.tic.testframework.events.ContextUpdateEvent;
@@ -32,6 +32,13 @@
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextUtils;
 import eu.tsystems.mms.tic.testframework.utils.WebDriverUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.support.events.EventFiringWebDriver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -43,12 +50,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
-import org.apache.commons.lang3.StringUtils;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import org.openqa.selenium.support.events.EventFiringWebDriver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import static eu.tsystems.mms.tic.testframework.webdrivermanager.WebDriverFactory.wrapRawWebDriverWithEventFiringWebDriver;
 
 public final class WebDriverSessionsManager {
@@ -149,7 +151,7 @@ private static void unlinkFromThread(String sessionKey, WebDriver eventFiringWeb
     /**
      * Introduce an own webdriver object. Selenium session will be released in this case.
      *
-     * @param driver     .
+     * @param driver .
      * @param sessionKey .
      */
     static void introduceWebDriver(final String sessionKey, final WebDriver driver) {
@@ -221,7 +223,6 @@ public static void shutdownWebDriver(WebDriver webDriver) {
         LOGGER.debug("Shut down: " + sessionIdentifier);
     }
 
-
     static void shutdownAllThreadSessions() {
         getWebDriversFromCurrentThread().forEach(WebDriverSessionsManager::shutdownWebDriver);
     }
@@ -311,7 +312,6 @@ static Stream<WebDriver> getWebDriversFromThread(final long threadId) {
         return WEBDRIVER_THREAD_ID_MAP.entrySet().stream().filter(entry -> entry.getValue() == threadId).map(Map.Entry::getKey);
     }
 
-
     public static WebDriver getWebDriver(AbstractWebDriverRequest webDriverRequest) {
         /*
         get session key
@@ -328,10 +328,15 @@ public static WebDriver getWebDriver(AbstractWebDriverRequest webDriverRequest)
             webDriverRequest.setBrowserVersion(WebDriverManager.getConfig().getBrowserVersion());
         }
 
+        if (StringUtils.isEmpty(webDriverRequest.getPlatformName().orElse(null))) {
+            WebDriverManager.getConfig().getPlatformName().ifPresent(webDriverRequest::setPlatformName);
+        }
+
         String browser = webDriverRequest.getBrowser();
 
         if (StringUtils.isBlank(browser)) {
-            throw new SystemException(String.format("No browser configured. Please define one in %s.setBrowser() or property '%s'", WebDriverRequest.class.getSimpleName(), TesterraProperties.BROWSER));
+            throw new SystemException(
+                    String.format("No browser configured. Please define one in %s.setBrowser() or property '%s'", WebDriverRequest.class.getSimpleName(), TesterraProperties.BROWSER));
         }
 
         String sessionKey = webDriverRequest.getSessionKey();