From 036c418d5e4d6ef0552855fe5415ba9c96ae4318 Mon Sep 17 00:00:00 2001 From: bianca-stan <110461539+bianca-stan@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:27:16 +0200 Subject: [PATCH] Added optional offset to tap action (#31) * Added optional offset to tap action * Fixed missing comma * Bumped version to 1.1.1 * Fixed parameter type --- uiTestGlaze/build.gradle | 2 +- .../com/getyourguide/uitestglazesample/TapHelper.kt | 10 +++++++--- .../com/getyourguide/uitestglazesample/UiTestGlaze.kt | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/uiTestGlaze/build.gradle b/uiTestGlaze/build.gradle index f7f47e2..50fa021 100644 --- a/uiTestGlaze/build.gradle +++ b/uiTestGlaze/build.gradle @@ -6,7 +6,7 @@ plugins { ext { PUBLISH_GROUP_ID = 'io.github.getyourguide' - PUBLISH_VERSION = '1.1.0' + PUBLISH_VERSION = '1.1.1' PUBLISH_ARTIFACT_ID = 'uitestglaze' } diff --git a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/TapHelper.kt b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/TapHelper.kt index 9ad211c..ad00f8a 100644 --- a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/TapHelper.kt +++ b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/TapHelper.kt @@ -14,6 +14,8 @@ internal class TapHelper( optional: Boolean, retryCount: Int, longPress: Boolean, + offsetX: Int, + offsetY: Int, hierarchy: TreeNode, device: UiDevice, ) { @@ -24,7 +26,7 @@ internal class TapHelper( optional, device, ) ?: return - tapOnTreeNode(foundUiElement, optional, retryCount, longPress, device) + tapOnTreeNode(foundUiElement, optional, retryCount, longPress, offsetX, offsetY, device) } private fun tapOnTreeNode( @@ -32,11 +34,13 @@ internal class TapHelper( optional: Boolean, retryCount: Int, longPress: Boolean, + offsetX: Int, + offsetY: Int, device: UiDevice, ) { tap( - uiElement.x + (uiElement.width) / 2, - uiElement.y + (uiElement.height) / 2, + uiElement.x + (uiElement.width) / 2 + offsetX, + uiElement.y + (uiElement.height) / 2 + offsetY, optional, retryCount, longPress, diff --git a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/UiTestGlaze.kt b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/UiTestGlaze.kt index ec02ffa..58b30bf 100644 --- a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/UiTestGlaze.kt +++ b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/UiTestGlaze.kt @@ -93,6 +93,8 @@ data class UiTestGlaze( optional: Boolean = false, retryCount: Int = 3, longPress: Boolean = false, + offsetX: Int = 0, + offsetY: Int = 0, ) { val hierarchy = hierarchySettleHelper.waitTillHierarchySettles( @@ -101,7 +103,7 @@ data class UiTestGlaze( config.waitTillLoadingViewsGoneTimeout, config.waitTillHierarchySettlesTimeout, ) - tapHelper.tap(uiElementIdentifier, optional, retryCount, longPress, hierarchy, device) + tapHelper.tap(uiElementIdentifier, optional, retryCount, longPress, offsetX, offsetY, hierarchy, device) } /**