Skip to content

Commit

Permalink
fix compilation errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@dipjyotimetia
dipjyotimetia committed May 27, 2024
1 parent 556b295 commit d6cef46
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 40 deletions.
13 changes: 12 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ repositories {
}

allure {
version = "2.21.0"
version = "2.25.0"
}

tasks.register('E2E', Test){
Expand Down Expand Up @@ -110,3 +110,14 @@ javadoc {
}

gradle.startParameter.continueOnFailure = true

// https://github.com/DiUS/java-faker/issues/331#issuecomment-1091166953
configurations.configureEach {
resolutionStrategy.eachDependency { details ->
if (details.requested.module.toString() == 'org.yaml:snakeyaml') {
details.artifactSelection {
it.selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
}
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Tue Apr 14 13:45:26 AEST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
72 changes: 36 additions & 36 deletions src/main/java/com/core/AppiumController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ of this software and associated documentation files (the "Software"), to deal
import com.typesafe.config.ConfigFactory;
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.remote.AndroidMobileCapabilityType;
import io.appium.java_client.remote.IOSMobileCapabilityType;
import io.appium.java_client.ios.options.XCUITestOptions;
import io.appium.java_client.remote.MobileBrowserType;
import io.appium.java_client.remote.MobileCapabilityType;
import io.appium.java_client.service.local.AppiumServiceBuilder;
import lombok.extern.slf4j.Slf4j;
import net.lightbody.bmp.BrowserMobProxy;
Expand All @@ -41,6 +40,7 @@ of this software and associated documentation files (the "Software"), to deal
import net.lightbody.bmp.proxy.CaptureType;
import org.apache.commons.exec.OS;
import org.openqa.selenium.Proxy;
import org.openqa.selenium.remote.CapabilityType;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.openqa.selenium.remote.service.DriverService;
Expand Down Expand Up @@ -101,10 +101,10 @@ private void initDriver(String device, String apps) throws Exception {
case "NEXUS" -> {
log.info("Selected device is NEXUS");
if (apps.equals("Y")) {
_caps.setCapability(MobileCapabilityType.APP, app);
_caps.setCapability(UiAutomator2Options.APP_OPTION, app);
}
_caps.setCapability(MobileCapabilityType.UDID, NEXUS);
_caps.setCapability(MobileCapabilityType.DEVICE_NAME, "NEXUS");
_caps.setCapability(UiAutomator2Options.UDID_OPTION, NEXUS);
_caps.setCapability(UiAutomator2Options.DEVICE_NAME_OPTION, "NEXUS");
_androidCapabilities(_caps);
_createService().start();
log.info("Argument to driver object : " + serverUrl);
Expand All @@ -113,10 +113,10 @@ private void initDriver(String device, String apps) throws Exception {
case "PIXEL" -> {
log.info("Selected device is PIXEL");
if (apps.equals("Y")) {
_caps.setCapability(MobileCapabilityType.APP, app);
_caps.setCapability(UiAutomator2Options.APP_OPTION, app);
}
_caps.setCapability(MobileCapabilityType.UDID, PIXEL);
_caps.setCapability(MobileCapabilityType.DEVICE_NAME, "PIXEL");
_caps.setCapability(UiAutomator2Options.UDID_OPTION, PIXEL);
_caps.setCapability(UiAutomator2Options.DEVICE_NAME_OPTION, "PIXEL");
_androidCapabilities(_caps);
_createService().start();
log.info("Argument to driver object : " + serverUrl);
Expand All @@ -125,7 +125,7 @@ private void initDriver(String device, String apps) throws Exception {
case "samsung" -> {
log.info("Selected device is SAMSUNG");
if (apps.equals("Y")) {
_caps.setCapability(MobileCapabilityType.APP, app);
_caps.setCapability(UiAutomator2Options.APP_OPTION, app);
}
_browserstackCapabilities(_caps, "samsung");
_androidCapabilities(_caps);
Expand All @@ -135,7 +135,7 @@ private void initDriver(String device, String apps) throws Exception {
case "iPhone14" -> {
log.info("Selected device is IPHONE");
if (apps.equals("Y")) {
_caps.setCapability(MobileCapabilityType.APP, app);
_caps.setCapability(XCUITestOptions.APP_OPTION, app);
}
_browserstackCapabilities(_caps, "iPhone14");
_iosCapabilities(_caps);
Expand All @@ -145,19 +145,19 @@ private void initDriver(String device, String apps) throws Exception {
case "IPHONE" -> {
log.info("Selected device is IPHONE");
if (apps.equals("Y")) {
_caps.setCapability(MobileCapabilityType.APP, app);
_caps.setCapability(XCUITestOptions.APP_OPTION, app);
}
_caps.setCapability(MobileCapabilityType.UDID, "iphone");
_caps.setCapability(MobileCapabilityType.DEVICE_NAME, "iphone");
_caps.setCapability(XCUITestOptions.UDID_OPTION, "iphone");
_caps.setCapability(XCUITestOptions.DEVICE_NAME_OPTION, "iphone");
_iosCapabilities(_caps);
_createService().start();
log.info("Argument to driver object : " + serverUrl);
_driver = new IOSDriver(new URL(serverUrl), _caps);
}
case "WEB" -> {
log.info("Selected device is WEB");
_caps.setCapability(MobileCapabilityType.UDID, NEXUS);
_caps.setCapability(MobileCapabilityType.DEVICE_NAME, "NEXUS");
_caps.setCapability(UiAutomator2Options.UDID_OPTION, NEXUS);
_caps.setCapability(UiAutomator2Options.DEVICE_NAME_OPTION, "NEXUS");
_createService().start();
_browserCapabilities(_caps, "chrome");
log.info("Argument to driver object : " + serverUrl);
Expand Down Expand Up @@ -213,13 +213,13 @@ private void _browserstackCapabilities(DesiredCapabilities _caps, String device)
private void _androidCapabilities(DesiredCapabilities _caps) {
_caps.setCapability("platformName", "android");
_caps.setCapability("platformVersion", "13.0");
_caps.setCapability(MobileCapabilityType.NO_RESET, true);
_caps.setCapability(MobileCapabilityType.FULL_RESET, false);
_caps.setCapability(MobileCapabilityType.AUTO_WEBVIEW, false);
_caps.setCapability(AndroidMobileCapabilityType.AUTO_GRANT_PERMISSIONS, true);
_caps.setCapability(AndroidMobileCapabilityType.ANDROID_INSTALL_TIMEOUT, 60);
_caps.setCapability(AndroidMobileCapabilityType.APP_PACKAGE, "com.swaglabsmobileapp");
// _caps.setCapability(AndroidMobileCapabilityType.APP_ACTIVITY, "com.swaglabsmobileapp.MainActivity");
_caps.setCapability(UiAutomator2Options.NO_RESET_OPTION, true);
_caps.setCapability(UiAutomator2Options.FULL_RESET_OPTION, false);
_caps.setCapability(UiAutomator2Options.AUTO_WEB_VIEW_OPTION, false);
_caps.setCapability(UiAutomator2Options.AUTO_GRANT_PERMISSIONS_OPTION, true);
_caps.setCapability(UiAutomator2Options.ANDROID_INSTALL_TIMEOUT_OPTION, 60);
_caps.setCapability(UiAutomator2Options.APP_PACKAGE_OPTION, "com.swaglabsmobileapp");
// _caps.setCapability(UiAutomator2Options.APP_ACTIVITY_OPTION, "com.swaglabsmobileapp.MainActivity");
}

/**
Expand All @@ -230,14 +230,14 @@ private void _androidCapabilities(DesiredCapabilities _caps) {
private void _iosCapabilities(DesiredCapabilities _caps) {
_caps.setCapability("platformName", "ios");
_caps.setCapability("platformVersion", "16");
_caps.setCapability(MobileCapabilityType.FULL_RESET, false);
_caps.setCapability(MobileCapabilityType.NO_RESET, true);
// _caps.setCapability(IOSMobileCapabilityType.XCODE_ORG_ID, "");
// _caps.setCapability(IOSMobileCapabilityType.XCODE_SIGNING_ID, "");
// _caps.setCapability(IOSMobileCapabilityType.UPDATE_WDA_BUNDLEID, "");
_caps.setCapability(IOSMobileCapabilityType.AUTO_DISMISS_ALERTS, true);
_caps.setCapability(IOSMobileCapabilityType.BUNDLE_ID, "com.saucelabs.SwagLabsMobileApp");
_caps.setCapability(IOSMobileCapabilityType.APP_NAME, "com.saucelabs.SwagLabsMobileApp");
_caps.setCapability(XCUITestOptions.FULL_RESET_OPTION, false);
_caps.setCapability(XCUITestOptions.NO_RESET_OPTION, true);
// _caps.setCapability(XCUITestOptions.XCODE_ORG_ID_OPTION, "");
// _caps.setCapability(XCUITestOptions.XCODE_SIGNING_ID_OPTION, "");
// _caps.setCapability(XCUITestOptions.UPDATED_WDA_BUNDLE_ID_OPTION, "");
_caps.setCapability(XCUITestOptions.AUTO_DISMISS_ALERTS_OPTION, true);
_caps.setCapability(XCUITestOptions.BUNDLE_ID_OPTION, "com.saucelabs.SwagLabsMobileApp");
_caps.setCapability(XCUITestOptions.AUTOMATION_NAME_OPTION, "com.saucelabs.SwagLabsMobileApp");
}

/**
Expand All @@ -248,11 +248,11 @@ private void _iosCapabilities(DesiredCapabilities _caps) {
*/
private void _browserCapabilities(DesiredCapabilities _caps, String browser) {
if (browser.contains("chrome")) {
_caps.setCapability(MobileCapabilityType.BROWSER_NAME, MobileBrowserType.CHROME);
_caps.setCapability(MobileCapabilityType.PLATFORM_VERSION, "69");
_caps.setCapability(UiAutomator2Options.BROWSER_NAME_OPTION, MobileBrowserType.CHROME);
_caps.setCapability(UiAutomator2Options.PLATFORM_VERSION_OPTION, "126");
} else {
_caps.setCapability(MobileCapabilityType.BROWSER_NAME, MobileBrowserType.SAFARI);
_caps.setCapability(MobileCapabilityType.PLATFORM_VERSION, "8.1");
_caps.setCapability(XCUITestOptions.BROWSER_NAME_OPTION, MobileBrowserType.SAFARI);
_caps.setCapability(XCUITestOptions.PLATFORM_VERSION_OPTION, "8.1");
}
}

Expand All @@ -268,7 +268,7 @@ private void _performanceCapability(DesiredCapabilities _caps) {
server.enableHarCaptureTypes(CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT);
server.enableHarCaptureTypes(CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS);
Proxy proxy = ClientUtil.createSeleniumProxy(server);
_caps.setCapability(MobileCapabilityType.PROXY, proxy);
_caps.setCapability(CapabilityType.PROXY, proxy);
server.newHar("appiumPerf.har");
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/core/UserActions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ public void windowsAuthentication() {
* @param id locatorId
*/
private void waitForPageToLoad(WebElement id) {
WebDriverWait wait = new WebDriverWait(driver, 35);
WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(25));
wait.until((Function<? super WebDriver, ?>) ExpectedConditions.elementToBeClickable(id));
}

Expand All @@ -1093,7 +1093,7 @@ private void waitForPageToLoad(WebElement id) {
* @param id locatorId
*/
public void waitForElementToDisAppear(String id) {
WebDriverWait wait = new WebDriverWait(driver, 25);
WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(25));
wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id(id)));
}

Expand Down

0 comments on commit d6cef46

Please sign in to comment.