From a0371325fb38588ef70c46fe76721e2bca4554b9 Mon Sep 17 00:00:00 2001
From: jredingcvs <97762469+jredingcvs@users.noreply.github.com>
Date: Mon, 9 May 2022 09:19:38 -0500
Subject: [PATCH 1/6] started working on appium update to java client 8.0.0
---
maqs-appium/pom.xml | 16 ++++----
.../maqs/appium/AppiumDriverFactory.java | 39 +++++++++----------
.../maqs/appium/AppiumTestObject.java | 15 ++++---
.../maqs/appium/AppiumUtilities.java | 19 +++++----
.../maqs/appium/BaseAppiumTest.java | 7 ++--
.../maqs/appium/IAppiumTestObject.java | 6 +--
.../maqs/appium/MobileDriverManager.java | 11 +++---
.../maqs/appium/constants/PlatformType.java | 1 -
.../appium/AppiumDriverFactoryUnitTest.java | 19 ++++-----
.../maqs/appium/AppiumTestObjectUnitTest.java | 15 ++++---
.../maqs/appium/AppiumUtilitiesUnitTest.java | 19 +++++----
.../maqs/appium/BaseAppiumTestUnitTest.java | 2 +-
.../appium/MobileDriverManagerUnitTest.java | 14 +++----
pom.xml | 3 +-
14 files changed, 85 insertions(+), 101 deletions(-)
diff --git a/maqs-appium/pom.xml b/maqs-appium/pom.xml
index f67bb63c4..a5e46b1b0 100644
--- a/maqs-appium/pom.xml
+++ b/maqs-appium/pom.xml
@@ -17,7 +17,7 @@
UTF-8
- 7.6.0
+ 8.0.0
@@ -29,12 +29,17 @@
org.seleniumhq.selenium
selenium-api
- ${seleniumAppium.version}
+ ${selenium.version}
org.seleniumhq.selenium
selenium-remote-driver
- ${seleniumAppium.version}
+ ${selenium.version}
+
+
+ org.seleniumhq.selenium
+ selenium-java
+ ${selenium.version}
org.testng
@@ -60,10 +65,5 @@
1.7.32
compile
-
- org.seleniumhq.selenium
- selenium-java
- ${seleniumAppium.version}
-
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
index 015ad909f..564982c73 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
@@ -15,11 +15,9 @@
import java.time.Duration;
import java.util.Map;
import java.util.Optional;
-import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.function.Supplier;
import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.CapabilityType;
import org.openqa.selenium.remote.DesiredCapabilities;
@@ -39,7 +37,7 @@ private AppiumDriverFactory() {
*
* @return the default mobile driver
*/
- public static AppiumDriver getDefaultMobileDriver() {
+ public static AppiumDriver getDefaultMobileDriver() {
return getDefaultMobileDriver(AppiumConfig.getDeviceType());
}
@@ -49,8 +47,8 @@ public static AppiumDriver getDefaultMobileDriver() {
* @param deviceType the device type
* @return the default mobile driver
*/
- public static AppiumDriver getDefaultMobileDriver(PlatformType deviceType) {
- AppiumDriver appiumDriver;
+ public static AppiumDriver getDefaultMobileDriver(PlatformType deviceType) {
+ AppiumDriver appiumDriver;
URL mobileHubUrl = AppiumConfig.getMobileHubUrl();
Duration duration = AppiumConfig.getCommandTimeout();
DesiredCapabilities capabilities = getDefaultMobileOptions();
@@ -71,8 +69,8 @@ public static AppiumDriver getDefaultMobileDriver(PlatformType devic
}
if (deviceType != PlatformType.WINDOWS) {
- appiumDriver.manage().timeouts()
- .implicitlyWait(AppiumConfig.getMobileTimeout().toMillis(), TimeUnit.MILLISECONDS);
+ appiumDriver.manage().timeouts().implicitlyWait(
+ Duration.ofMillis(AppiumConfig.getMobileTimeout().toMillis()));
}
return appiumDriver;
@@ -109,12 +107,12 @@ public static DesiredCapabilities getDefaultMobileOptions(Map ca
* @param timeout the timeout
* @return the android driver
*/
- public static AppiumDriver getAndroidDriver(URL mobileHub, DesiredCapabilities options,
+ public static AppiumDriver getAndroidDriver(URL mobileHub, DesiredCapabilities options,
Duration timeout) {
return createDriver(() -> {
- AppiumDriver driver = new AndroidDriver<>(mobileHub, options);
- driver.manage().timeouts().implicitlyWait(timeout.toMillis(), TimeUnit.MILLISECONDS);
+ AppiumDriver driver = new AndroidDriver(mobileHub, options);
+ driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
return driver;
});
}
@@ -127,10 +125,10 @@ public static AppiumDriver getAndroidDriver(URL mobileHub, DesiredCa
* @param timeout the timeout
* @return the ios driver
*/
- public static AppiumDriver getIosDriver(URL mobileHub, DesiredCapabilities options, Duration timeout) {
+ public static AppiumDriver getIosDriver(URL mobileHub, DesiredCapabilities options, Duration timeout) {
return createDriver(() -> {
- AppiumDriver driver = new IOSDriver<>(mobileHub, options);
- driver.manage().timeouts().implicitlyWait(timeout.toMillis(), TimeUnit.MILLISECONDS);
+ AppiumDriver driver = new IOSDriver(mobileHub, options);
+ driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
return driver;
});
}
@@ -143,11 +141,11 @@ public static AppiumDriver getIosDriver(URL mobileHub, DesiredCapabi
* @param timeout the timeout
* @return the windows driver
*/
- public static AppiumDriver getWindowsDriver(URL mobileHub, DesiredCapabilities options,
+ public static AppiumDriver getWindowsDriver(URL mobileHub, DesiredCapabilities options,
Duration timeout) {
return createDriver(() -> {
- AppiumDriver driver = new WindowsDriver<>(mobileHub, options);
- driver.manage().timeouts().implicitlyWait(timeout.toMillis(), TimeUnit.MILLISECONDS);
+ AppiumDriver driver = new WindowsDriver(mobileHub, options);
+ driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
return driver;
});
@@ -175,9 +173,9 @@ public static DesiredCapabilities mergeCapabilities(DesiredCapabilities capabili
* @param createFunction the create function
* @return the appium driver
*/
- public static AppiumDriver createDriver(
- Supplier> createFunction) {
- AppiumDriver appiumDriver = null;
+ public static AppiumDriver createDriver(
+ Supplier createFunction) {
+ AppiumDriver appiumDriver = null;
try {
appiumDriver = createFunction.get();
@@ -187,8 +185,7 @@ public static AppiumDriver createDriver(
throw e;
} else {
try {
-
- Optional> driverOptional = Optional.ofNullable(appiumDriver);
+ Optional driverOptional = Optional.ofNullable(appiumDriver);
driverOptional.ifPresent(AppiumDriver::quit);
} catch (Exception quitException) {
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumTestObject.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumTestObject.java
index f1fc5fbc2..8f68cada2 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumTestObject.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumTestObject.java
@@ -8,7 +8,6 @@
import com.cognizantsoftvision.maqs.utilities.logging.ILogger;
import io.appium.java_client.AppiumDriver;
import java.util.function.Supplier;
-import org.openqa.selenium.WebElement;
/**
* Class AppiumTestObject.
@@ -22,7 +21,7 @@ public class AppiumTestObject extends BaseTestObject implements IAppiumTestObjec
* @param logger the logger
* @param fullyQualifiedTestName the fully qualified test name
*/
- public AppiumTestObject(AppiumDriver appiumDriver, ILogger logger,
+ public AppiumTestObject(AppiumDriver appiumDriver, ILogger logger,
String fullyQualifiedTestName) {
this(() -> appiumDriver, logger, fullyQualifiedTestName);
}
@@ -34,17 +33,17 @@ public AppiumTestObject(AppiumDriver appiumDriver, ILogger logger,
* @param logger the logger
* @param fullyQualifiedTestName the fully qualified test name
*/
- public AppiumTestObject(Supplier> appiumDriverSupplier, ILogger logger,
+ public AppiumTestObject(Supplier appiumDriverSupplier, ILogger logger,
String fullyQualifiedTestName) {
super(logger, fullyQualifiedTestName);
this.getManagerStore().put(MobileDriverManager.class.getCanonicalName(),
- new MobileDriverManager(appiumDriverSupplier, this));
+ new MobileDriverManager(appiumDriverSupplier.get(), this));
}
/**
* {@inheritDoc}
*/
- public AppiumDriver getAppiumDriver() {
+ public AppiumDriver getAppiumDriver() {
return this.getAppiumManager().getMobileDriver();
}
@@ -59,7 +58,7 @@ public MobileDriverManager getAppiumManager() {
/**
* {@inheritDoc}
*/
- public void setAppiumDriver(AppiumDriver appiumDriver) {
+ public void setAppiumDriver(AppiumDriver appiumDriver) {
this.getManagerStore().put(MobileDriverManager.class.getCanonicalName(),
new MobileDriverManager((() -> appiumDriver), this));
}
@@ -67,8 +66,8 @@ public void setAppiumDriver(AppiumDriver appiumDriver) {
/**
* {@inheritDoc}
*/
- public void setAppiumDriver(Supplier> appiumDriverSupplier) {
+ public void setAppiumDriver(Supplier appiumDriverSupplier) {
this.getManagerStore().put(MobileDriverManager.class.getCanonicalName(),
- new MobileDriverManager(appiumDriverSupplier, this));
+ new MobileDriverManager(appiumDriverSupplier.get(), this));
}
}
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumUtilities.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumUtilities.java
index 49f57d34c..615a8c01c 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumUtilities.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumUtilities.java
@@ -21,7 +21,6 @@
import java.time.format.DateTimeFormatter;
import java.util.Locale;
import org.openqa.selenium.OutputType;
-import org.openqa.selenium.WebElement;
/**
* Appium Utilities class.
@@ -29,7 +28,7 @@
public class AppiumUtilities {
/**
- * Default Date Time Format for appending to files.
+ * Default Date Time Format for appending to the files.
*/
private static final String DEFAULT_DATE_TIME_FORMAT = "uuuu-MM-dd-HH-mm-ss-SSSS";
@@ -50,7 +49,7 @@ private AppiumUtilities() {
* @param testObject The Test Object to associate the screenshot.
* @return True if the image was saved successfully, otherwise false.
*/
- public static boolean captureScreenshot(AppiumDriver appiumDriver,
+ public static boolean captureScreenshot(AppiumDriver appiumDriver,
AppiumTestObject testObject) {
return captureScreenshot(appiumDriver, testObject, "");
}
@@ -63,7 +62,7 @@ public static boolean captureScreenshot(AppiumDriver appiumDriver,
* @param appendName The Name to append
* @return True if the image was saved successfully, otherwise false.
*/
- public static boolean captureScreenshot(AppiumDriver appiumDriver,
+ public static boolean captureScreenshot(AppiumDriver appiumDriver,
AppiumTestObject testObject, String appendName) {
try {
// Check if we are using a file logger. If not, return false.
@@ -97,7 +96,7 @@ public static boolean captureScreenshot(AppiumDriver appiumDriver,
* @param fileNameWithoutExtension File Name Without Extension
* @return Path to Screenshot.
*/
- public static String captureScreenshot(AppiumDriver appiumDriver,
+ public static String captureScreenshot(AppiumDriver appiumDriver,
AppiumTestObject testObject, String directory, String fileNameWithoutExtension) {
File tempFile = appiumDriver.getScreenshotAs(OutputType.FILE);
String path = Paths.get(directory, fileNameWithoutExtension + ".png").normalize().toString();
@@ -133,7 +132,7 @@ public static String captureScreenshot(AppiumDriver appiumDriver,
* @param testObject The Appium Test Object
* @return True if saving page source is successful, otherwise false
*/
- public static boolean savePageSource(AppiumDriver appiumDriver,
+ public static boolean savePageSource(AppiumDriver appiumDriver,
AppiumTestObject testObject) {
return savePageSource(appiumDriver, testObject, "");
}
@@ -146,10 +145,10 @@ public static boolean savePageSource(AppiumDriver appiumDriver,
* @param appendName Appends a name to the end of a filename
* @return True if saving page source is successful, otherwise false
*/
- public static boolean savePageSource(AppiumDriver appiumDriver,
+ public static boolean savePageSource(AppiumDriver appiumDriver,
AppiumTestObject testObject, String appendName) {
try {
- String path = "";
+ String path;
// Check if we are using a file logger.
if (!(testObject.getLogger() instanceof FileLogger)) {
@@ -187,7 +186,7 @@ public static boolean savePageSource(AppiumDriver appiumDriver,
* @param fileNameWithoutExtension File Name Without Extension
* @return Path to the log file
*/
- public static String savePageSource(AppiumDriver appiumDriver,
+ public static String savePageSource(AppiumDriver appiumDriver,
AppiumTestObject testObject, String directory, String fileNameWithoutExtension) {
// Save the current page source into a string
String pageSource = appiumDriver.getPageSource();
@@ -224,7 +223,7 @@ public static String savePageSource(AppiumDriver appiumDriver,
*
* @param appiumDriver The Appium Driver
*/
- public static void killDriver(AppiumDriver appiumDriver) {
+ public static void killDriver(AppiumDriver appiumDriver) {
try {
appiumDriver.close();
} finally {
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTest.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTest.java
index 94a5c6d8b..bb412435b 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTest.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTest.java
@@ -9,7 +9,6 @@
import com.cognizantsoftvision.maqs.utilities.logging.LoggingEnabled;
import com.cognizantsoftvision.maqs.utilities.logging.MessageType;
import io.appium.java_client.AppiumDriver;
-import org.openqa.selenium.WebElement;
import org.testng.ITestResult;
/**
@@ -29,7 +28,7 @@ public BaseAppiumTest() {
*
* @return the appium driver
*/
- public AppiumDriver getAppiumDriver() {
+ public AppiumDriver getAppiumDriver() {
return this.getTestObject().getAppiumDriver();
}
@@ -38,7 +37,7 @@ public AppiumDriver getAppiumDriver() {
*
* @param mobileDriver the mobile driver
*/
- public void setAppiumDriver(AppiumDriver mobileDriver) {
+ public void setAppiumDriver(AppiumDriver mobileDriver) {
this.getTestObject().setAppiumDriver(mobileDriver);
}
@@ -47,7 +46,7 @@ public void setAppiumDriver(AppiumDriver mobileDriver) {
*
* @return the mobile driver
*/
- protected AppiumDriver getMobileDriver() {
+ protected AppiumDriver getMobileDriver() {
return AppiumDriverFactory.getDefaultMobileDriver();
}
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java
index 06a0e6147..dc00596c7 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java
@@ -19,21 +19,21 @@ public interface IAppiumTestObject extends ITestObject {
*
* @return the appium driver
*/
- AppiumDriver getAppiumDriver();
+ AppiumDriver getAppiumDriver();
/**
* Sets appium driver.
*
* @param appiumDriver the appium driver
*/
- void setAppiumDriver(AppiumDriver appiumDriver);
+ void setAppiumDriver(AppiumDriver appiumDriver);
/**
* Sets appium driver.
*
* @param appiumDriverSupplier the appium driver supplier
*/
- void setAppiumDriver(Supplier> appiumDriverSupplier);
+ void setAppiumDriver(Supplier appiumDriverSupplier);
/**
* Gets appium manager.
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/MobileDriverManager.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/MobileDriverManager.java
index b8b4e3110..097349fb5 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/MobileDriverManager.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/MobileDriverManager.java
@@ -10,19 +10,18 @@
import com.cognizantsoftvision.maqs.utilities.logging.MessageType;
import io.appium.java_client.AppiumDriver;
import java.util.function.Supplier;
-import org.openqa.selenium.WebElement;
/**
* Mobile Driver Manager Class.
*/
-public class MobileDriverManager extends DriverManager> {
+public class MobileDriverManager extends DriverManager {
/**
* Instantiates a new Mobile Driver Manager.
*
* @param getDriverFunction Function that specifies how to get the driver.
* @param baseTestObject The Base Test Object.
*/
- public MobileDriverManager(Supplier> getDriverFunction, ITestObject baseTestObject) {
+ public MobileDriverManager(Supplier getDriverFunction, ITestObject baseTestObject) {
super(getDriverFunction, baseTestObject);
}
@@ -32,7 +31,7 @@ public MobileDriverManager(Supplier> getDriverFunction,
* @param driver Appium Driver
* @param baseTestObject The Base Test Object.
*/
- public MobileDriverManager(AppiumDriver driver, ITestObject baseTestObject) {
+ public MobileDriverManager(AppiumDriver driver, ITestObject baseTestObject) {
super(() -> driver, baseTestObject);
this.baseDriver = driver;
}
@@ -42,7 +41,7 @@ public MobileDriverManager(AppiumDriver driver, ITestObject baseTest
*
* @return The Appium Driver
*/
- public AppiumDriver getMobileDriver() {
+ public AppiumDriver getMobileDriver() {
return getBase();
}
@@ -56,7 +55,7 @@ public void close() {
}
try {
- AppiumDriver driver = this.getMobileDriver();
+ AppiumDriver driver = this.getMobileDriver();
driver.quit();
} catch (Exception e) {
this.getLogger().logMessage(MessageType.ERROR,
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/constants/PlatformType.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/constants/PlatformType.java
index 2aa0ef931..e3da56cfd 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/constants/PlatformType.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/constants/PlatformType.java
@@ -22,5 +22,4 @@ public enum PlatformType {
* Windows application.
*/
WINDOWS
-
}
\ No newline at end of file
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
index e42df952e..8400331e0 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
@@ -15,7 +15,6 @@
import java.util.function.Consumer;
import java.util.function.Supplier;
import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -49,7 +48,7 @@ public void setUp() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetDefaultMobileDriver() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
Assert.assertNotNull(defaultMobileDriver, "Checking if default driver is null");
}
@@ -58,7 +57,7 @@ public void testGetDefaultMobileDriver() {
*/
@Test(groups = TestCategories.APPIUM)
public void testTestGetDefaultMobileDriverAndroid() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver(PlatformType.ANDROID);
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver(PlatformType.ANDROID);
Assert.assertNotNull(defaultMobileDriver, "Checking if default driver is null");
}
@@ -106,7 +105,7 @@ public void testGetAndroidDriver() {
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "6.0");
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android GoogleAPI Emulator");
capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
- AppiumDriver androidDriver = AppiumDriverFactory.getAndroidDriver(AppiumConfig.getMobileHubUrl(),
+ AppiumDriver androidDriver = AppiumDriverFactory.getAndroidDriver(AppiumConfig.getMobileHubUrl(),
capabilities, AppiumConfig.getMobileTimeout());
Assert.assertNotNull(androidDriver, "Checking if android driver is null");
}
@@ -122,7 +121,7 @@ public void testGetIOSDriver() {
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "12.2");
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
- AppiumDriver iosDriver = AppiumDriverFactory.getIosDriver(AppiumConfig.getMobileHubUrl(), capabilities,
+ AppiumDriver iosDriver = AppiumDriverFactory.getIosDriver(AppiumConfig.getMobileHubUrl(), capabilities,
AppiumConfig.getMobileTimeout());
Assert.assertNotNull(iosDriver, "Checking if ios driver is null");
}
@@ -136,7 +135,8 @@ public void testGetWindowsDriver() {
DesiredCapabilities appCapabilities = new DesiredCapabilities();
appCapabilities.setCapability("app", "Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
appCapabilities.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
- AppiumDriver windowsDriver = null;
+ AppiumDriver windowsDriver = null;
+
try {
windowsDriver = AppiumDriverFactory.getWindowsDriver(new URL("http://127.0.0.1:4723"), appCapabilities,
AppiumConfig.getMobileTimeout());
@@ -151,18 +151,15 @@ public void testGetWindowsDriver() {
*/
@Test(groups = TestCategories.APPIUM, expectedExceptions = WebDriverException.class)
public void testCreateDriverException() {
- Supplier> appiumDriverSupplier = () -> {
+ Supplier appiumDriverSupplier = () -> {
try {
- AppiumDriver driver = new AppiumDriver(new URL("http://127.0.0.1:4723"),
+ return new AppiumDriver(new URL("http://127.0.0.1:4723"),
new DesiredCapabilities());
- return driver;
} catch (MalformedURLException e) {
e.printStackTrace();
}
return null;
};
-
AppiumDriverFactory.createDriver(appiumDriverSupplier);
}
-
}
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumTestObjectUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumTestObjectUnitTest.java
index 3a0a35e6e..8cc0887aa 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumTestObjectUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumTestObjectUnitTest.java
@@ -7,7 +7,6 @@
import com.cognizantsoftvision.maqs.base.BaseGenericTest;
import com.cognizantsoftvision.maqs.utilities.helper.TestCategories;
import io.appium.java_client.AppiumDriver;
-import org.openqa.selenium.WebElement;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -21,7 +20,7 @@ public class AppiumTestObjectUnitTest extends BaseGenericTest {
*/
@Test(groups = TestCategories.APPIUM)
public void testAppiumTestObjectCreationWithDriver() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
AppiumTestObject appiumTestObject = new AppiumTestObject(defaultMobileDriver, this.getLogger(),
this.getFullyQualifiedTestClassName());
Assert.assertNotNull(appiumTestObject, "Checking that appium test object via driver is not null");
@@ -42,10 +41,10 @@ public void testAppiumTestObjectCreationWithSupplier() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetAppiumDriver() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
try (AppiumTestObject appiumTestObject = new AppiumTestObject(defaultMobileDriver, this.getLogger(),
this.getFullyQualifiedTestClassName())) {
- AppiumDriver appiumDriver = appiumTestObject.getAppiumDriver();
+ AppiumDriver appiumDriver = appiumTestObject.getAppiumDriver();
Assert.assertNotNull(appiumDriver, "Checking that appium driver can be retrieved from test object");
}
}
@@ -55,7 +54,7 @@ public void testGetAppiumDriver() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetAppiumManager() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
try (AppiumTestObject appiumTestObject = new AppiumTestObject(defaultMobileDriver, this.getLogger(),
this.getFullyQualifiedTestClassName())) {
@@ -69,7 +68,7 @@ public void testGetAppiumManager() {
*/
@Test(groups = TestCategories.APPIUM)
public void testSetAppiumDriverWithDriver() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
try (AppiumTestObject appiumTestObject = new AppiumTestObject(defaultMobileDriver, this.getLogger(),
this.getFullyQualifiedTestClassName())) {
int hashCode = appiumTestObject.getAppiumDriver().hashCode();
@@ -83,11 +82,11 @@ public void testSetAppiumDriverWithDriver() {
}
/**
- * Test test set appium driver.
+ * Test setting the appium driver.
*/
@Test(groups = TestCategories.APPIUM)
public void testSetAppiumDriverWithSupplier() {
- AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver defaultMobileDriver = AppiumDriverFactory.getDefaultMobileDriver();
try (AppiumTestObject appiumTestObject = new AppiumTestObject(defaultMobileDriver, this.getLogger(),
this.getFullyQualifiedTestClassName())) {
int hashCode = appiumTestObject.getAppiumDriver().hashCode();
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java
index 902fbe582..55b6c5da2 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java
@@ -16,7 +16,6 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Locale;
-import org.openqa.selenium.WebElement;
import org.testng.Assert;
import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
@@ -31,7 +30,7 @@ public class AppiumUtilitiesUnitTest extends BaseGenericTest {
*/
@Test(groups = TestCategories.APPIUM)
public void testCaptureScreenshotNoAppend() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -50,7 +49,7 @@ public void testCaptureScreenshotNoAppend() {
*/
@Test(groups = TestCategories.APPIUM)
public void testCaptureScreenshotAppend() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -69,7 +68,7 @@ public void testCaptureScreenshotAppend() {
*/
@Test(groups = TestCategories.APPIUM)
public void testCaptureScreenshotConsoleLogger() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
ConsoleLogger consoleLogger = new ConsoleLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, consoleLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -88,7 +87,7 @@ public void testCaptureScreenshotConsoleLogger() {
*/
@Test(groups = TestCategories.APPIUM)
public void testCaptureScreenshotCustomDirectoryFileName() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -112,7 +111,7 @@ public void testCaptureScreenshotCustomDirectoryFileName() {
*/
@Test(groups = TestCategories.APPIUM)
public void testSavePageSourceNoAppend() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -131,7 +130,7 @@ public void testSavePageSourceNoAppend() {
*/
@Test(groups = TestCategories.APPIUM)
public void testSavePageSourceAppend() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -150,7 +149,7 @@ public void testSavePageSourceAppend() {
*/
@Test(groups = TestCategories.APPIUM)
public void testSavePageSourceCustomDirectoryFileName() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -174,7 +173,7 @@ public void testSavePageSourceCustomDirectoryFileName() {
*/
@Test(groups = TestCategories.APPIUM)
public void testSavePageSourceConsoleLogger() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
ConsoleLogger consoleLogger = new ConsoleLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, consoleLogger,
this.getTestObject().getFullyQualifiedTestName());
@@ -193,7 +192,7 @@ public void testSavePageSourceConsoleLogger() {
*/
@Test(groups = TestCategories.APPIUM)
public void testKillDriver() {
- AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
+ AppiumDriver appiumDriver = AppiumDriverFactory.getDefaultMobileDriver();
FileLogger fileLogger = (FileLogger) this.getTestObject().getLogger();
AppiumTestObject testObject = new AppiumTestObject(appiumDriver, fileLogger,
this.getTestObject().getFullyQualifiedTestName());
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTestUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTestUnitTest.java
index 88134b56b..a59921de6 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTestUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/BaseAppiumTestUnitTest.java
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
/**
- * The type Base appium test test.
+ * The Base Appium Test unit test class.
*/
public class BaseAppiumTestUnitTest extends BaseAppiumTest {
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/MobileDriverManagerUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/MobileDriverManagerUnitTest.java
index 5d813a0ea..fc31a15f9 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/MobileDriverManagerUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/MobileDriverManagerUnitTest.java
@@ -7,7 +7,6 @@
import com.cognizantsoftvision.maqs.base.BaseGenericTest;
import io.appium.java_client.AppiumDriver;
import java.util.function.Supplier;
-import org.openqa.selenium.WebElement;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -20,11 +19,11 @@ public class MobileDriverManagerUnitTest extends BaseGenericTest {
*/
@Test
public void testGetMobileDriver() {
- Supplier> supplier = AppiumDriverFactory::getDefaultMobileDriver;
+ Supplier supplier = AppiumDriverFactory::getDefaultMobileDriver;
AppiumTestObject appiumTestObject = new AppiumTestObject(supplier, this.getLogger(),
this.getTestObject().getFullyQualifiedTestName());
- try (MobileDriverManager mobileDriverManager = new MobileDriverManager(supplier, appiumTestObject)) {
+ try (MobileDriverManager mobileDriverManager = new MobileDriverManager(supplier.get(), appiumTestObject)) {
Assert.assertNotNull(mobileDriverManager.getMobileDriver(), "Expected Mobile Driver to not be null.");
}
}
@@ -34,8 +33,8 @@ public void testGetMobileDriver() {
*/
@Test
public void testClose() {
- Supplier> supplier = AppiumDriverFactory::getDefaultMobileDriver;
- MobileDriverManager mobileDriverManager = new MobileDriverManager(supplier, this.getTestObject());
+ Supplier supplier = AppiumDriverFactory::getDefaultMobileDriver;
+ MobileDriverManager mobileDriverManager = new MobileDriverManager(supplier.get(), this.getTestObject());
mobileDriverManager.close();
Assert.assertNull(mobileDriverManager.getBaseDriver(), "Expected Mobile Driver to be null.");
@@ -56,8 +55,8 @@ public void testCloseWithInstantiatedDriver() {
*/
@Test
public void testCloseNullBaseDriver() {
- Supplier> supplier = AppiumDriverFactory::getDefaultMobileDriver;
- MobileDriverManager mobileDriverManager = new MobileDriverManager(supplier, this.getTestObject());
+ Supplier supplier = AppiumDriverFactory::getDefaultMobileDriver;
+ MobileDriverManager mobileDriverManager = new MobileDriverManager(supplier.get(), this.getTestObject());
// Close once to make Base Driver null
mobileDriverManager.close();
@@ -66,6 +65,5 @@ public void testCloseNullBaseDriver() {
mobileDriverManager.close();
Assert.assertNull(mobileDriverManager.getBaseDriver(), "Expected Base Driver to be null.");
-
}
}
diff --git a/pom.xml b/pom.xml
index 775dc619e..b9074e12c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,8 +269,7 @@
0.8.7
7.3.0
4.1.1
-
- 3.141.59
+
3.0.0-M1
8.29
11
From 9d8b92e5fdf8bf1ba3955d8202f8e507b8a31360 Mon Sep 17 00:00:00 2001
From: jredingcvs <97762469+jredingcvs@users.noreply.github.com>
Date: Fri, 13 May 2022 09:50:16 -0500
Subject: [PATCH 2/6] started work on appium 8.0.0 update
---
.../maqs/appium/AppiumDriverFactory.java | 48 ++++++++----
.../appium/AppiumDriverFactoryUnitTest.java | 73 +++++++++++++------
2 files changed, 84 insertions(+), 37 deletions(-)
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
index 564982c73..006a1e9bd 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
@@ -8,7 +8,9 @@
import com.cognizantsoftvision.maqs.utilities.helper.StringProcessor;
import io.appium.java_client.AppiumDriver;
import io.appium.java_client.android.AndroidDriver;
+import io.appium.java_client.android.options.UiAutomator2Options;
import io.appium.java_client.ios.IOSDriver;
+import io.appium.java_client.mac.options.Mac2Options;
import io.appium.java_client.remote.MobileCapabilityType;
import io.appium.java_client.windows.WindowsDriver;
import java.net.URL;
@@ -17,6 +19,8 @@
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier;
+
+import io.appium.java_client.windows.options.WindowsOptions;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.remote.CapabilityType;
import org.openqa.selenium.remote.DesiredCapabilities;
@@ -51,17 +55,16 @@ public static AppiumDriver getDefaultMobileDriver(PlatformType deviceType) {
AppiumDriver appiumDriver;
URL mobileHubUrl = AppiumConfig.getMobileHubUrl();
Duration duration = AppiumConfig.getCommandTimeout();
- DesiredCapabilities capabilities = getDefaultMobileOptions();
switch (deviceType) {
case ANDROID:
- appiumDriver = getAndroidDriver(mobileHubUrl, capabilities, duration);
+ appiumDriver = getAndroidDriver(mobileHubUrl, getDefaultUIAutomator2Options(), duration);
break;
case IOS:
- appiumDriver = getIosDriver(mobileHubUrl, capabilities, duration);
+ appiumDriver = getIosDriver(mobileHubUrl, getDefaultMac2Options(), duration);
break;
case WINDOWS:
- appiumDriver = getWindowsDriver(mobileHubUrl, capabilities, duration);
+ appiumDriver = getWindowsDriver(mobileHubUrl, getDefaultWindowsOptions(), duration);
break;
default:
throw new IllegalStateException(
@@ -99,6 +102,28 @@ public static DesiredCapabilities getDefaultMobileOptions(Map ca
return new DesiredCapabilities(capabilities);
}
+ public static WindowsOptions getDefaultWindowsOptions() {
+ WindowsOptions options = new WindowsOptions();
+ options.setCapability(MobileCapabilityType.DEVICE_NAME, AppiumConfig.getDeviceName());
+ options.setPlatformName(AppiumConfig.getPlatformName());
+ options.setPlatformVersion(AppiumConfig.getPlatformVersion());
+ return options;
+ }
+
+ public static Mac2Options getDefaultMac2Options() {
+ Mac2Options options = new Mac2Options();
+ options.setCapability(MobileCapabilityType.DEVICE_NAME, AppiumConfig.getDeviceName());
+ options.setPlatformName(AppiumConfig.getPlatformName());
+ options.setPlatformVersion(AppiumConfig.getPlatformVersion());
+ return options;
+ }
+
+ public static UiAutomator2Options getDefaultUIAutomator2Options() {
+ UiAutomator2Options options = new UiAutomator2Options();
+ options.setDeviceName(AppiumConfig.getDeviceName());
+ return options;
+ }
+
/**
* Gets android driver.
*
@@ -107,9 +132,7 @@ public static DesiredCapabilities getDefaultMobileOptions(Map ca
* @param timeout the timeout
* @return the android driver
*/
- public static AppiumDriver getAndroidDriver(URL mobileHub, DesiredCapabilities options,
- Duration timeout) {
-
+ public static AppiumDriver getAndroidDriver(URL mobileHub,UiAutomator2Options options, Duration timeout) {
return createDriver(() -> {
AppiumDriver driver = new AndroidDriver(mobileHub, options);
driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
@@ -125,7 +148,7 @@ public static AppiumDriver getAndroidDriver(URL mobileHub, DesiredCapabilities o
* @param timeout the timeout
* @return the ios driver
*/
- public static AppiumDriver getIosDriver(URL mobileHub, DesiredCapabilities options, Duration timeout) {
+ public static AppiumDriver getIosDriver(URL mobileHub, Mac2Options options, Duration timeout) {
return createDriver(() -> {
AppiumDriver driver = new IOSDriver(mobileHub, options);
driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
@@ -141,7 +164,7 @@ public static AppiumDriver getIosDriver(URL mobileHub, DesiredCapabilities optio
* @param timeout the timeout
* @return the windows driver
*/
- public static AppiumDriver getWindowsDriver(URL mobileHub, DesiredCapabilities options,
+ public static AppiumDriver getWindowsDriver(URL mobileHub, WindowsOptions options,
Duration timeout) {
return createDriver(() -> {
AppiumDriver driver = new WindowsDriver(mobileHub, options);
@@ -160,9 +183,7 @@ public static AppiumDriver getWindowsDriver(URL mobileHub, DesiredCapabilities o
*/
public static DesiredCapabilities mergeCapabilities(DesiredCapabilities capabilities,
Map capabilitiesAsObjects) {
-
- Consumer mergeConsumer = (String s) -> capabilities
- .setCapability(s, capabilitiesAsObjects.get(s));
+ Consumer mergeConsumer = (String s) -> capabilities.setCapability(s, capabilitiesAsObjects.get(s));
capabilitiesAsObjects.keySet().iterator().forEachRemaining(mergeConsumer);
return capabilities;
}
@@ -173,8 +194,7 @@ public static DesiredCapabilities mergeCapabilities(DesiredCapabilities capabili
* @param createFunction the create function
* @return the appium driver
*/
- public static AppiumDriver createDriver(
- Supplier createFunction) {
+ public static AppiumDriver createDriver(Supplier createFunction) {
AppiumDriver appiumDriver = null;
try {
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
index 8400331e0..0dd75e5d3 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
@@ -8,7 +8,10 @@
import com.cognizantsoftvision.maqs.base.BaseGenericTest;
import com.cognizantsoftvision.maqs.utilities.helper.TestCategories;
import io.appium.java_client.AppiumDriver;
+import io.appium.java_client.android.options.UiAutomator2Options;
+import io.appium.java_client.mac.options.Mac2Options;
import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.windows.options.WindowsOptions;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
@@ -26,10 +29,7 @@
*/
public class AppiumDriverFactoryUnitTest extends BaseGenericTest {
- /**
- * The Sauce labs config.
- */
- private static DesiredCapabilities sauceLabsConfig;
+ private static Map appiumCapsMaqs;
/**
* Sets up.
@@ -37,7 +37,10 @@ public class AppiumDriverFactoryUnitTest extends BaseGenericTest {
@BeforeClass
public void setUp() {
Map capabilitiesAsObjects = AppiumConfig.getCapabilitiesAsObjects();
- sauceLabsConfig = new DesiredCapabilities();
+ appiumCapsMaqs = capabilitiesAsObjects;
+
+ // The Sauce labs config.
+ DesiredCapabilities sauceLabsConfig = new DesiredCapabilities();
sauceLabsConfig.setCapability("username", capabilitiesAsObjects.get("username"));
sauceLabsConfig.setCapability("accessKey", capabilitiesAsObjects.get("accessKey"));
sauceLabsConfig.setCapability("deviceOrientation", "portrait");
@@ -99,14 +102,24 @@ public void testTestGetDefaultMobileOptions() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetAndroidDriver() {
- DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
- capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Chrome");
- capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "6.0");
- capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android GoogleAPI Emulator");
- capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
+ UiAutomator2Options options = new UiAutomator2Options();
+ options.setPlatformName("Android");
+ options.setPlatformVersion("6.0");
+ options.setDeviceName("Android GoogleAPI Emulator");
+ options.setCapability(MobileCapabilityType.BROWSER_NAME, "Chrome");
+
+ for(Map.Entry entry: appiumCapsMaqs.entrySet()) {
+ options.setCapability(entry.getKey(), entry.getValue());
+ }
+
+// DesiredCapabilities capabilities = new DesiredCapabilities();
+// capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
+// capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Chrome");
+// capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "6.0");
+// capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android GoogleAPI Emulator");
+// capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
AppiumDriver androidDriver = AppiumDriverFactory.getAndroidDriver(AppiumConfig.getMobileHubUrl(),
- capabilities, AppiumConfig.getMobileTimeout());
+ options, AppiumConfig.getMobileTimeout());
Assert.assertNotNull(androidDriver, "Checking if android driver is null");
}
@@ -115,13 +128,23 @@ public void testGetAndroidDriver() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetIOSDriver() {
- DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
- capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
- capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "12.2");
- capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
- capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
- AppiumDriver iosDriver = AppiumDriverFactory.getIosDriver(AppiumConfig.getMobileHubUrl(), capabilities,
+ Mac2Options options = new Mac2Options();
+ options.setPlatformName("iOS");
+ options.setPlatformVersion("12.2");
+ options.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
+ options.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
+
+ for(Map.Entry entry: appiumCapsMaqs.entrySet()) {
+ options.setCapability(entry.getKey(), entry.getValue());
+ }
+
+// DesiredCapabilities capabilities = new DesiredCapabilities();
+// capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+// capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
+// capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "12.2");
+// capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
+// capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
+ AppiumDriver iosDriver = AppiumDriverFactory.getIosDriver(AppiumConfig.getMobileHubUrl(), options,
AppiumConfig.getMobileTimeout());
Assert.assertNotNull(iosDriver, "Checking if ios driver is null");
}
@@ -132,13 +155,17 @@ public void testGetIOSDriver() {
@Test(groups = TestCategories.APPIUM)
@Ignore("Work on Windows implementation")
public void testGetWindowsDriver() {
- DesiredCapabilities appCapabilities = new DesiredCapabilities();
- appCapabilities.setCapability("app", "Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
- appCapabilities.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
+ WindowsOptions options = new WindowsOptions();
+ options.setApp("Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
+ options.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
+
+// DesiredCapabilities appCapabilities = new DesiredCapabilities();
+// appCapabilities.setCapability("app", "Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
+// appCapabilities.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
AppiumDriver windowsDriver = null;
try {
- windowsDriver = AppiumDriverFactory.getWindowsDriver(new URL("http://127.0.0.1:4723"), appCapabilities,
+ windowsDriver = AppiumDriverFactory.getWindowsDriver(new URL("http://127.0.0.1:4723"), options,
AppiumConfig.getMobileTimeout());
} catch (MalformedURLException e) {
e.printStackTrace();
From b019580a62dc0a5979f132793410f8da0360a686 Mon Sep 17 00:00:00 2001
From: jredingcvs <97762469+jredingcvs@users.noreply.github.com>
Date: Tue, 9 Aug 2022 15:00:50 -0500
Subject: [PATCH 3/6] update appium java client version to 8.1.1
---
maqs-appium/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maqs-appium/pom.xml b/maqs-appium/pom.xml
index a5e46b1b0..127e6a358 100644
--- a/maqs-appium/pom.xml
+++ b/maqs-appium/pom.xml
@@ -17,7 +17,7 @@
UTF-8
- 8.0.0
+ 8.1.1
From adfdb293228bab74bc561d70ba560a8a9d650b33 Mon Sep 17 00:00:00 2001
From: jredingcvs <97762469+jredingcvs@users.noreply.github.com>
Date: Mon, 12 Sep 2022 15:25:54 -0500
Subject: [PATCH 4/6] moved slf4j version to main pom some updates to appium
module
---
maqs-appium/pom.xml | 4 ++--
maqs-selenium/pom.xml | 4 ++--
pom.xml | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/maqs-appium/pom.xml b/maqs-appium/pom.xml
index 127e6a358..fdb48b8db 100644
--- a/maqs-appium/pom.xml
+++ b/maqs-appium/pom.xml
@@ -56,13 +56,13 @@
org.slf4j
slf4j-api
- 1.7.32
+ ${slf4j.version}
compile
org.slf4j
slf4j-simple
- 1.7.32
+ ${slf4j.version}
compile
diff --git a/maqs-selenium/pom.xml b/maqs-selenium/pom.xml
index 7e881af9b..a89ada29d 100644
--- a/maqs-selenium/pom.xml
+++ b/maqs-selenium/pom.xml
@@ -86,13 +86,13 @@
org.slf4j
slf4j-api
- 1.7.32
+ ${slf4j.version}
compile
org.slf4j
slf4j-simple
- 1.7.32
+ ${slf4j.version}
compile
diff --git a/pom.xml b/pom.xml
index cd0499ab1..305b71be3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,7 +268,7 @@
9.2.1
0.8.7
7.5
- 4.1.1
+ 4.4.0
3.0.0-M1
8.29
@@ -276,6 +276,7 @@
94.0.4606.41
0.28.0
5.16299
+ 1.7.32
From 695dec15001f84d7754708b2bf025fec604d4789 Mon Sep 17 00:00:00 2001
From: jredingcvs <97762469+jredingcvs@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:19:28 -0500
Subject: [PATCH 5/6] update some things
---
.../cognizantsoftvision/maqs/appium/AppiumDriverFactory.java | 3 +--
.../com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
index 775937ae3..58ee832d8 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
@@ -12,6 +12,7 @@
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.mac.options.Mac2Options;
import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.windows.options.WindowsOptions;
import io.appium.java_client.windows.WindowsDriver;
import java.net.URL;
import java.time.Duration;
@@ -19,8 +20,6 @@
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier;
-
-import io.appium.java_client.windows.options.WindowsOptions;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.remote.CapabilityType;
import org.openqa.selenium.remote.DesiredCapabilities;
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java
index dc00596c7..be815a401 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/IAppiumTestObject.java
@@ -7,7 +7,6 @@
import com.cognizantsoftvision.maqs.base.ITestObject;
import io.appium.java_client.AppiumDriver;
import java.util.function.Supplier;
-import org.openqa.selenium.WebElement;
/**
* The Appium Test Object interface class.
From 2ee55a85e452c285708582a764230b9ca57ebb64 Mon Sep 17 00:00:00 2001
From: jredingcvs <97762469+jredingcvs@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:38:37 -0500
Subject: [PATCH 6/6] update the tests back to capabilities
---
maqs-appium/config.xml | 2 +-
maqs-appium/pom.xml | 2 +-
.../maqs/appium/AppiumConfig.java | 2 +-
.../maqs/appium/AppiumDriverFactory.java | 38 ++--------
.../maqs/appium/AppiumConfigUnitTest.java | 2 +-
.../appium/AppiumDriverFactoryUnitTest.java | 73 ++++++++++---------
.../maqs/appium/AppiumUtilitiesUnitTest.java | 2 -
maqs-playwright/pom.xml | 8 +-
pom.xml | 5 +-
9 files changed, 54 insertions(+), 80 deletions(-)
diff --git a/maqs-appium/config.xml b/maqs-appium/config.xml
index 14607a7d0..d78933809 100644
--- a/maqs-appium/config.xml
+++ b/maqs-appium/config.xml
@@ -42,7 +42,7 @@
http://ondemand.saucelabs.com:80/wd/hub
- 122000
+ 200000
1000
diff --git a/maqs-appium/pom.xml b/maqs-appium/pom.xml
index fdb48b8db..32d103bce 100644
--- a/maqs-appium/pom.xml
+++ b/maqs-appium/pom.xml
@@ -17,7 +17,7 @@
UTF-8
- 8.1.1
+ 8.2.0
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumConfig.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumConfig.java
index 7f1a719c3..581790737 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumConfig.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumConfig.java
@@ -110,7 +110,7 @@ public static URL getMobileHubUrl() {
*/
public static Duration getCommandTimeout() {
String value = Config.getValueForSection(APPIUM_SECTION, "MobileCommandTimeout", "60000");
- int timeoutValue;
+ long timeoutValue;
try {
timeoutValue = Integer.parseInt(value);
} catch (NumberFormatException ex) {
diff --git a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
index 58ee832d8..3dcc63a96 100644
--- a/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
+++ b/maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactory.java
@@ -8,11 +8,8 @@
import com.cognizantsoftvision.maqs.utilities.helper.StringProcessor;
import io.appium.java_client.AppiumDriver;
import io.appium.java_client.android.AndroidDriver;
-import io.appium.java_client.android.options.UiAutomator2Options;
import io.appium.java_client.ios.IOSDriver;
-import io.appium.java_client.mac.options.Mac2Options;
import io.appium.java_client.remote.MobileCapabilityType;
-import io.appium.java_client.windows.options.WindowsOptions;
import io.appium.java_client.windows.WindowsDriver;
import java.net.URL;
import java.time.Duration;
@@ -54,16 +51,17 @@ public static AppiumDriver getDefaultMobileDriver(PlatformType deviceType) {
AppiumDriver appiumDriver;
URL mobileHubUrl = AppiumConfig.getMobileHubUrl();
Duration duration = AppiumConfig.getCommandTimeout();
+ DesiredCapabilities capabilities = getDefaultMobileOptions();
switch (deviceType) {
case ANDROID:
- appiumDriver = getAndroidDriver(mobileHubUrl, getDefaultUIAutomator2Options(), duration);
+ appiumDriver = getAndroidDriver(mobileHubUrl, capabilities, duration);
break;
case IOS:
- appiumDriver = getIosDriver(mobileHubUrl, getDefaultMac2Options(), duration);
+ appiumDriver = getIosDriver(mobileHubUrl, capabilities, duration);
break;
case WINDOWS:
- appiumDriver = getWindowsDriver(mobileHubUrl, getDefaultWindowsOptions(), duration);
+ appiumDriver = getWindowsDriver(mobileHubUrl, capabilities, duration);
break;
default:
throw new IllegalStateException(
@@ -101,28 +99,6 @@ public static DesiredCapabilities getDefaultMobileOptions(Map ca
return new DesiredCapabilities(capabilities);
}
- public static WindowsOptions getDefaultWindowsOptions() {
- WindowsOptions options = new WindowsOptions();
- options.setCapability(MobileCapabilityType.DEVICE_NAME, AppiumConfig.getDeviceName());
- options.setPlatformName(AppiumConfig.getPlatformName());
- options.setPlatformVersion(AppiumConfig.getPlatformVersion());
- return options;
- }
-
- public static Mac2Options getDefaultMac2Options() {
- Mac2Options options = new Mac2Options();
- options.setCapability(MobileCapabilityType.DEVICE_NAME, AppiumConfig.getDeviceName());
- options.setPlatformName(AppiumConfig.getPlatformName());
- options.setPlatformVersion(AppiumConfig.getPlatformVersion());
- return options;
- }
-
- public static UiAutomator2Options getDefaultUIAutomator2Options() {
- UiAutomator2Options options = new UiAutomator2Options();
- options.setDeviceName(AppiumConfig.getDeviceName());
- return options;
- }
-
/**
* Gets android driver.
*
@@ -131,7 +107,7 @@ public static UiAutomator2Options getDefaultUIAutomator2Options() {
* @param timeout the timeout
* @return the android driver
*/
- public static AppiumDriver getAndroidDriver(URL mobileHub,UiAutomator2Options options, Duration timeout) {
+ public static AppiumDriver getAndroidDriver(URL mobileHub, DesiredCapabilities options, Duration timeout) {
return createDriver(() -> {
AppiumDriver driver = new AndroidDriver(mobileHub, options);
driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
@@ -147,7 +123,7 @@ public static AppiumDriver getAndroidDriver(URL mobileHub,UiAutomator2Options op
* @param timeout the timeout
* @return the ios driver
*/
- public static AppiumDriver getIosDriver(URL mobileHub, Mac2Options options, Duration timeout) {
+ public static AppiumDriver getIosDriver(URL mobileHub, DesiredCapabilities options, Duration timeout) {
return createDriver(() -> {
AppiumDriver driver = new IOSDriver(mobileHub, options);
driver.manage().timeouts().implicitlyWait(Duration.ofMillis(timeout.toMillis()));
@@ -163,7 +139,7 @@ public static AppiumDriver getIosDriver(URL mobileHub, Mac2Options options, Dura
* @param timeout the timeout
* @return the Windows driver
*/
- public static AppiumDriver getWindowsDriver(URL mobileHub, WindowsOptions options,
+ public static AppiumDriver getWindowsDriver(URL mobileHub, DesiredCapabilities options,
Duration timeout) {
return createDriver(() -> {
AppiumDriver driver = new WindowsDriver(mobileHub, options);
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumConfigUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumConfigUnitTest.java
index c8e49c132..c314c0400 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumConfigUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumConfigUnitTest.java
@@ -125,7 +125,7 @@ public void testGetSoftAssertScreenShot() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetCommandTimeout() {
- Assert.assertEquals(AppiumConfig.getCommandTimeout().toMillis(), 122000);
+ Assert.assertEquals(AppiumConfig.getCommandTimeout().toMillis(), 200000);
}
/**
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
index fe55a6870..ea00eab8d 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumDriverFactoryUnitTest.java
@@ -9,9 +9,7 @@
import com.cognizantsoftvision.maqs.utilities.helper.TestCategories;
import io.appium.java_client.AppiumDriver;
import io.appium.java_client.android.options.UiAutomator2Options;
-import io.appium.java_client.mac.options.Mac2Options;
import io.appium.java_client.remote.MobileCapabilityType;
-import io.appium.java_client.windows.options.WindowsOptions;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
@@ -31,6 +29,11 @@ public class AppiumDriverFactoryUnitTest extends BaseGenericTest {
private static Map appiumCapsMaqs;
+ /**
+ * The Sauce labs config.
+ */
+ private static DesiredCapabilities sauceLabsConfig;
+
/**
* Sets up.
*/
@@ -109,14 +112,14 @@ public void testGetAndroidDriver() {
options.setCapability(entry.getKey(), entry.getValue());
}
-// DesiredCapabilities capabilities = new DesiredCapabilities();
-// capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
-// capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Chrome");
-// capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "6.0");
-// capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android GoogleAPI Emulator");
-// capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
+ DesiredCapabilities capabilities = new DesiredCapabilities();
+ capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
+ capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Chrome");
+ capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "6.0");
+ capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android GoogleAPI Emulator");
+ capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
AppiumDriver androidDriver = AppiumDriverFactory.getAndroidDriver(AppiumConfig.getMobileHubUrl(),
- options, AppiumConfig.getMobileTimeout());
+ capabilities, AppiumConfig.getMobileTimeout());
Assert.assertNotNull(androidDriver, "Checking if android driver is null");
}
@@ -125,24 +128,24 @@ public void testGetAndroidDriver() {
*/
@Test(groups = TestCategories.APPIUM)
public void testGetIOSDriver() {
- Mac2Options options = new Mac2Options();
- options.setPlatformName("iOS");
- options.setPlatformVersion("12.2");
- options.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
- options.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
-
- for(Map.Entry entry: appiumCapsMaqs.entrySet()) {
- options.setCapability(entry.getKey(), entry.getValue());
- }
-
-// DesiredCapabilities capabilities = new DesiredCapabilities();
-// capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
-// capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
-// capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "12.2");
-// capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
-// capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
- AppiumDriver iosDriver = AppiumDriverFactory.getIosDriver(AppiumConfig.getMobileHubUrl(), options,
- AppiumConfig.getMobileTimeout());
+// Mac2Options options = new Mac2Options();
+// options.setPlatformName("iOS");
+// options.setPlatformVersion("12.2");
+// options.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
+// options.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
+//
+// for(Map.Entry entry: appiumCapsMaqs.entrySet()) {
+// options.setCapability(entry.getKey(), entry.getValue());
+// }
+
+ DesiredCapabilities capabilities = new DesiredCapabilities();
+ capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+ capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
+ capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "12.2");
+ capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone X Simulator");
+ capabilities = AppiumDriverFactory.mergeCapabilities(capabilities, sauceLabsConfig.asMap());
+ AppiumDriver iosDriver = AppiumDriverFactory.getIosDriver(AppiumConfig.getMobileHubUrl(),
+ capabilities, AppiumConfig.getMobileTimeout());
Assert.assertNotNull(iosDriver, "Checking if ios driver is null");
}
@@ -152,18 +155,18 @@ public void testGetIOSDriver() {
@Test(groups = TestCategories.APPIUM)
@Ignore("Work on Windows implementation")
public void testGetWindowsDriver() {
- WindowsOptions options = new WindowsOptions();
- options.setApp("Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
- options.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
+// WindowsOptions options = new WindowsOptions();
+// options.setApp("Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
+// options.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
-// DesiredCapabilities appCapabilities = new DesiredCapabilities();
-// appCapabilities.setCapability("app", "Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
-// appCapabilities.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
+ DesiredCapabilities capabilities = new DesiredCapabilities();
+ capabilities.setCapability("app", "Microsoft.WindowsCalculator_8wekyb3d8bbwe!App");
+ capabilities.setCapability(MobileCapabilityType.UDID, "0C0E26E7-966B-4C89-A765-32C5C997A456");
AppiumDriver windowsDriver = null;
try {
- windowsDriver = AppiumDriverFactory.getWindowsDriver(new URL("http://127.0.0.1:4723"), options,
- AppiumConfig.getMobileTimeout());
+ windowsDriver = AppiumDriverFactory.getWindowsDriver(new URL("http://127.0.0.1:4723"),
+ capabilities, AppiumConfig.getMobileTimeout());
} catch (MalformedURLException e) {
e.printStackTrace();
}
diff --git a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java
index f9747cdb2..f990615db 100644
--- a/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java
+++ b/maqs-appium/src/test/java/com/cognizantsoftvision/maqs/appium/AppiumUtilitiesUnitTest.java
@@ -17,13 +17,11 @@
import java.time.format.DateTimeFormatter;
import java.util.Locale;
import org.testng.Assert;
-import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
/**
* The Appium Utilities unit test class.
*/
-@Ignore
public class AppiumUtilitiesUnitTest extends BaseGenericTest {
/**
diff --git a/maqs-playwright/pom.xml b/maqs-playwright/pom.xml
index 5ec8c6aa8..9dcb566f5 100644
--- a/maqs-playwright/pom.xml
+++ b/maqs-playwright/pom.xml
@@ -20,14 +20,14 @@
-
- com.cognizantsoftvision.maqs.base
- maqs-base
-
com.cognizantsoftvision.maqs.utilities
maqs-utilities
+
+ com.cognizantsoftvision.maqs.base
+ maqs-base
+
org.testng
testng
diff --git a/pom.xml b/pom.xml
index 305b71be3..5838aa675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,14 +268,11 @@
9.2.1
0.8.7
7.5
- 4.4.0
+ 4.5.0
3.0.0-M1
8.29
11
- 94.0.4606.41
- 0.28.0
- 5.16299
1.7.32