Merge pull request #60 from AutomateThePlanet/appium-version-upgrade

Upgraded appium version

Author: Ivaylo996

bellatrix.android/src/main/java/solutions/bellatrix/android/configuration/GridSettings.java

@@ -23,5 +23,5 @@ public class GridSettings {
     @Getter @Setter private String providerName;
     @Getter @Setter private String optionsName;
     @Getter @Setter private String url;
-    @Getter @Setter private List<HashMap<String, String>> arguments;
+    @Getter @Setter private List<HashMap<String, Object>> arguments;
 }

bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/AppConfiguration.java

@@ -32,7 +32,7 @@ public class AppConfiguration {
     @Getter private String androidVersion;
     @Setter @Getter private String testName;
     @Getter private final Boolean isMobileWebExecution;
-    @Getter HashMap<String, String> appiumOptions;
+    @Getter HashMap<String, Object> appiumOptions;
 
     @Override
     public boolean equals(Object o) {

bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java

@@ -13,13 +13,12 @@
 
 package solutions.bellatrix.android.infrastructure;
 
-
 import io.appium.java_client.android.AndroidDriver;
-import io.appium.java_client.remote.AndroidMobileCapabilityType;
-import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.android.options.UiAutomator2Options;
+import io.appium.java_client.remote.AutomationName;
+import io.appium.java_client.remote.MobilePlatform;
 import lombok.SneakyThrows;
 import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.remote.DesiredCapabilities;
 import solutions.bellatrix.android.configuration.AndroidSettings;
 import solutions.bellatrix.android.configuration.GridSettings;
 import solutions.bellatrix.core.configuration.ConfigurationService;
@@ -37,7 +36,7 @@
 public class DriverService {
     private static final ThreadLocal<Boolean> DISPOSED;
     private static final ThreadLocal<AppConfiguration> APP_CONFIGURATION;
-    private static final ThreadLocal<HashMap<String, String>> CUSTOM_DRIVER_OPTIONS;
+    private static final ThreadLocal<HashMap<String, Object>> CUSTOM_DRIVER_OPTIONS;
     private static final ThreadLocal<AndroidDriver> WRAPPED_ANDROID_DRIVER;
     private static boolean isBuildNameSet = false;
     private  static String buildName;
@@ -51,7 +50,7 @@ public class DriverService {
         DISPOSED.set(false);
     }
 
-    public static HashMap<String, String> getCustomDriverOptions() {
+    public static HashMap<String, Object> getCustomDriverOptions() {
         return CUSTOM_DRIVER_OPTIONS.get();
     }
 
@@ -89,22 +88,23 @@ public static AndroidDriver start(AppConfiguration configuration) {
     }
 
     private static AndroidDriver initializeDriverGridMode(GridSettings gridSettings, String testName) {
-        var caps = new DesiredCapabilities();
-        HashMap<String, Object> options = new HashMap<String, Object>();
-        options.put(MobileCapabilityType.PLATFORM_NAME, "Android");
-        options.put(MobileCapabilityType.PLATFORM_VERSION, getAppConfiguration().getAndroidVersion());
-        options.put(MobileCapabilityType.DEVICE_NAME, getAppConfiguration().getDeviceName());
+        var caps = new UiAutomator2Options();
+        caps.setPlatformName(MobilePlatform.ANDROID);
+        caps.setAutomationName(AutomationName.ANDROID_UIAUTOMATOR2);
+        caps.setPlatformVersion(getAppConfiguration().getAndroidVersion());
+        caps.setDeviceName(getAppConfiguration().getDeviceName());
 
         if (getAppConfiguration().getIsMobileWebExecution()) {
-            options.put(MobileCapabilityType.BROWSER_NAME, ConfigurationService.get(AndroidSettings.class).getDefaultBrowser());
+            caps.withBrowserName(ConfigurationService.get(AndroidSettings.class).getDefaultBrowser());
         } else {
-            options.put(MobileCapabilityType.APP, getAppConfiguration().getAppPath().replace("\\", "/"));
-            options.put(AndroidMobileCapabilityType.APP_PACKAGE, getAppConfiguration().getAppPackage());
-            options.put(AndroidMobileCapabilityType.APP_ACTIVITY, getAppConfiguration().getAppActivity());
+            caps.setApp(getAppConfiguration().getAppPath().replace("\\", "/"));
+            caps.setAppPackage(getAppConfiguration().getAppPackage());
+            caps.setAppActivity(getAppConfiguration().getAppActivity());
         }
 
-        options.put("name", testName);
+        var options = new HashMap<String, Object>();
         addGridOptions(options, gridSettings);
+        options.put("name", testName);
         caps.setCapability(gridSettings.getOptionsName(), options);
 
         AndroidDriver driver = null;
@@ -120,17 +120,18 @@ private static AndroidDriver initializeDriverGridMode(GridSettings gridSettings,
 
     @SneakyThrows
     private static AndroidDriver initializeDriverRegularMode(String serviceUrl) {
-        var caps = new DesiredCapabilities();
-        caps.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
-        caps.setCapability(MobileCapabilityType.PLATFORM_VERSION, getAppConfiguration().getAndroidVersion());
-        caps.setCapability(MobileCapabilityType.DEVICE_NAME, getAppConfiguration().getDeviceName());
+        var caps = new UiAutomator2Options();
+        caps.setPlatformName(MobilePlatform.ANDROID);
+        caps.setAutomationName(AutomationName.ANDROID_UIAUTOMATOR2);
+        caps.setPlatformVersion(getAppConfiguration().getAndroidVersion());
+        caps.setDeviceName(getAppConfiguration().getDeviceName());
 
         if (getAppConfiguration().getIsMobileWebExecution()) {
-            caps.setCapability(MobileCapabilityType.BROWSER_NAME, ConfigurationService.get(AndroidSettings.class).getDefaultBrowser());
+            caps.withBrowserName(ConfigurationService.get(AndroidSettings.class).getDefaultBrowser());
         } else {
-            caps.setCapability(MobileCapabilityType.APP, getAppConfiguration().getAppPath());
-            caps.setCapability(AndroidMobileCapabilityType.APP_PACKAGE, getAppConfiguration().getAppPackage());
-            caps.setCapability(AndroidMobileCapabilityType.APP_ACTIVITY, getAppConfiguration().getAppActivity());
+            caps.setApp(getAppConfiguration().getAppPath().replace("\\", "/"));
+            caps.setAppPackage(getAppConfiguration().getAppPackage());
+            caps.setAppActivity(getAppConfiguration().getAppActivity());
         }
 
         addDriverConfigOptions(caps);

bellatrix.android/src/main/java/solutions/bellatrix/android/services/AppService.java

@@ -13,7 +13,7 @@
 
 package solutions.bellatrix.android.services;
 
-import io.appium.java_client.android.Activity;
+import com.google.common.collect.ImmutableMap;
 import lombok.SneakyThrows;
 import org.openqa.selenium.ContextAware;
 import org.openqa.selenium.support.ui.WebDriverWait;
@@ -23,7 +23,7 @@
 import solutions.bellatrix.core.utilities.RuntimeInformation;
 
 import java.time.Duration;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BooleanSupplier;
 
@@ -35,38 +35,60 @@ public String getCurrentActivity() {
     public void startActivity(
             String appPackage,
             String appActivity,
-            String appWaitPackage,
-            String appWaitActivity,
-            boolean stopApp) {
+            boolean shouldWait,
+            boolean stopApp
+    ) {
         try {
             getWrappedAndroidDriver().hideKeyboard();
         } catch (Exception ignore) {}
-        var activity = new Activity(appPackage, appActivity);
-        activity.setAppWaitActivity(appWaitActivity);
-        activity.setAppWaitPackage(appWaitPackage);
-        activity.setStopApp(stopApp);
-        getWrappedAndroidDriver().startActivity(activity);
+        var activity = ImmutableMap.of(
+                "package", appPackage,
+                "component", appActivity,
+                "wait", shouldWait,
+                "stop", stopApp
+        );
+
+        getWrappedAndroidDriver().execute("mobile: startActivity", activity);
     }
 
     public void startActivity(
             String appPackage,
-            String appActivity) {
-        var activity = new Activity(appPackage, appActivity);
-        getWrappedAndroidDriver().startActivity(activity);
+            String appActivity
+    ) {
+        var activity = ImmutableMap.of(
+                "package", appPackage,
+                "component", appActivity
+        );
+
+        getWrappedAndroidDriver().execute("mobile: startActivity", activity);
     }
 
-    public void startActivityWithIntent(String appPackage, String appActivity, String intentAction, String appWaitPackage, String appWaitActivity, String intentCategory, String intentFlags, String intentOptionalArgs, boolean stopApp) {
+    public void startActivityWithIntent(
+            String appPackage,
+            String appActivity,
+            String intentAction,
+            boolean shouldWait,
+            String intentCategory,
+            String intentFlags,
+            List<List<String>> intentOptionalArgs,
+            boolean stopApp
+    ) {
         try {
             getWrappedAndroidDriver().hideKeyboard();
         } catch (Exception ignore) {}
-        var activity = new Activity(appPackage, appActivity);
-        activity.setAppWaitActivity(appWaitActivity);
-        activity.setAppWaitPackage(appWaitPackage);
-        activity.setStopApp(stopApp);
-        activity.setIntentCategory(intentCategory);
-        activity.setIntentFlags(intentFlags);
-        activity.setOptionalIntentArguments(intentOptionalArgs);
-        getWrappedAndroidDriver().startActivity(activity);
+
+        var activity = ImmutableMap.of(
+                "package", appPackage,
+                "component", appActivity,
+                "action", intentAction,
+                "wait", shouldWait,
+                "categories", intentCategory,
+                "flags", intentFlags,
+                "extras", intentOptionalArgs,
+                "stop", stopApp
+        );
+
+        getWrappedAndroidDriver().execute("mobile: startActivity", activity);
     }
 
     public String getContext() {
@@ -157,7 +179,7 @@ private void switchToWebView(BooleanSupplier filterConditionToSwitchWebView) {
         var timeoutInterval = ConfigurationService.get(AndroidSettings.class).getTimeoutSettings().getImplicitWaitTimeout();
         var sleepInterval = ConfigurationService.get(AndroidSettings.class).getTimeoutSettings().getSleepInterval();
         var webDriverWait = new WebDriverWait(DriverService.getWrappedAndroidDriver(), Duration.ofSeconds(timeoutInterval), Duration.ofSeconds(sleepInterval));
-        webDriverWait.until(d ->{
+        webDriverWait.until(d -> {
             var contexts = ((ContextAware)getWrappedAndroidDriver()).getContextHandles();
             contexts.stream().forEach(c -> {
                 try {

bellatrix.core/pom.xml

@@ -25,7 +25,7 @@
 
     <properties>
         <selenium.version>4.27.0</selenium.version>
-        <appium.version>8.3.0</appium.version>
+        <appium.version>9.4.0</appium.version>
         <testng.version>7.7.0</testng.version>
         <junit.version>5.9.2</junit.version>
         <rest.assured.version>5.3.0</rest.assured.version>

bellatrix.desktop/src/main/java/solutions/bellatrix/desktop/configuration/GridSettings.java

@@ -22,5 +22,5 @@
 public class GridSettings {
     @Getter @Setter private String providerName;
     @Getter @Setter private String url;
-    @Getter @Setter private List<HashMap<String, String>> arguments;
+    @Getter @Setter private List<HashMap<String, Object>> arguments;
 }

bellatrix.desktop/src/main/java/solutions/bellatrix/desktop/findstrategies/AutomationIdFindStrategy.java

@@ -13,8 +13,6 @@
 
 package solutions.bellatrix.desktop.findstrategies;
 
-import io.appium.java_client.AppiumBy;
-import io.appium.java_client.pagefactory.WindowsBy;
 import io.appium.java_client.windows.WindowsDriver;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;

bellatrix.desktop/src/main/java/solutions/bellatrix/desktop/infrastructure/AppConfiguration.java

@@ -20,9 +20,9 @@ public class AppConfiguration {
     private final Lifecycle lifecycle;
     private int height;
     private int width;
-    final HashMap<String, String> appiumOptions;
+    final HashMap<String, Object> appiumOptions;
 
-    public HashMap<String, String> getAppiumOptions() {
+    public HashMap<String, Object> getAppiumOptions() {
         return appiumOptions;
     }
 

bellatrix.desktop/src/main/java/solutions/bellatrix/desktop/infrastructure/DriverService.java

@@ -14,12 +14,11 @@
 package solutions.bellatrix.desktop.infrastructure;
 
 import io.appium.java_client.windows.WindowsDriver;
+import io.appium.java_client.windows.options.WindowsOptions;
 import lombok.SneakyThrows;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.remote.DesiredCapabilities;
 import solutions.bellatrix.core.configuration.ConfigurationService;
 import solutions.bellatrix.core.utilities.DebugInformation;
 import solutions.bellatrix.desktop.configuration.DesktopSettings;
@@ -34,7 +33,7 @@
 public class DriverService {
     private static final ThreadLocal<Boolean> DISPOSED;
     private static final ThreadLocal<AppConfiguration> APP_CONFIGURATION;
-    private static final ThreadLocal<HashMap<String, String>> CUSTOM_DRIVER_OPTIONS;
+    private static final ThreadLocal<HashMap<String, Object>> CUSTOM_DRIVER_OPTIONS;
     private static final ThreadLocal<WindowsDriver> WRAPPED_DRIVER;
 
     static {
@@ -46,7 +45,7 @@ public class DriverService {
         DISPOSED.set(false);
     }
 
-    public static HashMap<String, String> getCustomDriverOptions() {
+    public static HashMap<String, Object> getCustomDriverOptions() {
         return CUSTOM_DRIVER_OPTIONS.get();
     }
 
@@ -85,9 +84,9 @@ public static WindowsDriver start(AppConfiguration configuration) {
     }
 
     private static WindowsDriver initializeDriverGridMode(GridSettings gridSettings) {
-        var caps = new DesiredCapabilities();
-        caps.setCapability("platform", Platform.WIN10);
-        caps.setCapability("version", "latest");
+        var caps = new WindowsOptions();
+        caps.setApp(getAppConfiguration().getAppPath().replace("\\", "/"));
+        caps.setAppWorkingDir(new File(getAppConfiguration().getAppPath()).getParent());
 
         WindowsDriver driver = null;
         try {
@@ -101,11 +100,9 @@ private static WindowsDriver initializeDriverGridMode(GridSettings gridSettings)
 
     @SneakyThrows
     private static WindowsDriver initializeDriverRegularMode(String serviceUrl) {
-        var caps = new DesiredCapabilities();
-        caps.setCapability("app", getAppConfiguration().getAppPath());
-        caps.setCapability("deviceName", "WindowsPC");
-        caps.setCapability("platformName", "Windows");
-        caps.setCapability("appWorkingDir", new File(getAppConfiguration().getAppPath()).getParent());
+        var caps = new WindowsOptions();
+        caps.setApp(getAppConfiguration().getAppPath().replace("\\", "/"));
+        caps.setAppWorkingDir(new File(getAppConfiguration().getAppPath()).getParent());
         addDriverOptions(caps);
         var driver = new WindowsDriver(new URL(serviceUrl), caps);
 

bellatrix.ios/src/main/java/solutions/bellatrix/ios/configuration/GridSettings.java

@@ -22,5 +22,5 @@
 public class GridSettings {
     @Getter @Setter private String providerName;
     @Getter @Setter private String url;
-    @Getter @Setter private List<HashMap<String, String>> arguments;
+    @Getter @Setter private List<HashMap<String, Object>> arguments;
 }