From bbfedb0d4ae494836ec66d0dc7d60a48a6a6f297 Mon Sep 17 00:00:00 2001
From: lihenggui <lihenggui@users.noreply.github.com>
Date: Mon, 13 Mar 2023 15:03:04 -0700
Subject: [PATCH] Fix errors during the benchmark

Change-Id: I9b78f5e4caea39aab026c1f0d7bfa56ddb4a9784
---
 .run/Generate Market Baseline Profile.run.xml               | 2 +-
 .../main/java/com/merxury/blocker/applist/AppListActions.kt | 4 ++--
 .../src/main/java/com/merxury/blocker/rules/RulesAction.kt  | 6 +++---
 .../blocker/core/designsystem/component/LoadingWheel.kt     | 4 +++-
 .../blocker/feature/generalrules/GeneralRuleScreen.kt       | 5 ++++-
 .../java/com/merxury/blocker/feature/search/SearchScreen.kt | 2 ++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.run/Generate Market Baseline Profile.run.xml b/.run/Generate Market Baseline Profile.run.xml
index 4fb766777e..0af2d63833 100644
--- a/.run/Generate Market Baseline Profile.run.xml	
+++ b/.run/Generate Market Baseline Profile.run.xml	
@@ -35,7 +35,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":benchmark:pixel6Api31atdMarketBenchmarkAndroidTest" />
+          <option value=":benchmark:pixel6Api31aospMarketBenchmarkAndroidTest" />
           <option value="--rerun" />
           <option value="--enable-display" />
         </list>
diff --git a/benchmarks/src/main/java/com/merxury/blocker/applist/AppListActions.kt b/benchmarks/src/main/java/com/merxury/blocker/applist/AppListActions.kt
index c13d220405..11669b2dc9 100644
--- a/benchmarks/src/main/java/com/merxury/blocker/applist/AppListActions.kt
+++ b/benchmarks/src/main/java/com/merxury/blocker/applist/AppListActions.kt
@@ -34,6 +34,6 @@ fun MacrobenchmarkScope.appListWaitForContent() {
 }
 
 fun MacrobenchmarkScope.appListScrollDownUp() {
-    val feedList = device.findObject(By.res("appList:applicationList"))
-    device.flingElementDownUp(feedList)
+    val list = device.findObject(By.res("appList:applicationList"))
+    device.flingElementDownUp(list)
 }
diff --git a/benchmarks/src/main/java/com/merxury/blocker/rules/RulesAction.kt b/benchmarks/src/main/java/com/merxury/blocker/rules/RulesAction.kt
index 796bd919d5..a5ffc170e9 100644
--- a/benchmarks/src/main/java/com/merxury/blocker/rules/RulesAction.kt
+++ b/benchmarks/src/main/java/com/merxury/blocker/rules/RulesAction.kt
@@ -26,9 +26,9 @@ fun MacrobenchmarkScope.goToRulesScreen() {
     device.findObject(By.text("Rules")).click()
     device.waitForIdle()
     // Wait until saved title are shown on screen
-    device.wait(Until.hasObject(By.res("blockerTopAppBar")), 2_000)
-    val topAppBar = device.findObject(By.res("blockerTopAppBar"))
-    topAppBar.wait(Until.hasObject(By.text("Rules")), 2_000)
+    // Timeout here is quite big, because sometimes data loading takes a long time
+    device.wait(Until.hasObject(By.res("blockerTopAppBar")), 60_000)
+    device.wait(Until.hasObject(By.res("rule:list")), 60_000)
 }
 
 fun MacrobenchmarkScope.rulesScrollListDownUp() {
diff --git a/core/designsystem/src/main/java/com/merxury/blocker/core/designsystem/component/LoadingWheel.kt b/core/designsystem/src/main/java/com/merxury/blocker/core/designsystem/component/LoadingWheel.kt
index df44302957..c0121fcc8c 100644
--- a/core/designsystem/src/main/java/com/merxury/blocker/core/designsystem/component/LoadingWheel.kt
+++ b/core/designsystem/src/main/java/com/merxury/blocker/core/designsystem/component/LoadingWheel.kt
@@ -43,6 +43,7 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawscope.rotate
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
@@ -108,7 +109,8 @@ fun BlockerLoadingWheel(
             .size(48.dp)
             .padding(8.dp)
             .graphicsLayer { rotationZ = rotationAnim }
-            .semantics { contentDescription = contentDesc },
+            .semantics { contentDescription = contentDesc }
+            .testTag("loadingWheel"),
     ) {
         repeat(NUM_OF_LINES) { index ->
             rotate(degrees = index * 30f) {
diff --git a/feature/generalrule/src/main/java/com/merxury/blocker/feature/generalrules/GeneralRuleScreen.kt b/feature/generalrule/src/main/java/com/merxury/blocker/feature/generalrules/GeneralRuleScreen.kt
index b91899c09e..819ec410d9 100644
--- a/feature/generalrule/src/main/java/com/merxury/blocker/feature/generalrules/GeneralRuleScreen.kt
+++ b/feature/generalrule/src/main/java/com/merxury/blocker/feature/generalrules/GeneralRuleScreen.kt
@@ -81,7 +81,10 @@ fun GeneralRulesScreen(
 ) {
     Scaffold(
         topBar = {
-            BlockerTopAppBar(title = stringResource(id = R.string.rules))
+            BlockerTopAppBar(
+                title = stringResource(id = R.string.rules),
+                modifier = Modifier.testTag("blockerTopAppBar"),
+            )
         },
     ) { padding ->
         Column(
diff --git a/feature/search/src/main/java/com/merxury/blocker/feature/search/SearchScreen.kt b/feature/search/src/main/java/com/merxury/blocker/feature/search/SearchScreen.kt
index 4bf637f580..4fc7bf114d 100644
--- a/feature/search/src/main/java/com/merxury/blocker/feature/search/SearchScreen.kt
+++ b/feature/search/src/main/java/com/merxury/blocker/feature/search/SearchScreen.kt
@@ -35,6 +35,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -140,6 +141,7 @@ fun SearchScreen(
                 onSelectAll = onSelectAll,
                 onBlockAll = onBlockAll,
                 onCheckAll = onCheckAll,
+                modifier = Modifier.testTag("blockerTopAppBar"),
             )
         },
     ) { padding ->