Selenium 4 and Appium 2 Upgrade

agent-launcher/dependency-reduced-pom.xml

@@ -57,7 +57,7 @@
     </plugins>
   </build>
   <properties>
-    <lombok.version>1.18.10</lombok.version>
+    <lombok.version>1.18.22</lombok.version>
     <systemtray.version>3.17</systemtray.version>
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

agent-launcher/pom.xml

@@ -13,7 +13,7 @@
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
     <commons.lang.version>3.4</commons.lang.version>
     <systemtray.version>3.17</systemtray.version>
-    <lombok.version>1.18.10</lombok.version>
+    <lombok.version>1.18.22</lombok.version>
     <httpcomponents.version>4.5.13</httpcomponents.version>
   </properties>
 

agent/pom.xml

@@ -20,7 +20,9 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
-    <lombok.version>1.18.20</lombok.version>
+    <selenium.version>4.8.2</selenium.version>
+    <guava.version>31.1-jre</guava.version>
+    <lombok.version>1.18.22</lombok.version>
     <mapstruct.version>1.4.2.Final</mapstruct.version>
     <aws.version>1.11.46</aws.version>
     <android.tools.version>25.3.0</android.tools.version>
@@ -139,6 +141,12 @@
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
       <version>${android.tools.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

agent/src/main/java/com/testsigma/agent/TestsigmaAgent.java

@@ -24,6 +24,7 @@
 @Log4j2
 public class TestsigmaAgent {
   public static void main(String[] args) {
+    System.setProperty("webdriver.http.factory", "jdk-http-client");
     String wrapperPort = System.getProperty("agent.wrapper.port");
     if (StringUtils.isNotBlank(wrapperPort)) {
       WrapperConnector.getInstance().disconnectHook();

agent/src/main/java/com/testsigma/agent/mobile/MobileAutomationServer.java

@@ -12,6 +12,9 @@
 
 import com.testsigma.agent.utils.NetworkUtil;
 import com.testsigma.agent.utils.PathUtil;
+import io.appium.java_client.service.local.AppiumDriverLocalService;
+import io.appium.java_client.service.local.AppiumServiceBuilder;
+import io.appium.java_client.service.local.flags.GeneralServerFlag;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.SystemUtils;
@@ -29,6 +32,8 @@ public class MobileAutomationServer {
   private Process mobileAutomationServerProcess;
   private File androidHome;
   private File jreHome;
+
+  private File appiumHome;
   private File mobileAutomationServerExecutablePath;
   private File logFilePath;
   private String serverIpAddress;
@@ -46,6 +51,10 @@ private File jreHome() {
     return new File(PathUtil.getInstance().getJrePath());
   }
 
+  private File appiumHome(){
+    return new File(PathUtil.getInstance().getMobileAutomationDriverPath());
+  }
+
   private String serverIP() {
     String address = "127.0.0.1";
     try {
@@ -64,14 +73,15 @@ public void start() {
       }
       this.androidHome = androidHome();
       this.jreHome = jreHome();
+      this.appiumHome = appiumHome();
       this.mobileAutomationServerExecutablePath = new File(PathUtil.getInstance().getMobileAutomationServerPath(), "appium");
       if (SystemUtils.IS_OS_WINDOWS) {
         this.mobileAutomationServerExecutablePath = new File(PathUtil.getInstance().getMobileAutomationServerPath(), "appium.exe");
       }
       this.serverIpAddress = serverIP();
       this.logFilePath = new File(PathUtil.getInstance().getLogsPath() + File.separator + "appium.log");
       Integer serverPort = NetworkUtil.getFreePort();
-      this.serverURL = String.format("http://%s:%d/wd/hub", serverIpAddress, serverPort);
+      this.serverURL = String.format("http://%s:%d", serverIpAddress, serverPort);
 
       log.info("Starting Mobile Automation Server at - " + serverURL);
 
@@ -87,6 +97,7 @@ public void start() {
               "--log-timestamp",
               "--allow-insecure", "chromedriver_autodownload");
           processBuilder.directory(new File(PathUtil.getInstance().getMobileAutomationServerPath()));
+          processBuilder.environment().put("APPIUM_HOME", appiumHome.getAbsolutePath());
           processBuilder.environment().put("ANDROID_HOME", androidHome.getAbsolutePath());
           processBuilder.environment().put("JAVA_HOME", jreHome.getAbsolutePath());
           processBuilder.redirectErrorStream(true);

agent/src/main/java/com/testsigma/agent/mobile/android/AndroidMobileAutomationServer.java

@@ -27,8 +27,8 @@ public class AndroidMobileAutomationServer {
   private final DeviceContainer deviceContainer;
   private final CommandExecutor commandExecutor;
 
-  private final String UI_AUTOMATOR2_SERVER_TEST_APK = "appium-uiautomator2-server-test.apk";
-  private final String UI_AUTOMATOR2_SERVER_APK = "appium-uiautomator2-server.apk";
+  private final String UI_AUTOMATOR2_SERVER_TEST_APK = "appium-uiautomator2-server-debug-androidTest.apk";
+  private final String UI_AUTOMATOR2_SERVER_APK = "appium-uiautomator2-server-v5.8.2.apk";
   private final String APPIUM_SETTINGS_APK = "settings_apk-debug.apk";
   private final String UI_AUTOMATOR2_PACKAGE = "io.appium.uiautomator2.server";
   private final String UI_AUTOMATOR2_TEST_PACKAGE = "io.appium.uiautomator2.server.test";
@@ -38,7 +38,6 @@ public void installDrivers(String uniqueId) throws MobileLibraryInstallException
     try {
       MobileDevice mobileDevice = deviceContainer.getDevice(uniqueId);
       IDevice device = mobileDevice.getIDevice();
-
       this.installAppiumSettings(device);
       this.startAppiumSettings(device);
       this.installUIAutomatorServer(device);

agent/src/main/java/com/testsigma/agent/mobile/ios/IosMobileAutomationServer.java

@@ -15,6 +15,7 @@
 import com.testsigma.agent.mobile.MobileAutomationServerService;
 import com.testsigma.agent.mobile.DeviceContainer;
 import com.testsigma.agent.mobile.MobileDevice;
+import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.ios.IOSDriver;
 import io.appium.java_client.remote.MobileCapabilityType;
 import lombok.RequiredArgsConstructor;
@@ -58,7 +59,7 @@ public void createSession(String uniqueId) throws MobileAutomationServerSessionE
       desiredCapabilities.setCapability("xcodeOrgId", "6F4CKCA4LX");
       desiredCapabilities.setCapability("xcodeSigningId", "iPhone Developer");
       desiredCapabilities.setCapability("app", "/Users/vikram/ios-apps/ios-test-app/build/Release-iphoneos/TestApp-iphoneos.app");
-      device.setRemoteWebDriver(new IOSDriver<>(new URL(mobileAutomationServerService.getMobileAutomationServer().getServerURL()),
+      device.setRemoteWebDriver(new IOSDriver(new URL(mobileAutomationServerService.getMobileAutomationServer().getServerURL()),
         desiredCapabilities));
     } catch (Exception e) {
       throw new MobileAutomationServerSessionException(e.getMessage());

agent/src/main/java/com/testsigma/agent/utils/PathUtil.java

@@ -38,6 +38,9 @@ public class PathUtil {
   private String iosPath = null;
   @Getter
   private String mobileAutomationServerPath = null;
+
+  @Getter
+  private String mobileAutomationDriverPath = null;
   @Getter
   private String upgradePath = null;
   @Getter
@@ -79,6 +82,7 @@ public void setPathsFromContext(boolean reset) {
     driversPath = rootPath + File.separator + "drivers";
     jrePath = rootPath + File.separator + "jre";
     mobileAutomationServerPath = rootPath + File.separator + "appium";
+    mobileAutomationDriverPath = mobileAutomationServerPath + "/drivers";
     androidPath = rootPath + File.separator + "android";
     iosPath = rootPath + File.separator + "ios";
 

agent/src/main/resources/agent.properties

@@ -9,4 +9,4 @@
 cloud.url=${CLOUD_URL:https://local.testsigmaos.com}
 local.server.url=${LOCAL_SERVER_URL:http://localhost:9090}
 local.agent.register=${LOCAL_AGENT_REGISTER:true}
-agent.version=2.9.1
+agent.version=2.9.2

automator/pom.xml

@@ -16,8 +16,8 @@
     <skyscreamer.version>1.5.0</skyscreamer.version>
     <jsonpath.version>2.2.0</jsonpath.version>
     <gson.version>2.8.5</gson.version>
-    <appium.version>7.0.0</appium.version>
-    <selenium.version>3.141.59</selenium.version>
+    <selenium.version>4.8.2</selenium.version>
+    <appium.version>8.3.0</appium.version>
     <jetty-io.version>9.4.12.v20180830</jetty-io.version>
     <commons.collections.version>4.4</commons.collections.version>
     <org.everit.json.schema>1.5.1</org.everit.json.schema>
@@ -83,6 +83,12 @@
 
     </dependency>
 
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-http-jdk-client</artifactId>
+      <version>${selenium.version}</version>
+    </dependency>
+
     <!-- Spring 3 dependencies -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -139,6 +145,12 @@
       <groupId>org.everit.json</groupId>
       <artifactId>org.everit.json.schema</artifactId>
       <version>${org.everit.json.schema}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -284,7 +296,7 @@
     <dependency>
       <groupId>com.testsigma</groupId>
       <artifactId>testsigma-java-sdk</artifactId>
-      <version>1.0.0.rc1</version>
+      <version>1.2.0_beta_1</version>
     </dependency>
 
     <dependency>
@@ -298,6 +310,12 @@
       <artifactId>log4j-api</artifactId>
       <version>2.17.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>5.3.20</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>

automator/src/com/testsigma/automator/actions/Action.java

@@ -26,6 +26,7 @@
 import org.openqa.selenium.*;
 import org.openqa.selenium.remote.UnreachableBrowserException;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,7 +36,7 @@ public abstract class Action {
   private static final int MESSAGE_MAX_SIZE = 500;
   protected Exception exception;
   protected Object actualValue;
-  protected Long timeout = 30L;
+  protected Duration timeout = Duration.ofSeconds(30);
   protected ErrorCodes errorCode = ErrorCodes.GENERIC_ERROR;
   protected Long globalElementTimeOut;
   protected Map<String, TestDataPropertiesEntity> testDataPropertiesEntityMap;

automator/src/com/testsigma/automator/actions/AddonAction.java

@@ -389,7 +389,7 @@ private void handleStaleElementExceptionType(Exception e) {
   }
 
   private void handleInvalidStateExceptionType(Exception e) {
-    if (e instanceof ElementNotVisibleException) {
+    if (e instanceof ElementNotInteractableException) {
       String errorMessage;
       if (getElementSearchCriteria()) {
         errorMessage = String.format("Element may be present but not visible in current page. Please verify if the " +
@@ -406,17 +406,6 @@ private void handleInvalidStateExceptionType(Exception e) {
         "If the element is not in view, please try executing step <b>\"Scroll to the element ELEMENT into view\"</b></b>";
       setErrorMessage(errorMessage);
       setErrorCode(ErrorCodes.ELEMENT_CLICK_INTERCEPTED_EXCEPTION);
-    } else if (e instanceof ElementNotSelectableException) {
-      String errorMessage;
-      if (getElementSearchCriteria()) {
-        errorMessage = String.format("Element is present but it is not selectable. Please check if the select element " +
-            "corresponding to locator <b>\"%s:%s\"</b> is enabled and interactable.",
-          elementPropertiesEntity.getFindByType(), elementPropertiesEntity.getLocatorValue());
-      } else {
-        errorMessage = "Element is present but it is not selectable. Please verify if the select element for given criteria is enabled and selectable.";
-      }
-      setErrorMessage(errorMessage);
-      setErrorCode(ErrorCodes.ELEMENT_NOT_SELECTABLE_EXCEPTION);
     } else {
       String errorMessage = "Cannot perform any action on the element. Though element may be present, it is in a non-interactive state.";
       setErrorMessage(errorMessage);

automator/src/com/testsigma/automator/actions/CustomExpectedConditions.java

@@ -7,6 +7,7 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Set;
 
@@ -204,7 +205,7 @@ final static public void explictWait(WebDriver driver, By by, Integer wait) {
       return;
     }
     if (by != null) {
-      (new WebDriverWait(driver, wait)).until(ExpectedConditions.presenceOfElementLocated(by));
+      (new WebDriverWait(driver, Duration.ofSeconds(wait))).until(ExpectedConditions.presenceOfElementLocated(by));
     }
   }
 }

automator/src/com/testsigma/automator/actions/DriverAction.java

@@ -15,6 +15,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 @Log4j2
@@ -49,19 +50,20 @@ protected void afterExecute() throws AutomatorException {
 
   private void setImplicitTimeout() {
     if (getGlobalElementTimeOut() != null && !getTimeout().equals(getGlobalElementTimeOut())) {
-      log.info("Updating implicit timeout to step level timeout:" + getTimeout());
+      log.info("Updating implicit timeout to step level timeout:" + getTimeout().getSeconds());
       setDriverImplicitTimeout(getTimeout());
     }
   }
 
-  protected void setDriverImplicitTimeout(long timeInSeconds) {
-    getDriver().manage().timeouts().implicitlyWait(timeInSeconds, TimeUnit.SECONDS);
+  protected void setDriverImplicitTimeout(Duration timeInSeconds) {
+    getDriver().manage().timeouts().implicitlyWait(timeInSeconds);
   }
 
   private void resetImplicitTimeout() {
-    if (getGlobalElementTimeOut() != null && getTimeout() != getGlobalElementTimeOut()) {
+    if (getGlobalElementTimeOut() != null && getTimeout().getSeconds() != getGlobalElementTimeOut()) {
       log.info("Resetting implicit timeout to Test plan level timeout:" + getGlobalElementTimeOut());
-      setDriverImplicitTimeout(getGlobalElementTimeOut());
+      setDriverImplicitTimeout(Duration.ofSeconds(getGlobalElementTimeOut()));
     }
   }
+
 }

automator/src/com/testsigma/automator/actions/ElementAction.java

@@ -26,6 +26,7 @@
 import org.openqa.selenium.support.ui.UnexpectedTagNameException;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +63,7 @@ protected void findElement(String elementActionVariableName) throws Exception {
     log.info("Finding an element for Action variable: " + elementActionVariableName);
     setElementSearchCriteria(elementActionVariableName);
     log.info(String.format("Finding element with criteria: %s, Explicit timeout as: %s", elementSearchCriteria, getTimeout()));
-    CustomExpectedConditions.explictWait(getDriver(), elementSearchCriteria.getBy(), getTimeout().intValue());
+    CustomExpectedConditions.explictWait(getDriver(), elementSearchCriteria.getBy(), (int)getTimeout().getSeconds());
     elements = getDriver().findElements(elementSearchCriteria.getBy());
     log.info("No of elements found: " + elements.size());
     if (!elements.isEmpty()) {
@@ -267,13 +268,13 @@ private void handleStaleElementExceptionType(Exception e) {
   }
 
   private void handleInvalidStateExceptionType(Exception e) {
-    if (e instanceof ElementNotVisibleException) {
+    if (e instanceof ElementNotInteractableException) {
       String errorMessage;
       if (elementSearchCriteria != null) {
-        errorMessage = String.format("Element may be present but not visible in current page. Please verify if the " +
+        errorMessage = String.format("Element may be present but not interactable in current page. Please verify if the " +
           "element <b>\"%s:%s\"</b> is pointing to a displayed element.", elementSearchCriteria.getFindByType(), elementSearchCriteria.getByValue());
       } else {
-        errorMessage = "Element may be present but not visible in current page. Please verify the given element criteria is pointing to a displayed/visible element.";
+        errorMessage = "Element may be present but not interactable in current page. Please verify the given element criteria is pointing to a displayed/visible element.";
       }
       setErrorMessage(errorMessage);
       setErrorCode(ErrorCodes.ELEMENT_NOT_VISIBLE);
@@ -283,16 +284,6 @@ private void handleInvalidStateExceptionType(Exception e) {
         "If the element is not in view, please try executing step <b>\"Scroll to the element ELEMENT into view\"</b></b>";
       setErrorMessage(errorMessage);
       setErrorCode(ErrorCodes.ELEMENT_CLICK_INTERCEPTED_EXCEPTION);
-    } else if (e instanceof ElementNotSelectableException) {
-      String errorMessage;
-      if (elementSearchCriteria != null) {
-        errorMessage = String.format("Element is present but it is not selectable. Please check if the select element " +
-          "corresponding to locator <b>\"%s:%s\"</b> is enabled and interactable.", elementSearchCriteria.getFindByType(), elementSearchCriteria.getByValue());
-      } else {
-        errorMessage = "Element is present but it is not selectable. Please verify if the select element for given criteria is enabled and selectable.";
-      }
-      setErrorMessage(errorMessage);
-      setErrorCode(ErrorCodes.ELEMENT_NOT_SELECTABLE_EXCEPTION);
     } else {
       String errorMessage = "Cannot perform any action on the element. Though element may be present, it is in a non-interactive state.";
       setErrorMessage(errorMessage);

automator/src/com/testsigma/automator/actions/mobile/ClearElementAction.java

@@ -22,7 +22,7 @@ public class ClearElementAction extends MobileElementAction {
   public void execute() throws Exception {
     AppiumDriver driver = getDriver();
     findElement();
-    if (driver.getContextHandles().size() > 1) {
+    if (getContextHandles().size() > 1) {
       tapByElementCoOrdinates(getElement(), driver);
     }
     getElement().clear();

automator/src/com/testsigma/automator/actions/mobile/FindElementByIndexAndClearAction.java

@@ -31,11 +31,11 @@ public void execute() throws Exception {
     AppiumDriver driver = getDriver();
     List<WebElement> webElements = new ArrayList<WebElement>();
     if (getWebViewName() != null && !getWebViewName().equals("null")) {
-      driver.context(getWebViewName());
+      context(getWebViewName());
       webElements = driver.findElements(getElementSearchCriteria().getBy());
       webElements.get(getIndex()).clear();
-      driver.context("NATIVE_APP");
-    } else if (driver.getContextHandles().size() > 1) {
+      context("NATIVE_APP");
+    } else if (getContextHandles().size() > 1) {
       webElements = driver.findElements(getElementSearchCriteria().getBy());
       tapByElementCoOrdinates(webElements.get(getIndex()), driver);
       webElements.get(getIndex()).clear();