Migrate MacrobenchmarkSample to UiAutomator 2.4-alpha05

This commit updates the MacrobenchmarkSample to use UiAutomator 2.4-alpha05, which introduces a breaking change. The `measureBlock` and `setupBlock` in `MacrobenchmarkRule.measureRepeated` no longer have `MacrobenchmarkScope` as a receiver.

The following changes were made to adapt to this:
- Removed `MacrobenchmarkScope` as a receiver from helper functions.
- Updated UI interactions to use new UiAutomator APIs where necessary (e.g., using `textAsString()` for text matching in `TextInputFrameTimingBenchmark` and `StartupBenchmark`).
- Refactored `LoginBenchmark` to separate UI interaction logic (inputting details and clicking login) into distinct functions for clarity and to accommodate the `measureBlock` changes.
- Updated the benchmark library version in `libs.versions.toml`.

Author: AjeshRPai

MacrobenchmarkSample/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 agp = "8.11.1"
 activity = "1.10.1"
 appcompat = "1.7.1"
-benchmark = "1.3.4"
+benchmark = "1.4.0"
 composeBom = "2025.07.00"
 constraintLayout = "2.2.1"
 core = "1.16.0"

MacrobenchmarkSample/macrobenchmark/src/main/kotlin/com/example/macrobenchmark/benchmark/LoginBenchmark.kt

@@ -47,47 +47,59 @@ class LoginBenchmark {
             putString("user", "benchUser")
             putString("password", "benchPassword")
         }
-        benchmarkLoginActivity(extras = extras)
+        benchmarkLoginActivity(
+            extras = extras,
+            measureBlock = {
+                uiAutomator {
+                    clickOnLogin()
+                }
+            }
+        )
     }
 
     @Test
     fun loginInSetupBlock() {
-        benchmarkLoginActivity(setupBlock = {
+        benchmarkLoginActivity(measureBlock = {
             uiAutomator {
-                startIntent(Intent("$packageName.LOGIN_ACTIVITY"))
-                login()
+                inputLoginDetails()
+                clickOnLogin()
             }
         })
     }
 
     @Test
     fun loginWithUiAutomator() {
-        benchmarkLoginActivity {
-            uiAutomator { login() }
-        }
+        benchmarkLoginActivity(
+            measureBlock = {
+                uiAutomator {
+                    inputLoginDetails()
+                    clickOnLogin()
+                }
+            }
+        )
     }
 
     @Test
     fun loginInAfterPermissionsGranted() {
-        benchmarkLoginActivity(setupBlock = {
+        benchmarkLoginActivity(measureBlock = {
             uiAutomator {
                 watchFor(PermissionDialog) {
                     clickAllow()
                 }
-                startIntent(Intent("$packageName.LOGIN_ACTIVITY"))
-                login()
+                inputLoginDetails()
+                clickOnLogin()
             }
-
-
         })
     }
 
-    private fun UiAutomatorTestScope.login() {
+    private fun UiAutomatorTestScope.inputLoginDetails() {
         onElement { viewIdResourceName == "userName" }.text = "user"
         onElement { viewIdResourceName == "password" }.text = "password"
-        onElement { textAsString() == "Login" }.click()
     }
 
+    private fun UiAutomatorTestScope.clickOnLogin() =
+        onElement { textAsString() == "Login" }.click()
+
     private fun benchmarkLoginActivity(
         extras: Bundle = Bundle(),
         setupBlock: MacrobenchmarkScope.() -> Unit = {},
@@ -102,9 +114,11 @@ class LoginBenchmark {
             setupBlock = setupBlock,
         ) {
             uiAutomator {
-                startIntent(Intent()
-                    .putExtras(extras)
-                    .setAction("$packageName.LOGIN_ACTIVITY"))
+                startIntent(
+                    Intent()
+                        .putExtras(extras)
+                        .setAction("$packageName.LOGIN_ACTIVITY")
+                )
             }
             measureBlock()
         }

MacrobenchmarkSample/macrobenchmark/src/main/kotlin/com/example/macrobenchmark/benchmark/frames/NestedRecyclerFrameTimingBenchmarks.kt

@@ -18,7 +18,6 @@ package com.example.macrobenchmark.benchmark.frames
 
 import androidx.benchmark.macro.ExperimentalMetricApi
 import androidx.benchmark.macro.FrameTimingMetric
-import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -62,15 +61,15 @@ class NestedRecyclerFrameTimingBenchmarks {
         ) { measureScrollingNestedRecycler() }
     }
 
-    private fun MacrobenchmarkScope.navigateToNestedRvScreen(useRecyclerViewPool: Boolean) {
+    private fun navigateToNestedRvScreen(useRecyclerViewPool: Boolean) {
         uiAutomator {
             startApp(TARGET_PACKAGE)
             onElement { textAsString() == if (useRecyclerViewPool) "Nested RecyclerView with Pools" else "Nested RecyclerView" }.click()
             waitForStableInActiveWindow()
         }
     }
 
-    private fun MacrobenchmarkScope.measureScrollingNestedRecycler() {
+    private fun measureScrollingNestedRecycler() {
         uiAutomator {
             onElement { className == "androidx.recyclerview.widget.RecyclerView" }.run {
                 repeat(3) { index ->

MacrobenchmarkSample/macrobenchmark/src/main/kotlin/com/example/macrobenchmark/benchmark/frames/TextInputFrameTimingBenchmark.kt

@@ -23,6 +23,7 @@ import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import androidx.test.uiautomator.textAsString
 import androidx.test.uiautomator.uiAutomator
 import com.example.macrobenchmark.benchmark.util.DEFAULT_ITERATIONS
 import com.example.macrobenchmark.benchmark.util.TARGET_PACKAGE
@@ -37,7 +38,7 @@ class TextInputFrameTimingBenchmark {
     val benchmarkRule = MacrobenchmarkRule()
 
     @Test
-    fun inputText() {
+    fun reinputText() {
         benchmarkRule.measureRepeated(
             packageName = TARGET_PACKAGE,
             metrics = listOf(FrameTimingMetric()),
@@ -54,7 +55,7 @@ class TextInputFrameTimingBenchmark {
             }
         ) {
             uiAutomator {
-                onElement { isEditable }.text = "Benchmark input"
+                onElement { textAsString() == "Enter text here" }.text = "Benchmark input"
             }
         }
     }

MacrobenchmarkSample/macrobenchmark/src/main/kotlin/com/example/macrobenchmark/benchmark/startup/StartupBenchmark.kt

@@ -22,6 +22,7 @@ import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.uiautomator.textAsString
 import androidx.test.uiautomator.uiAutomator
 import com.example.macrobenchmark.benchmark.util.DEFAULT_ITERATIONS
 import com.example.macrobenchmark.benchmark.util.TARGET_PACKAGE
@@ -89,6 +90,7 @@ abstract class AbstractStartupBenchmark(private val startupMode: StartupMode) {
     ) {
         uiAutomator {
             startApp(TARGET_PACKAGE)
+            onElement { textAsString() == "Fully Drawn" && isVisibleToUser }
         }
     }
 }