From 03a15958ec480b76dd1ddc7b43817669de6f9673 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Tue, 25 Jul 2023 23:39:53 +0100 Subject: [PATCH 1/4] Add missing `allowNotifications()` in `BaselineProfileGenerator.kt` Closes #853 --- .../nowinandroid/baselineprofile/BaselineProfileGenerator.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt index b544fbde1..700726a02 100644 --- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt +++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt @@ -18,6 +18,7 @@ package com.google.samples.apps.nowinandroid.baselineprofile import androidx.benchmark.macro.junit4.BaselineProfileRule import com.google.samples.apps.nowinandroid.PACKAGE_NAME +import com.google.samples.apps.nowinandroid.allowNotifications import com.google.samples.apps.nowinandroid.bookmarks.goToBookmarksScreen import com.google.samples.apps.nowinandroid.foryou.forYouScrollFeedDownUp import com.google.samples.apps.nowinandroid.foryou.forYouSelectTopics @@ -43,6 +44,8 @@ class BaselineProfileGenerator { pressHome() startActivityAndWait() + allowNotifications() + // Scroll the feed critical user journey forYouWaitForContent() forYouSelectTopics(true) From 3b29e953bb7e56d3ff9b5a0a84007f063708e726 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Tue, 25 Jul 2023 23:41:29 +0100 Subject: [PATCH 2/4] Update BaselineProfileGenerator.kt --- .../nowinandroid/baselineprofile/BaselineProfileGenerator.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt index 700726a02..7a08bc63c 100644 --- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt +++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt @@ -43,7 +43,6 @@ class BaselineProfileGenerator { pressHome() startActivityAndWait() - allowNotifications() // Scroll the feed critical user journey From 83032cba6e0a88b489d69fc0dc8a494eff653f63 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 27 Jul 2023 18:36:48 +0200 Subject: [PATCH 3/4] Add small delay before fling gesture --- .../samples/apps/nowinandroid/interests/InterestsActions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e94369ce2..d9c563ebc 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 @@ -34,7 +34,7 @@ fun MacrobenchmarkScope.goToInterestsScreen() { } fun MacrobenchmarkScope.interestsScrollTopicsDownUp() { - val topicsList = device.findObject(By.res("interests:topics")) + val topicsList = device.wait(Until.findObject(By.res("interests:topics")), 2_000) device.flingElementDownUp(topicsList) }