Version 2023.02.03: Selenium - Don't add desired capabilities with em…

…pty platform and browser version
devonfw-forge · Feb 3, 2023 · 81408ec · 81408ec
1 parent d1cbcb7
commit 81408ec
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 45 deletions.
diff --git a/mrchecker-framework-modules/mrchecker-cli-module/pom.xml b/mrchecker-framework-modules/mrchecker-cli-module/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-cli-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - CLI - Module</name>
     <description>MrChecker CLI Module supports:
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
     </dependencies>
 

diff --git a/mrchecker-framework-modules/mrchecker-core-module/pom.xml b/mrchecker-framework-modules/mrchecker-core-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-core-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - Test core - Module</name>
     <description>MrChecker Test Framework Core is responsible for:

diff --git a/mrchecker-framework-modules/mrchecker-database-module/pom.xml b/mrchecker-framework-modules/mrchecker-database-module/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-database-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - Database - Module</name>
     <description>MrChecker Database Module:
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
 
         <!-- JPA dependencies -->

diff --git a/mrchecker-framework-modules/mrchecker-mobile-module/pom.xml b/mrchecker-framework-modules/mrchecker-mobile-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-mobile-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - Mobile - Module</name>
     <description>MrChecker Test Framework name supports:
@@ -52,12 +52,12 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-selenium-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
 
         <!--This dependency is necessary for Appium plugin. -->

diff --git a/mrchecker-framework-modules/mrchecker-playwright-module/pom.xml b/mrchecker-framework-modules/mrchecker-playwright-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-playwright-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - Playwright - Module</name>
     <description>MrChecker Test Framework Playwright</description>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
 
         <!--This dependency is necessary for Playwright plugin. -->

diff --git a/mrchecker-framework-modules/mrchecker-security-module/pom.xml b/mrchecker-framework-modules/mrchecker-security-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-security-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - Security - Module</name>
     <description>MrChecker Test Framework Security supports:
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
 
         <!-- Needed to perform all API calls -->

diff --git a/mrchecker-framework-modules/mrchecker-selenium-module/pom.xml b/mrchecker-framework-modules/mrchecker-selenium-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-selenium-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - Selenium - Module</name>
     <description>MrChecker Test Framework Selenium supports:
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
 
         <!--This dependency is necessary for Selenium plugin. -->

diff --git a/...-module/src/main/java/com/capgemini/mrchecker/selenium/core/newDrivers/DriverManager.java b/...-module/src/main/java/com/capgemini/mrchecker/selenium/core/newDrivers/DriverManager.java
@@ -139,8 +139,8 @@ public static void closeDriver() {
         }
     }
 
-    private static boolean isEmpty(String seleniumGridParameter) {
-        return seleniumGridParameter == null || seleniumGridParameter.trim().isEmpty();
+    private static boolean isEmpty(String value) {
+        return value == null || value.trim().isEmpty();
     }
 
     private enum Driver {
@@ -450,18 +450,9 @@ private static INewWebDriver getRemoteDriver(MutableCapabilities options) {
         DesiredCapabilities capabilities = new DesiredCapabilities();
 
         String operatingSystem = RuntimeParametersSelenium.OS.getValue();
-        switch (operatingSystem) {
-            case "windows":
-                capabilities.setPlatform(Platform.WINDOWS);
-                break;
-            case "vista":
-                capabilities.setPlatform(Platform.VISTA);
-                break;
-            case "mac":
-                capabilities.setPlatform(Platform.MAC);
-                break;
-            default:
-                capabilities.setPlatform(Platform.LINUX);
+        if (!isEmpty(operatingSystem)) {
+            Platform platform = Platform.fromString(operatingSystem);
+            capabilities.setPlatform(platform);
         }
 
         String browser = RuntimeParametersSelenium.BROWSER.getValue();
@@ -474,13 +465,16 @@ private static INewWebDriver getRemoteDriver(MutableCapabilities options) {
         } else {
             throw new IllegalStateException("Unsupported browser: " + browser);
         }
-
         capabilities.setBrowserName(browser);
-        //Backward compatibility with Selenium 3 grids
-        if (Boolean.parseBoolean(System.getProperty("selenium3grid", "false"))) {
-            capabilities.setCapability("version", RuntimeParametersSelenium.BROWSER_VERSION.getValue());
-        } else {
-            capabilities.setVersion(RuntimeParametersSelenium.BROWSER_VERSION.getValue());
+
+        String browserVersion = RuntimeParametersSelenium.BROWSER_VERSION.getValue();
+        if (!isEmpty(browserVersion)) {
+            //Backward compatibility with Selenium 3 grids
+            if (Boolean.parseBoolean(System.getProperty("selenium3grid", "false"))) {
+                capabilities.setCapability("version", browserVersion);
+            } else {
+                capabilities.setVersion(browserVersion);
+            }
         }
 
         RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {

diff --git a/mrchecker-framework-modules/mrchecker-webapi-module/pom.xml b/mrchecker-framework-modules/mrchecker-webapi-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.02.02</version>
+        <version>2023.02.03</version>
     </parent>
 
     <artifactId>mrchecker-webapi-module</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <packaging>jar</packaging>
     <name>MrChecker - WebApi - Module</name>
     <description>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.02.02</version>
+            <version>2023.02.03</version>
         </dependency>
 
         <!-- Dependency to REST and SOAP lib -->

diff --git a/mrchecker-framework-modules/pom.xml b/mrchecker-framework-modules/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.capgemini.mrchecker</groupId>
     <artifactId>mrchecker-test-framework</artifactId>
-    <version>2023.02.02</version>
+    <version>2023.02.03</version>
     <name>MrChecker</name>
     <description>MrChecker Test Framework is an automated testing framework for functional testing of web applications,
         native mobile apps, webservices and database.