Revert to API 33 GMD and fail empty screen tests

Change-Id: Ib0aeb35aa43b5e1d949652123ae9a5a480c40822
android · Apr 18, 2024 · 3ce9d45 · 3ce9d45
1 parent 29243cf
commit 3ce9d45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -47,9 +47,9 @@ android {
     }
 
     testOptions.managedDevices.devices {
-        create<ManagedVirtualDevice>("pixel6Api31") {
+        create<ManagedVirtualDevice>("pixel6Api33") {
             device = "Pixel 6"
-            apiLevel = 31
+            apiLevel = 33
             systemImageSource = "aosp"
         }
     }
@@ -60,7 +60,7 @@ android {
 
 baselineProfile {
     // This specifies the managed devices to use that you run the tests on.
-    managedDevices += "pixel6Api31"
+    managedDevices += "pixel6Api33"
 
     // Don't use a connected device but rely on a GMD for consistency between local and CI builds.
     useConnectedDevices = false

diff --git a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
@@ -24,6 +24,7 @@ import androidx.test.uiautomator.untilHasChildren
 import com.google.samples.apps.nowinandroid.flingElementDownUp
 import com.google.samples.apps.nowinandroid.waitAndFindObject
 import com.google.samples.apps.nowinandroid.waitForObjectOnTopAppBar
+import org.junit.Assert.fail
 
 private const val TAG = "ForYouActions"
 
@@ -46,8 +47,8 @@ fun MacrobenchmarkScope.forYouSelectTopics(recheckTopicsIfChecked: Boolean = fal
     val withChildren = topics.childCount != 0
     if (!withChildren) {
         // TODO: Ensure ForYou has topics.
-        Log.w(TAG, "no topics found, can't scroll for baseline profile generation.")
-        return
+        Log.e(TAG, "no topics found, can't scroll for baseline profile generation.")
+        fail()
     }
 
     // Set gesture margin from sides not to trigger system gesture navigation

diff --git a/...hmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt b/...hmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
@@ -22,6 +22,7 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
 import com.google.samples.apps.nowinandroid.flingElementDownUp
 import com.google.samples.apps.nowinandroid.waitForObjectOnTopAppBar
+import org.junit.Assert.fail
 
 private const val TAG = "InterestsActions"
 
@@ -42,7 +43,8 @@ fun MacrobenchmarkScope.interestsScrollTopicsDownUp() {
         // TODO: Ensure topics are availble.
         device.flingElementDownUp(topicsList)
     } else {
-        Log.w(TAG, "No topics found, can't scroll during baseline profile generation.")
+        Log.e(TAG, "No topics found, can't scroll during baseline profile generation.")
+        fail()
     }
 }