add timeout after scrolling

getyourguide · Sep 13, 2023 · 1ac8b55 · 1ac8b55
1 parent a13aa12
commit 1ac8b55
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+# [1.1.2] - 2023-09-13
+
+Changed:
+- Scrolling has a timeout to check if view hierarchy has changed
+
 # [1.1.1] - 2023-09-12
 
 Added:
@@ -132,7 +137,8 @@ New:
 
 Initial release.
 
-[unreleased]: https://github.com/getyourguide/UiTestGlaze/compare/1.1.1...HEAD
+[unreleased]: https://github.com/getyourguide/UiTestGlaze/compare/1.1.2...HEAD
+[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
 [1.0.2]: https://github.com/getyourguide/UiTestGlaze/releases/tag/1.0.2

diff --git a/uiTestGlaze/build.gradle b/uiTestGlaze/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 ext {
     PUBLISH_GROUP_ID = 'io.github.getyourguide'
-    PUBLISH_VERSION = '1.1.1'
+    PUBLISH_VERSION = '1.1.2'
     PUBLISH_ARTIFACT_ID = 'uitestglaze'
 }
 

diff --git a/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/ScrollHelper.kt b/uiTestGlaze/src/main/java/com/getyourguide/uitestglazesample/ScrollHelper.kt
@@ -145,14 +145,21 @@ internal class ScrollHelper(
             while (toFindUiElement == null || toFindUiElement.height == 0) {
                 val hierarchyBeforeScroll = getHierarchyHelper.getHierarchy(device)
                 scrollDirection()
-                hierarchySettleHelper.waitTillHierarchySettles(
-                    emptyList(),
-                    device,
-                    config.waitTillLoadingViewsGoneTimeout,
-                    config.waitTillHierarchySettlesTimeout,
+                val startTime = System.currentTimeMillis()
+                var hierarchyAfterScroll: TreeNode?
+                do {
+                    hierarchySettleHelper.waitTillHierarchySettles(
+                        emptyList(),
+                        device,
+                        config.waitTillLoadingViewsGoneTimeout,
+                        config.waitTillHierarchySettlesTimeout,
+                    )
+                    hierarchyAfterScroll = getHierarchyHelper.getHierarchy(device)
+
+                } while (hierarchyBeforeScroll == hierarchyAfterScroll &&
+                    (System.currentTimeMillis() - startTime) < 3.seconds.inWholeMilliseconds
                 )
-                val hierarchyAfterScroll = getHierarchyHelper.getHierarchy(device)
-                if (hierarchyBeforeScroll == hierarchyAfterScroll) {
+                if (hierarchyBeforeScroll == hierarchyAfterScroll || hierarchyAfterScroll == null) {
                     throw IllegalStateException("Could not find element to scroll to")
                 }
                 toFindUiElement = findUiElementHelper.getUiElement(