Added empty check because PropertyManager returns emtpy String in cas…

…e of platform property is not set
Zsar · Jan 24, 2022 · 75b0348 · 75b0348
1 parent dcd6da6
commit 75b0348
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverManagerConfig.java b/.../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, ""));
         }
     }
 

diff --git a/...ain/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverSessionsManager.java b/...ain/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverSessionsManager.java
@@ -328,8 +328,12 @@ public static WebDriver getWebDriver(AbstractWebDriverRequest webDriverRequest)
             webDriverRequest.setBrowserVersion(WebDriverManager.getConfig().getBrowserVersion());
         }
 
-        if (StringUtils.isBlank(webDriverRequest.getPlatformName().orElse(null))) {
-            WebDriverManager.getConfig().getPlatformName().ifPresent(webDriverRequest::setPlatformName);
+        if (StringUtils.isEmpty(webDriverRequest.getPlatformName().orElse(null))) {
+            WebDriverManager.getConfig().getPlatformName().ifPresent(platfrom -> {
+                if (StringUtils.isNotEmpty(platfrom)) {
+                    webDriverRequest.setPlatformName(platfrom);
+                }
+            });
         }
 
         String browser = webDriverRequest.getBrowser();
-Original file line number
+Diff line change
@@ Expand Up / @@ -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, ""));
             }
         }
@@ Expand Down @@