A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fixing ScrollForYouFeedBenchmark
Alejandra Stamato49c8ce700e6c
diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/GeneralActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/GeneralActions.ktnew file mode 100644index 000000000..48472e523--- /dev/null+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/GeneralActions.kt@@ -0,0 +1,44 @@+/*+ * Copyright 2023 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package com.google.samples.apps.nowinandroid++import android.Manifest.permission+import android.os.Build.VERSION.SDK_INT+import android.os.Build.VERSION_CODES.TIRAMISU+import androidx.benchmark.macro.MacrobenchmarkScope++/**+ * Because the app under test is different from the one running the instrumentation test,+ * the permission has to be granted manually by either:+ *+ * - tapping the Allow button+ * ```kotlin+ * val obj = By.text("Allow")+ * val dialog = device.wait(Until.findObject(obj), TIMEOUT)+ * dialog?.let {+ * it.click()+ * device.wait(Until.gone(obj), 5_000)+ * }+ * ```+ * - or (preferred) executing the grant command on the target package.+ */+fun MacrobenchmarkScope.allowNotifications() {+ if (SDK_INT >= TIRAMISU) {+ val command = "pm grant $packageName ${permission.POST_NOTIFICATIONS}"+ device.executeShellCommand(command)+ }+}diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.ktindex f8945a31c..3008fdc0d 100644--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt@@ -22,6 +22,7 @@ import androidx.benchmark.macro.StartupModeimport androidx.benchmark.macro.junit4.MacrobenchmarkRuleimport androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunnerimport com.google.samples.apps.nowinandroid.PACKAGE_NAME+import com.google.samples.apps.nowinandroid.allowNotificationsimport org.junit.Ruleimport org.junit.Testimport org.junit.runner.RunWith@@ -47,6 +48,7 @@ class ScrollForYouFeedBenchmark {// Start the apppressHome()startActivityAndWait()+ allowNotifications()},) {forYouWaitForContent()diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.ktindex 24bd233ea..0030386b7 100644--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt@@ -23,6 +23,7 @@ import androidx.benchmark.macro.junit4.MacrobenchmarkRuleimport androidx.test.ext.junit.runners.AndroidJUnit4import androidx.test.uiautomator.Byimport com.google.samples.apps.nowinandroid.PACKAGE_NAME+import com.google.samples.apps.nowinandroid.allowNotificationsimport org.junit.Ruleimport org.junit.Testimport org.junit.runner.RunWith@@ -47,7 +48,7 @@ class TopicsScreenRecompositionBenchmark {// Start the apppressHome()startActivityAndWait()-+ allowNotifications()// Navigate to interests screendevice.findObject(By.text("Interests")).click()device.waitForIdle()