From b8371c57b2048121d032920a3a5907eb3e471afd Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 23 Dec 2024 21:51:29 -0800 Subject: Fix infoPage_whenNotChangeableAndClick flaky By wait switch exists before click. Fix: 384011082 Flag: EXEMPT test only Test: atest TogglePermissionAppInfoPageTest Change-Id: I3f9e79ad8b11d988ce586186bc702804ab7a43b1 --- .../template/app/TogglePermissionAppInfoPageTest.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPageTest.kt b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPageTest.kt index 0d73cb3e63c9..798e2d49ff57 100644 --- a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPageTest.kt +++ b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPageTest.kt @@ -160,23 +160,25 @@ class TogglePermissionAppInfoPageTest { @Test fun infoPage_whenChangeableAndClick() { val listModel = TestTogglePermissionAppListModel(isAllowed = false, isChangeable = true) + val switchTitle = context.getString(listModel.switchTitleResId) setTogglePermissionAppInfoPage(listModel) - composeTestRule.onNodeWithText(context.getString(listModel.switchTitleResId)).performClick() + composeTestRule.waitUntilExists(hasText(switchTitle)) + composeTestRule.onNodeWithText(switchTitle).performClick() - composeTestRule.waitUntilExists( - hasText(context.getString(listModel.switchTitleResId)) and isOn()) + composeTestRule.waitUntilExists(hasText(switchTitle) and isOn()) } @Test fun infoPage_whenNotChangeableAndClick() { val listModel = TestTogglePermissionAppListModel(isAllowed = false, isChangeable = false) + val switchTitle = context.getString(listModel.switchTitleResId) setTogglePermissionAppInfoPage(listModel) - composeTestRule.onNodeWithText(context.getString(listModel.switchTitleResId)).performClick() + composeTestRule.waitUntilExists(hasText(switchTitle)) + composeTestRule.onNodeWithText(switchTitle).performClick() - composeTestRule.waitUntilExists( - hasText(context.getString(listModel.switchTitleResId)) and isOff()) + composeTestRule.waitUntilExists(hasText(switchTitle) and isOff()) } @Test -- cgit v1.2.3-59-g8ed1b