update to latest java client (AppiumTestDistribution#985)

SrinivasanTarget · saikrishna321 · web-flow · commit 20e37e259ef0 · 2022-11-01T21:32:12.000+05:30
* updates w.r.t latest java client * switch to appium2 * Revert "switch to appium2" This reverts commit 8255593. * make checkstyle happy * bump node version in CI * install appium2 * install windows driver * remove windows ci run * fix simulator version for test * fix platform condition * remove ios logs * extend ADB timeout Co-authored-by: saikrishna321 <saikrishna321@yahoo.com>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -6,12 +6,12 @@
 jobs:
   - job: CheckStyle
     pool:
-      vmImage: "macos-10.15"
+      vmImage: "macos-latest"
 
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "12.18.1"
+          versionSpec: "17.5.0"
 
       - script: |
           mvn clean install -Dmaven.test.skip=true -Dgpg.skip
@@ -20,21 +20,23 @@ jobs:
 
   - job: Distribute
     pool:
-      vmImage: "macos-10.15"
+      vmImage: "macos-latest"
 
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "12.18.1"
+          versionSpec: "17.5.0"
       - script: |
           brew outdated xctool || brew upgrade xctool
           xcrun simctl list
         displayName: "iOS Sim Versions"
 
       - script: |
           node -v
-          npm install -g appium
+          npm install -g appium@next
           appium -v
+          appium driver install uiautomator2
+          appium driver install xcuitest
         displayName: "Install Appium"
 
       - bash: |
@@ -63,20 +65,22 @@ jobs:
 
   - job: Parallel
     pool:
-      vmImage: "macos-10.15"
+      vmImage: "macos-latest"
 
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "12.18.1"
+          versionSpec: "17.5.0"
       - script: |
           brew outdated xctool || brew upgrade xctool
           xcrun simctl list
         displayName: "iOS Sim Versions"
 
       - script: |
           node -v
-          npm install -g appium
+          npm install -g appium@next
+          appium driver install uiautomator2
+          appium driver install xcuitest
           appium -v
         displayName: "Install Appium"
 
@@ -106,12 +110,12 @@ jobs:
 
   - job: SauceLabs
     pool:
-      vmImage: "macos-10.15"
+      vmImage: "macos-latest"
 
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "12.18.1"
+          versionSpec: "17.5.0"
 
       - script: |
           Platform='both' CLOUD_USER=$(user_sauce) CLOUD_KEY=$(pass_sauce) CONFIG_FILE='./configs/sauce_config.properties' mvn clean -Dtest=Runner test -Dcheckstyle.skip
@@ -120,59 +124,61 @@ jobs:
 
   - job: SauceLabs_iOS
     pool:
-      vmImage: "macos-10.15"
+      vmImage: "macos-latest"
 
     steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "12.18.1"
+          versionSpec: "17.5.0"
 
       - script: |
           Platform='iOS' CLOUD_USER=$(user_sauce) CLOUD_KEY=$(pass_sauce) CONFIG_FILE='./configs/sauce_config.properties' mvn clean -Dtest=Runner test -Dcheckstyle.skip
 
         displayName: "Run Test on Sauce on iOS and Android"
 
-  - job: Windows
-    pool:
-      vmImage: "windows-latest"
-
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: "12.18.1"
-
-      - script: |
-          node -v
-          npm install -g appium
-          appium -v
-        displayName: "Install Appium"
-
-      - script: |
-          mvn clean -Dtest=WindowsRunner test -Dcheckstyle.skip -DPlatform="windows"
-    displayName: "Run windows app"
-
-  - job: Windows_Cucumber
-    pool:
-      vmImage: "windows-latest"
-
-    variables:
-      - name: CONFIG_FILE
-        value: "./configs/windowsCucumberConfig.properties"
-
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: "12.18.1"
-
-      - script: |
-          node -v
-          npm install -g appium
-          appium -v
-        displayName: "Install Appium"
-
-      - script: |
-          mvn clean -Dtest=WindowsRunCukes test -Dcheckstyle.skip
-    displayName: "Run windows app - Cucumber"
+#  - job: Windows
+#    pool:
+#      vmImage: "windows-latest"
+#
+#    steps:
+#      - task: NodeTool@0
+#        inputs:
+#          versionSpec: "17.5.0"
+#
+#      - script: |
+#          node -v
+#          npm install -g appium@next
+#          appium -v
+#          appium driver install windows
+#        displayName: "Install Appium"
+#
+#      - script: |
+#          mvn clean -Dtest=WindowsRunner test -Dcheckstyle.skip -DPlatform="windows"
+#    displayName: "Run windows app"
+#
+#  - job: Windows_Cucumber
+#    pool:
+#      vmImage: "windows-latest"
+#
+#    variables:
+#      - name: CONFIG_FILE
+#        value: "./configs/windowsCucumberConfig.properties"
+#
+#    steps:
+#      - task: NodeTool@0
+#        inputs:
+#          versionSpec: "17.5.0"
+#
+#      - script: |
+#          node -v
+#          npm install -g appium@next
+#          appium -v
+#          appium driver install windows
+#        displayName: "Install Appium"
+#
+#      - script: |
+#          mvn clean -Dtest=WindowsRunCukes test -Dcheckstyle.skip
+#    displayName: "Run windows app - Cucumber"
 
 #  - job: Genymotion
 #    pool:
diff --git a/caps/browserstack.json b/caps/browserstack.json
@@ -4,7 +4,7 @@
     "project": "ATD",
     "app": {
       "local": "https://github.com/shridharkalagi/AppiumSample/raw/master/VodQA.apk",
-      "cloud": "bs://9fc49eb030bbf201001e71bc7b283ce2ba1db4a7"
+      "cloud": "bs://b82b336385049a9aab8ae3f994ee01e7645282ac"
     },
     "noSign": true
   },
diff --git a/caps/capabilities.json b/caps/capabilities.json
@@ -4,7 +4,7 @@
     "platformVersion": "7.0",
     "automationName": "UiAutomator2",
     "uiautomator2ServerInstallTimeout": 50000,
-    "adbExecTimeout": 60000,
+    "adbExecTimeout": 120000,
     "app": {
       "local": "https://github.com/shridharkalagi/AppiumSample/raw/master/VodQA.apk"
     },
@@ -25,20 +25,19 @@
     "simpleIsVisibleCheck": true,
     "wdaStartupRetries": 10,
     "wdaStartupRetryInterval": 100,
-    "maxTypingFrequency": 10,
-    "showIOSLog":true
+    "maxTypingFrequency": 10
   },
   "hostMachines": [
     {
       "machineIP": "127.0.0.1",
       "simulators": [
         {
           "deviceName": "iPhone 11",
-          "OS": "14.0"
+          "OS": "15.2"
         },
         {
           "deviceName": "iPhone 8",
-          "OS": "14.0"
+          "OS": "15.2"
         }
       ]
     }
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
-            <version>7.4.1</version>
+            <version>8.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.epam.reportportal</groupId>
@@ -172,7 +172,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.16</version>
+            <version>1.18.20</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/appium/device/HostMachineDeviceManager.java b/src/main/java/com/appium/device/HostMachineDeviceManager.java
@@ -155,6 +155,7 @@ private void bootIOSSimulators(String ip,
                                    JSONObject hostMachineJson,
                                    List<Device> devices) {
         if ((platform.equalsIgnoreCase("iOS")
+                || platform.equalsIgnoreCase("both")
                 && capabilities.isSimulatorAppPresentInCapsJson()
                 && hostMachineJson.has("simulators"))
                 && !capabilities.getCapabilityObjectFromKey("iOS")
diff --git a/src/main/java/com/appium/manager/AppiumDriverManager.java b/src/main/java/com/appium/manager/AppiumDriverManager.java
@@ -4,7 +4,6 @@
 import com.appium.entities.MobilePlatform;
 import com.appium.utils.CommandPrompt;
 import io.appium.java_client.AppiumDriver;
-import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.ios.IOSDriver;
 import io.appium.java_client.windows.WindowsDriver;
@@ -41,7 +40,7 @@ protected static void setDriver(AppiumDriver driver) {
     }
 
 
-    private AppiumDriver<MobileElement> initialiseDriver(DesiredCapabilities desiredCapabilities)
+    private AppiumDriver initialiseDriver(DesiredCapabilities desiredCapabilities)
             throws Exception {
         LOGGER.info("Initialise Driver with Capabilities: ");
         desiredCapabilities.getCapabilityNames().forEach(
@@ -74,7 +73,7 @@ private AppiumDriver createAppiumDriver(DesiredCapabilities desiredCapabilities,
         LOGGER.info("Session Created for "
                 + AppiumDeviceManager.getMobilePlatform().name()
                 + "\n\tSession Id: " + currentDriverSession.getSessionId()
-                + "\n\tUDID: " + currentDriverSession.getSessionDetail("udid"));
+                + "\n\tUDID: " + currentDriverSession.getCapabilities().getCapability("udid"));
         return currentDriverSession;
     }
 
@@ -87,24 +86,24 @@ private String getRemoteWDHubIP() throws Exception {
     }
 
 
-    private AppiumDriver<MobileElement> startAppiumDriverInstance(
+    private AppiumDriver startAppiumDriverInstance(
             Optional<DesiredCapabilities> desiredCapabilities)
         throws Exception {
         LOGGER.info("startAppiumDriverInstance");
-        AppiumDriver<MobileElement> currentDriverSession =
+        AppiumDriver currentDriverSession =
                 initialiseDriver(desiredCapabilities.get());
         AppiumDriverManager.setDriver(currentDriverSession);
         return currentDriverSession;
     }
 
     // Should be used by Cucumber as well
-    public AppiumDriver<MobileElement> startAppiumDriverInstance(String testMethodName)
+    public AppiumDriver startAppiumDriverInstance(String testMethodName)
             throws Exception {
         return startAppiumDriverInstance(testMethodName, CAPS.get());
     }
 
     // Should be used by Cucumber as well
-    public AppiumDriver<MobileElement> startAppiumDriverInstance(String testMethodName,
+    public AppiumDriver startAppiumDriverInstance(String testMethodName,
                                                                  String capabilityFilePath)
             throws Exception {
         LOGGER.info(String.format("startAppiumDriverInstance for %s using capability file: %s",
@@ -145,7 +144,7 @@ public void stopAppiumDriver() throws Exception {
             && AppiumDriverManager.getDriver().getSessionId() != null) {
             LOGGER.info("Session Deleting ---- "
                 + AppiumDriverManager.getDriver().getSessionId() + "---"
-                + AppiumDriverManager.getDriver().getSessionDetail("udid"));
+                + AppiumDriverManager.getDriver().getCapabilities().getCapability("udid"));
             AppiumDriverManager.getDriver().quit();
         }
     }
diff --git a/src/main/java/com/appium/manager/AppiumParallelMethodTestListener.java b/src/main/java/com/appium/manager/AppiumParallelMethodTestListener.java
@@ -99,8 +99,9 @@ public void beforeInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestRes
             currentMethods.set(iInvokedMethod.getTestMethod());
             SkipIf annotation = iInvokedMethod.getTestMethod().getConstructorOrMethod().getMethod()
                 .getAnnotation(SkipIf.class);
-            if (annotation != null && AppiumDriverManager.getDriver().getPlatformName()
-                .equalsIgnoreCase(annotation.platform())) {
+            if (annotation != null && AppiumDriverManager.getDriver().getCapabilities()
+                    .getCapability("platformName")
+                    .toString().equalsIgnoreCase(annotation.platform())) {
                 if (atdHost.isPresent() && atdPort.isPresent()) {
                     HashMap<String, String> logs = new HashMap<>();
                     String url = "http://" + atdHost.get() + ":" + atdPort.get() + "/testresults";
diff --git a/src/main/java/com/appium/manager/AppiumParallelTestListener.java b/src/main/java/com/appium/manager/AppiumParallelTestListener.java
@@ -64,8 +64,9 @@ public void beforeInvocation(IInvokedMethod iInvokedMethod, ITestResult testResu
         currentMethods.set(iInvokedMethod.getTestMethod());
         SkipIf annotation = iInvokedMethod.getTestMethod().getConstructorOrMethod().getMethod()
             .getAnnotation(SkipIf.class);
-        if (annotation != null && AppiumDriverManager.getDriver().getPlatformName()
-            .equalsIgnoreCase(annotation.platform())) {
+        if (annotation != null && AppiumDriverManager.getDriver().getCapabilities()
+                .getCapability("platformName")
+                .toString().equalsIgnoreCase(annotation.platform())) {
             throw new SkipException("Skipped because property was set to :::"
                 + annotation.platform());
         }
diff --git a/src/main/java/com/appium/manager/TestLogger.java b/src/main/java/com/appium/manager/TestLogger.java
@@ -54,7 +54,7 @@ protected void startLogging(ITestResult iTestResult)
         if (isNativeAndroid()) {
             String udid = AppiumDeviceManager.getAppiumDevice().getDevice().getUdid();
             List<LogEntry> logcat = AppiumDriverManager.getDriver().manage()
-                    .logs().get("logcat").filter(Level.ALL);
+                    .logs().get("logcat").getAll();
             logEntries.set(logcat);
             logFile = new File(System.getProperty("user.dir") + FileLocations.ADB_LOGS_DIRECTORY
                     + udid + "__" + methodName + ".txt");
diff --git a/src/main/java/com/appium/utils/Api.java b/src/main/java/com/appium/utils/Api.java
@@ -48,7 +48,7 @@ public String uploadMultiPartFile(File filePath, String hostMachine) throws Exce
         MediaType MEDIA_TYPE_PNG = MediaType.parse("multipart/form-data");
         RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM)
             .addFormDataPart("uploaded_file", filePath.getName(),
-                RequestBody.create(MEDIA_TYPE_PNG, filePath))
+                RequestBody.create(filePath, MEDIA_TYPE_PNG))
             .build();
         Request request = new Request.Builder().url("http://" + hostMachine
             + ":" + getRemoteAppiumManagerPort(hostMachine) + "/artifacts/upload")
diff --git a/src/main/java/com/cucumber/listener/CucumberScenarioReporterListener.java b/src/main/java/com/cucumber/listener/CucumberScenarioReporterListener.java
@@ -14,7 +14,6 @@
 import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
 import com.video.recorder.XpathXML;
 import io.appium.java_client.AppiumDriver;
-import io.appium.java_client.MobileElement;
 import io.cucumber.core.gherkin.Step;
 import org.apache.log4j.Logger;
 import rp.com.google.common.base.Suppliers;
@@ -36,7 +35,7 @@ public class CucumberScenarioReporterListener extends ScenarioReporter {
     public AppiumDriverManager appiumDriverManager;
     public DeviceSingleton deviceSingleton;
     public LinkedList<Step> testSteps;
-    public AppiumDriver<MobileElement> appium_driver;
+    public AppiumDriver appium_driver;
     private AndroidDeviceConfiguration androidDevice;
     private IOSDeviceConfiguration iosDevice;
     public String deviceModel;
diff --git a/src/test/java/MyStepdefs.java b/src/test/java/MyStepdefs.java
@@ -1,3 +1,4 @@
+import io.appium.java_client.AppiumBy;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
@@ -15,7 +16,7 @@ public class MyStepdefs {
     @When("I click on {int} number")
     public void iClickOnNumber(int arg0) {
         LOGGER.info("I click on {int} number : " + arg0);
-        edit = (RemoteWebElement) getDriver().findElementByClassName("Edit");
+        edit = (RemoteWebElement) getDriver().findElement(AppiumBy.className("Edit"));
     }
 
     @Given("I accept the tip screen")
diff --git a/src/test/java/com/test/cucumber/SampleSteps.java b/src/test/java/com/test/cucumber/SampleSteps.java
diff --git a/src/test/java/com/test/site/AtdServiceTest.java b/src/test/java/com/test/site/AtdServiceTest.java
diff --git a/src/test/java/com/test/site/DragnDropTest.java b/src/test/java/com/test/site/DragnDropTest.java
diff --git a/src/test/java/com/test/site/SliderTest.java b/src/test/java/com/test/site/SliderTest.java
diff --git a/src/test/java/com/test/site/UserBaseTest.java b/src/test/java/com/test/site/UserBaseTest.java
diff --git a/src/test/java/com/test/site/WindowsTest.java b/src/test/java/com/test/site/WindowsTest.java

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"platformVersion": "7.0",`
`5`	`5`	`"automationName": "UiAutomator2",`
`6`	`6`	`"uiautomator2ServerInstallTimeout": 50000,`
`7`		`- "adbExecTimeout": 60000,`
	`7`	`+ "adbExecTimeout": 120000,`
`8`	`8`	`"app": {`
`9`	`9`	`"local": "https://github.com/shridharkalagi/AppiumSample/raw/master/VodQA.apk"`
`10`	`10`	`},`
`@@ -25,20 +25,19 @@`
`25`	`25`	`"simpleIsVisibleCheck": true,`
`26`	`26`	`"wdaStartupRetries": 10,`
`27`	`27`	`"wdaStartupRetryInterval": 100,`
`28`		`- "maxTypingFrequency": 10,`
`29`		`- "showIOSLog":true`
	`28`	`+ "maxTypingFrequency": 10`
`30`	`29`	`},`
`31`	`30`	`"hostMachines": [`
`32`	`31`	`{`
`33`	`32`	`"machineIP": "127.0.0.1",`
`34`	`33`	`"simulators": [`
`35`	`34`	`{`
`36`	`35`	`"deviceName": "iPhone 11",`
`37`		`- "OS": "14.0"`
	`36`	`+ "OS": "15.2"`
`38`	`37`	`},`
`39`	`38`	`{`
`40`	`39`	`"deviceName": "iPhone 8",`
`41`		`- "OS": "14.0"`
	`40`	`+ "OS": "15.2"`
`42`	`41`	`}`
`43`	`42`	`]`
`44`	`43`	`}`