A fully functional Android app built entirely with Kotlin and Jetpack Compose
Move waitAndFind + dumpWindowHierarchy to Utils
Tomáš Mlynarič4fcc867dd445
diff --git a/benchmarks/src/main/java/androidx/test/uiautomator/UiAutomatorHelpers.kt b/benchmarks/src/main/java/androidx/test/uiautomator/UiAutomatorHelpers.ktindex 766de00e1..85867b982 100644--- a/benchmarks/src/main/java/androidx/test/uiautomator/UiAutomatorHelpers.kt+++ b/benchmarks/src/main/java/androidx/test/uiautomator/UiAutomatorHelpers.kt@@ -46,15 +46,3 @@ enum class HasChildrenOp {EXACTLY,AT_MOST,}--/**- * Waits until an object with [selector] if visible on screen and returns the object.- * If the element is not available in [timeout], throws [AssertionError]- */-fun UiDevice.waitAndFindObject(selector: BySelector, timeout: Long): UiObject2 {- if (!wait(Until.hasObject(selector), timeout)) {- throw AssertionError("Element not found on screen in ${timeout}ms (selector=$selector)")- }-- return findObject(selector)-}diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.ktindex 494e451d0..9ece991c4 100644--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt@@ -16,10 +16,13 @@package com.google.samples.apps.nowinandroid+import androidx.test.uiautomator.BySelectorimport androidx.test.uiautomator.Directionimport androidx.test.uiautomator.UiDeviceimport androidx.test.uiautomator.UiObject2+import androidx.test.uiautomator.Untilimport com.google.samples.apps.nowinandroid.benchmarks.BuildConfig+import java.io.ByteArrayOutputStream/*** Convenience parameter to use proper package name with regards to build type and build flavor.@@ -38,3 +41,24 @@ fun UiDevice.flingElementDownUp(element: UiObject2) {waitForIdle()element.fling(Direction.UP)}++/**+ * Waits until an object with [selector] if visible on screen and returns the object.+ * If the element is not available in [timeout], throws [AssertionError]+ */+fun UiDevice.waitAndFindObject(selector: BySelector, timeout: Long): UiObject2 {+ if (!wait(Until.hasObject(selector), timeout)) {+ throw AssertionError("Element not found on screen in ${timeout}ms (selector=$selector)")+ }++ return findObject(selector)+}++/**+ * Helper to dump window hierarchy into a string.+ */+fun UiDevice.dumpWindowHierarchy(): String {+ val buffer = ByteArrayOutputStream()+ dumpWindowHierarchy(buffer)+ return buffer.toString()+}diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.ktindex bb21f3d39..9dea9dc4a 100644--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt@@ -20,8 +20,8 @@ import androidx.benchmark.macro.MacrobenchmarkScopeimport androidx.test.uiautomator.Byimport androidx.test.uiautomator.Untilimport androidx.test.uiautomator.untilHasChildren-import androidx.test.uiautomator.waitAndFindObjectimport com.google.samples.apps.nowinandroid.flingElementDownUp+import com.google.samples.apps.nowinandroid.waitAndFindObjectfun MacrobenchmarkScope.forYouWaitForContent() {// Wait until content is loaded by checking if topics are loaded