Rename singleton grant button in test
Bug: 266941193
Test: atest PhotoPickerPermissionTest
Change-Id: Id6927352ef86ac64756e5d31363a148e6f4e0c88
diff --git a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
index 2d810d7..3b66b49 100644
--- a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
@@ -91,8 +91,8 @@
const val ALLOW_ALL_BUTTON =
"com.android.permissioncontroller:id/permission_allow_all_button"
- const val ALLOW_ALL_SINGLETON_BUTTON =
- "com.android.permissioncontroller:id/permission_allow_all_singleton_button"
+ const val ALWAYS_ALLOW_ALL_BUTTON =
+ "com.android.permissioncontroller:id/permission_always_allow_all_button"
const val SELECT_BUTTON =
"com.android.permissioncontroller:id/permission_allow_selected_button"
const val SELECT_MORE_BUTTON =
@@ -117,8 +117,8 @@
"com.android.permissioncontroller:id/allow_foreground_only_radio_button"
const val ASK_RADIO_BUTTON = "com.android.permissioncontroller:id/ask_radio_button"
const val DENY_RADIO_BUTTON = "com.android.permissioncontroller:id/deny_radio_button"
- const val SELECT_PHOTOS_RADIO_BUTTON =
- "com.android.permissioncontroller:id/select_photos_radio_button"
+ const val SELECT_RADIO_BUTTON =
+ "com.android.permissioncontroller:id/select_radio_button"
const val NOTIF_TEXT = "permgrouprequest_notifications"
const val ALLOW_BUTTON_TEXT = "grant_dialog_button_allow"
diff --git a/tests/tests/permission3/src/android/permission3/cts/PhotoPickerPermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/PhotoPickerPermissionTest.kt
index c3e917e..9338839 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PhotoPickerPermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PhotoPickerPermissionTest.kt
@@ -272,7 +272,7 @@
fun testSelectPhotosInSettingsImplicit() {
installPackage(APP_APK_PATH_IMPLICIT_USER_SELECT_STORAGE)
navigateToIndividualPermissionSetting(READ_MEDIA_IMAGES)
- click(By.res(SELECT_PHOTOS_RADIO_BUTTON))
+ click(By.res(SELECT_RADIO_BUTTON))
eventually {
assertAppHasPermission(READ_MEDIA_IMAGES, expectPermission = false)
@@ -286,7 +286,7 @@
fun testSelectPhotosInSettingsExplicit() {
installPackage(APP_APK_PATH_LATEST)
navigateToIndividualPermissionSetting(READ_MEDIA_IMAGES)
- click(By.res(SELECT_PHOTOS_RADIO_BUTTON))
+ click(By.res(SELECT_RADIO_BUTTON))
eventually {
assertAppHasPermission(READ_MEDIA_IMAGES, expectPermission = false)
@@ -313,7 +313,7 @@
}
navigateToIndividualPermissionSetting(READ_MEDIA_IMAGES)
- findView(By.res(SELECT_PHOTOS_RADIO_BUTTON), expected = false)
+ findView(By.res(SELECT_RADIO_BUTTON), expected = false)
}
@Test
@@ -346,7 +346,7 @@
clickAllow()
}
requestAppPermissions(READ_MEDIA_IMAGES, READ_MEDIA_VIDEO) {
- click(By.res(ALLOW_ALL_SINGLETON_BUTTON))
+ click(By.res(ALWAYS_ALLOW_ALL_BUTTON))
}
}
@@ -371,7 +371,7 @@
requestAppPermissions(READ_MEDIA_IMAGES, READ_MEDIA_VIDEO) {
findView(By.res(SELECT_MORE_BUTTON), expected = true)
- click(By.res(ALLOW_ALL_SINGLETON_BUTTON))
+ click(By.res(ALWAYS_ALLOW_ALL_BUTTON))
}
}
