From 090eac038a573f28c00cd4100188d99b1a2b47fd Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 25 Nov 2024 17:40:01 +0200 Subject: [PATCH 1/3] disable deletion of custom driver options on app restart --- .../bellatrix/android/infrastructure/DriverService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java b/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java index 87b173d7..f32c3ca4 100644 --- a/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java +++ b/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java @@ -225,7 +225,7 @@ public static void close() { if (WRAPPED_ANDROID_DRIVER.get() != null) { WRAPPED_ANDROID_DRIVER.get().quit(); - CUSTOM_DRIVER_OPTIONS.get().clear(); + // CUSTOM_DRIVER_OPTIONS.get().clear(); } DISPOSED.set(true); From 3a8f0c6fe5c74b9501d62fb645bd8e8915e006f7 Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 25 Nov 2024 17:42:16 +0200 Subject: [PATCH 2/3] added custom capabilities adding on initializeDriver --- .../bellatrix/android/infrastructure/DriverService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java b/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java index f32c3ca4..e01201ad 100644 --- a/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java +++ b/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java @@ -94,6 +94,7 @@ private static AndroidDriver initializeDriverGridMode(GridSettings gridSettings, options.put(MobileCapabilityType.PLATFORM_NAME, "Android"); options.put(MobileCapabilityType.PLATFORM_VERSION, getAppConfiguration().getAndroidVersion()); options.put(MobileCapabilityType.DEVICE_NAME, getAppConfiguration().getDeviceName()); + getCustomDriverOptions().forEach(caps::setCapability); if (getAppConfiguration().getIsMobileWebExecution()) { options.put(MobileCapabilityType.BROWSER_NAME, ConfigurationService.get(AndroidSettings.class).getDefaultBrowser()); @@ -124,6 +125,7 @@ private static AndroidDriver initializeDriverRegularMode(String serviceUrl) { caps.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android"); caps.setCapability(MobileCapabilityType.PLATFORM_VERSION, getAppConfiguration().getAndroidVersion()); caps.setCapability(MobileCapabilityType.DEVICE_NAME, getAppConfiguration().getDeviceName()); + getCustomDriverOptions().forEach(caps::setCapability); if (getAppConfiguration().getIsMobileWebExecution()) { caps.setCapability(MobileCapabilityType.BROWSER_NAME, ConfigurationService.get(AndroidSettings.class).getDefaultBrowser()); From d2379c7e12792621e14435acfeb831704ea4588a Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 25 Nov 2024 17:52:11 +0200 Subject: [PATCH 3/3] fix method redundancy --- .../android/infrastructure/DriverService.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java b/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java index e01201ad..4e1c367f 100644 --- a/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java +++ b/bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java @@ -94,7 +94,6 @@ private static AndroidDriver initializeDriverGridMode(GridSettings gridSettings, options.put(MobileCapabilityType.PLATFORM_NAME, "Android"); options.put(MobileCapabilityType.PLATFORM_VERSION, getAppConfiguration().getAndroidVersion()); options.put(MobileCapabilityType.DEVICE_NAME, getAppConfiguration().getDeviceName()); - getCustomDriverOptions().forEach(caps::setCapability); if (getAppConfiguration().getIsMobileWebExecution()) { options.put(MobileCapabilityType.BROWSER_NAME, ConfigurationService.get(AndroidSettings.class).getDefaultBrowser()); @@ -125,7 +124,6 @@ private static AndroidDriver initializeDriverRegularMode(String serviceUrl) { caps.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android"); caps.setCapability(MobileCapabilityType.PLATFORM_VERSION, getAppConfiguration().getAndroidVersion()); caps.setCapability(MobileCapabilityType.DEVICE_NAME, getAppConfiguration().getDeviceName()); - getCustomDriverOptions().forEach(caps::setCapability); if (getAppConfiguration().getIsMobileWebExecution()) { caps.setCapability(MobileCapabilityType.BROWSER_NAME, ConfigurationService.get(AndroidSettings.class).getDefaultBrowser()); @@ -209,15 +207,13 @@ private static String getBuildName() { } private static void addDriverConfigOptions(TOption chromeOptions) { - for (var optionKey : APP_CONFIGURATION.get().appiumOptions.keySet()) { - chromeOptions.setCapability(optionKey, APP_CONFIGURATION.get().appiumOptions.get(optionKey)); + for (var optionEntry : APP_CONFIGURATION.get().appiumOptions.entrySet()) { + chromeOptions.setCapability(optionEntry.getKey(), optionEntry.getValue()); } } private static void addCustomDriverOptions(TOption mobileOptions) { - for (var optionKey : CUSTOM_DRIVER_OPTIONS.get().keySet()) { - mobileOptions.setCapability(optionKey, CUSTOM_DRIVER_OPTIONS.get().get(optionKey)); - } + getCustomDriverOptions().forEach(mobileOptions::setCapability); } public static void close() {