Snap for 10942394 from 9060c4432a483ff25acfbfc871b22d8c409949bd to udc-qpr1-releaseandroid-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-release

Change-Id: I095132461abf7cf42953d862cf2fba2ffa49e0b0

1 files changed, 23 insertions, 6 deletions

diff --git a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
index 2d4dd2a8c..93f5708b2 100644
--- a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
+++ b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
@@ -1150,7 +1150,7 @@ class SafetyCenterActivityTest {
     }
 
     @Test
-    fun moreIssuesCard_twoIssuesAlreadyShown_expandAdditionalIssueCards() {
+    fun moreIssuesCard_withThreeIssues_showsTopIssuesAndMoreIssuesCard() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
             SOURCE_ID_1,
@@ -1170,14 +1170,31 @@ class SafetyCenterActivityTest {
             waitSourceIssueDisplayed(safetySourceTestData.recommendationGeneralIssue)
             waitAllTextDisplayed(MORE_ISSUES_LABEL)
             waitSourceIssueNotDisplayed(safetySourceTestData.informationIssue)
+        }
+    }
+
+    @Test
+    fun moreIssuesCard_twoIssuesAlreadyShown_expandAdditionalIssueCards() {
+        safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
+        safetyCenterTestHelper.setData(
+            SOURCE_ID_1,
+            safetySourceTestData.criticalWithResolvingGeneralIssue
+        )
+        safetyCenterTestHelper.setData(
+            SOURCE_ID_2,
+            safetySourceTestData.recommendationWithGeneralIssue
+        )
+        safetyCenterTestHelper.setData(SOURCE_ID_3, safetySourceTestData.informationWithIssue)
+
+        val bundle = Bundle()
+        bundle.putString(EXTRA_SAFETY_SOURCE_ID, SOURCE_ID_2)
+        bundle.putString(EXTRA_SAFETY_SOURCE_ISSUE_ID, RECOMMENDATION_ISSUE_ID)
+        context.launchSafetyCenterActivity(bundle) {
+            waitSourceIssueNotDisplayed(safetySourceTestData.informationIssue)
 
             clickMoreIssuesCard()
 
-            waitExpandedIssuesDisplayed(
-                safetySourceTestData.criticalResolvingGeneralIssue,
-                safetySourceTestData.recommendationGeneralIssue,
-                safetySourceTestData.informationIssue
-            )
+            waitSourceIssueDisplayed(safetySourceTestData.informationIssue)
         }
     }