Skip to content

fix: Update platform for Android devices #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimevanssfdc merged 1 commit into from
Feb 11, 2025
Merged

fix: Update platform for Android devices #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utam-core/src/main/java/utam/core/framework/context/MobilePlatformType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static MobilePlatformType fromDriver(WebDriver driver) {
return WEB;
}
Platform platform = ((AppiumDriver) driver).getCapabilities().getPlatformName();
if (platform == Platform.LINUX) {
if (platform == Platform.ANDROID) {
return isTablet(driver) ? ANDROID_TABLET : ANDROID_PHONE;
}
if (platform == Platform.IOS) {
Expand Down
8 changes: 3 additions & 5 deletions utam-core/src/test/java/utam/core/MockUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public MockUtilities(Class<? extends WebDriver> driverType) {
utamElement = createInstance(BasePageElement.class, elementAdapter, factory.getDriver());
frameElement = createInstance(FrameElementImpl.class, elementAdapter, factory.getDriver());
if (isMobileMock(driverType)) {
setMobilePlatform(Platform.LINUX);
setMobilePlatform(Platform.ANDROID);
}
TargetLocator targetLocator = mock(TargetLocator.class);
when(webDriverMock.switchTo()).thenReturn(targetLocator);
Expand Down Expand Up @@ -120,12 +120,10 @@ ElementAdapter setElementAdapter(Class<? extends WebDriver> driverType) {

DriverAdapter setDriverAdapter(Class<? extends WebDriver> driverType) {
WebDriver driver = getWebDriverMock();
if (driverType.equals(AppiumDriver.class)) {
setMobilePlatform(Platform.LINUX);
if (driverType.equals(AppiumDriver.class) || driverType.equals(AndroidDriver.class)) {
setMobilePlatform(Platform.ANDROID);
} else if (driverType.equals(IOSDriver.class)) {
setMobilePlatform(Platform.IOS);
} else if (driverType.equals(AndroidDriver.class)) {
setMobilePlatform(Platform.ANDROID);
}
return (DriverAdapter) WebDriverFactory.getAdapterMock(driver);
}
Expand Down
2 changes: 1 addition & 1 deletion utam-core/src/test/java/utam/core/framework/context/MobilePlatformTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void testGetActivePlatform() {
when(driver.getCapabilities()).thenReturn(desiredCaps);
desiredCaps.setCapability(DEVICE_NAME_NAME, DEVICE_NAME_VALUE_IPAD);
assertThat(fromDriver(driver), is(IOS_TABLET));
desiredCaps.setPlatform(Platform.LINUX);
desiredCaps.setPlatform(Platform.ANDROID);
desiredCaps.setCapability(DEVICE_SCREEN_SIZE_NAME, DEVICE_SCREEN_SIZE_VALUE_PHONE);
desiredCaps.setCapability(DEVICE_SCREEN_DENSITY_NAME, DEVICE_SCREEN_DENSITY_VALUE_PHONE);
when(driver.getCapabilities()).thenReturn(desiredCaps);
Expand Down
2 changes: 1 addition & 1 deletion utam-core/src/test/java/utam/core/selenium/appium/MobileDriverAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void testSwitchToWebViewTimeout() {
when(contextSwitcher.getContext()).thenReturn(NATIVE_CONTEXT_HANDLE);
when(driver.getTitle()).thenReturn(DEFAULT_WEBVIEW_TITLE);
when(contextSwitcher.context(testWebViewHandle)).thenReturn(driver);
mock.setMobilePlatform(Platform.LINUX);
mock.setMobilePlatform(Platform.ANDROID);
TimeoutException e =
expectThrows(
TimeoutException.class, () -> provider.setPageContextToWebView("Nonexistent Title"));
Expand Down