From 37f958270e6f458e1fb3bef8b595b8afb5b4c242 Mon Sep 17 00:00:00 2001 From: mlykotom Date: Tue, 6 Dec 2022 13:49:52 +0100 Subject: [PATCH] Fix wait for bookmarks to show Change-Id: Ia4dfb1eea89a6b211b80789ae6f4548a0c23121e --- .../samples/apps/nowinandroid/bookmarks/BookmarksActions.kt | 1 + .../samples/apps/nowinandroid/interests/InterestsActions.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt index 83ad48398..3dce5b313 100644 --- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt +++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt @@ -25,6 +25,7 @@ fun MacrobenchmarkScope.goToBookmarksScreen() { device.findObject(By.text("Saved")).click() device.waitForIdle() // Wait until saved title are shown on screen + device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000) val topAppBar = device.findObject(By.res("niaTopAppBar")) topAppBar.wait(Until.hasObject(By.text("Saved")), 2_000) } diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt index e595ae4e4..e94369ce2 100644 --- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt +++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt @@ -25,8 +25,10 @@ fun MacrobenchmarkScope.goToInterestsScreen() { device.findObject(By.text("Interests")).click() device.waitForIdle() // Wait until interests are shown on screen + device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000) val topAppBar = device.findObject(By.res("niaTopAppBar")) topAppBar.wait(Until.hasObject(By.text("Interests")), 2_000) + // Wait until content is loaded by checking if interests are loaded device.wait(Until.gone(By.res("loadingWheel")), 5_000) }