diff --git a/utam-core/src/main/java/utam/core/framework/context/MobilePlatformType.java b/utam-core/src/main/java/utam/core/framework/context/MobilePlatformType.java index 95f63bc9..f6dac74a 100644 --- a/utam-core/src/main/java/utam/core/framework/context/MobilePlatformType.java +++ b/utam-core/src/main/java/utam/core/framework/context/MobilePlatformType.java @@ -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) { diff --git a/utam-core/src/test/java/utam/core/MockUtilities.java b/utam-core/src/test/java/utam/core/MockUtilities.java index cb1f6e2b..add3142e 100644 --- a/utam-core/src/test/java/utam/core/MockUtilities.java +++ b/utam-core/src/test/java/utam/core/MockUtilities.java @@ -88,7 +88,7 @@ public MockUtilities(Class 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); @@ -120,12 +120,10 @@ ElementAdapter setElementAdapter(Class driverType) { DriverAdapter setDriverAdapter(Class 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); } diff --git a/utam-core/src/test/java/utam/core/framework/context/MobilePlatformTypeTests.java b/utam-core/src/test/java/utam/core/framework/context/MobilePlatformTypeTests.java index 9ddf10c3..f896bec1 100644 --- a/utam-core/src/test/java/utam/core/framework/context/MobilePlatformTypeTests.java +++ b/utam-core/src/test/java/utam/core/framework/context/MobilePlatformTypeTests.java @@ -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); diff --git a/utam-core/src/test/java/utam/core/selenium/appium/MobileDriverAdapterTests.java b/utam-core/src/test/java/utam/core/selenium/appium/MobileDriverAdapterTests.java index ce82f206..b3b2db78 100644 --- a/utam-core/src/test/java/utam/core/selenium/appium/MobileDriverAdapterTests.java +++ b/utam-core/src/test/java/utam/core/selenium/appium/MobileDriverAdapterTests.java @@ -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"));