Fix NPE getting empty cap

telekom · Jun 11, 2024 · 6b727ac · 6b727ac
1 parent 7a0e5cf
commit 6b727ac
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...ava/eu/tsystems/mms/tic/testframework/mobile/guielement/CreateAppiumGuiElementAction.java b/...ava/eu/tsystems/mms/tic/testframework/mobile/guielement/CreateAppiumGuiElementAction.java
@@ -20,6 +20,7 @@
  */
 package eu.tsystems.mms.tic.testframework.mobile.guielement;
 
+import eu.tsystems.mms.tic.testframework.appium.AppiumCapabilityHelper;
 import eu.tsystems.mms.tic.testframework.common.Testerra;
 import eu.tsystems.mms.tic.testframework.internal.NameableChild;
 import eu.tsystems.mms.tic.testframework.logging.Loggable;
@@ -47,7 +48,10 @@
  *
  * @author mgn
  */
-public class CreateAppiumGuiElementAction extends AbstractFieldAction implements UiElementFinderFactoryProvider, Loggable {
+public class CreateAppiumGuiElementAction extends AbstractFieldAction implements
+        UiElementFinderFactoryProvider,
+        Loggable,
+        AppiumCapabilityHelper {
 
     public CreateAppiumGuiElementAction(Field field, AbstractPage declaringPage) {
         super(field, declaringPage);
@@ -100,9 +104,9 @@ private String getAutomationEngine(WebDriver driver, Platform platform) {
         IWebDriverManager instance = Testerra.getInjector().getInstance(IWebDriverManager.class);
         Optional<WebDriverRequest> optional = instance.getSessionContext(driver).map(SessionContext::getWebDriverRequest);
         if (optional.isPresent()) {
-            String automationEngine = optional.get().getCapabilities().getCapability(MobileCapabilityType.AUTOMATION_NAME).toString();
-            if (StringUtils.isNotBlank(automationEngine)) {
-                return automationEngine;
+            Object automationEngine = optional.get().getCapabilities().getCapability(getAppiumCap(MobileCapabilityType.AUTOMATION_NAME));
+            if (automationEngine != null && StringUtils.isNotBlank(automationEngine.toString())) {
+                return automationEngine.toString();
             } else {
                 // Use default values for automation engine
                 switch (platform) {