diff --git a/CHANGELOG.md b/CHANGELOG.md index 89a3538..836cb54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,12 @@ ## [Unreleased] -#[1.1.4] - 2023-09-25 +# [1.1.5] - 2023-10-09 + +Added: +- `Class' attribute to better understand the view hierarchy + +# [1.1.4] - 2023-09-25 Fixed: - When entering text with an `UiElementIdentifier` with index. Index was not used. @@ -148,9 +153,10 @@ New: Initial release. -[unreleased]: https://github.com/getyourguide/UiTestGlaze/compare/1.1.4...HEAD -[1.1.2]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.4 -[1.1.2]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.3 +[unreleased]: https://github.com/getyourguide/UiTestGlaze/compare/1.1.5...HEAD +[1.1.5]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.5 +[1.1.4]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.4 +[1.1.3]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.3 [1.1.2]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.2 [1.1.1]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.1 [1.1.0]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.1.0 diff --git a/uiTestGlaze/build.gradle b/uiTestGlaze/build.gradle index 7163aa7..ab4d488 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.4' + PUBLISH_VERSION = '1.1.5' PUBLISH_ARTIFACT_ID = 'uitestglaze' } diff --git a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/GetHierarchyHelper.kt b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/GetHierarchyHelper.kt index c1b0050..a7acb90 100644 --- a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/GetHierarchyHelper.kt +++ b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/GetHierarchyHelper.kt @@ -33,6 +33,7 @@ enum class Attribute { BOUNDS, CHECKED, ENABLED, + CLASS, } internal class GetHierarchyHelper(private val logger: Logger) { @@ -139,6 +140,10 @@ internal class GetHierarchyHelper(private val logger: Logger) { attributesBuilder[Attribute.ENABLED] = node.getAttribute("enabled") } + if (node.hasAttribute("class")) { + attributesBuilder[Attribute.CLASS] = node.getAttribute("class") + } + attributesBuilder } else if (node is Element && !isNotSystembar(node)) { return null diff --git a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/InputTextHelper.kt b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/InputTextHelper.kt index 72a5967..29ba28b 100644 --- a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/InputTextHelper.kt +++ b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/InputTextHelper.kt @@ -49,7 +49,7 @@ internal class InputTextHelper( -> { device.findObject( UiSelector().resourceId(foundUiElement.resourceId) - .instance(uiElementIdentifier.index) + .instance(uiElementIdentifier.index), ).text = text } @@ -58,7 +58,7 @@ internal class InputTextHelper( is UiElementIdentifier.TextRegex, -> { device.findObject( - UiSelector().text(foundUiElement.text).instance(uiElementIdentifier.index) + UiSelector().text(foundUiElement.text).instance(uiElementIdentifier.index), ).text = text } } diff --git a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/ScrollHelper.kt b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/ScrollHelper.kt index 64f7d00..ed6511f 100644 --- a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/ScrollHelper.kt +++ b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/ScrollHelper.kt @@ -195,7 +195,6 @@ internal class ScrollHelper( config.waitTillHierarchySettlesTimeout, ) hierarchyAfterScroll = getHierarchyHelper.getHierarchy(device) - } while (hierarchyBeforeScroll == hierarchyAfterScroll && (System.currentTimeMillis() - startTime) < 3.seconds.inWholeMilliseconds )