From 1e0e039708b17ba4317b2e2b88db0e24b9e368f9 Mon Sep 17 00:00:00 2001 From: FanWu Date: Fri, 3 Nov 2023 11:49:44 +0800 Subject: [PATCH] Cleanup Spa special access tests Bug: 309042337 Test: Unit test Change-Id: Id58dfc46a6e3cafc8d6e89516ffd241c791adda1 --- .../app/specialaccess/AllFilesAccessTest.kt | 25 ++--------------- .../specialaccess/MediaManagementAppsTest.kt | 25 ++--------------- .../app/specialaccess/PictureInPictureTest.kt | 13 ++------- .../app/specialaccess/TurnScreenOnAppsTest.kt | 22 +-------------- .../specialaccess/VoiceActivationAppsTest.kt | 28 +++---------------- 5 files changed, 11 insertions(+), 102 deletions(-) diff --git a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt index f5d422dcb94..4c65d90a627 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/AllFilesAccessTest.kt @@ -33,33 +33,12 @@ class AllFilesAccessTest { private val listModel = AllFilesAccessListModel(context) @Test - fun pageTitleResId() { + fun modelResourceIdAndProperties() { assertThat(listModel.pageTitleResId).isEqualTo(R.string.manage_external_storage_title) - } - - @Test - fun switchTitleResId() { assertThat(listModel.switchTitleResId).isEqualTo(R.string.permit_manage_external_storage) - } - - @Test - fun footerResId() { - assertThat(listModel.footerResId) - .isEqualTo(R.string.allow_manage_external_storage_description) - } - - @Test - fun appOp() { + assertThat(listModel.footerResId).isEqualTo(R.string.allow_manage_external_storage_description) assertThat(listModel.appOp).isEqualTo(AppOpsManager.OP_MANAGE_EXTERNAL_STORAGE) - } - - @Test - fun permission() { assertThat(listModel.permission).isEqualTo(Manifest.permission.MANAGE_EXTERNAL_STORAGE) - } - - @Test - fun setModeByUid() { assertThat(listModel.setModeByUid).isTrue() } } \ No newline at end of file diff --git a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt index b56d9974d66..b901043f59f 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/MediaManagementAppsTest.kt @@ -33,33 +33,12 @@ class MediaManagementAppsTest { private val listModel = MediaManagementAppsListModel(context) @Test - fun pageTitleResId() { + fun modelResourceIdAndProperties() { assertThat(listModel.pageTitleResId).isEqualTo(R.string.media_management_apps_title) - } - - @Test - fun switchTitleResId() { - assertThat(listModel.switchTitleResId) - .isEqualTo(R.string.media_management_apps_toggle_label) - } - - @Test - fun footerResId() { + assertThat(listModel.switchTitleResId).isEqualTo(R.string.media_management_apps_toggle_label) assertThat(listModel.footerResId).isEqualTo(R.string.media_management_apps_description) - } - - @Test - fun appOp() { assertThat(listModel.appOp).isEqualTo(AppOpsManager.OP_MANAGE_MEDIA) - } - - @Test - fun permission() { assertThat(listModel.permission).isEqualTo(Manifest.permission.MANAGE_MEDIA) - } - - @Test - fun setModeByUid() { assertThat(listModel.setModeByUid).isTrue() } } \ No newline at end of file diff --git a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt index 6054bb51bb8..42292478f56 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/PictureInPictureTest.kt @@ -67,18 +67,9 @@ class PictureInPictureTest { } @Test - fun pageTitleResId() { + fun modelResourceId() { assertThat(listModel.pageTitleResId).isEqualTo(R.string.picture_in_picture_title) - } - - @Test - fun switchTitleResId() { - assertThat(listModel.switchTitleResId) - .isEqualTo(R.string.picture_in_picture_app_detail_switch) - } - - @Test - fun footerResId() { + assertThat(listModel.switchTitleResId).isEqualTo(R.string.picture_in_picture_app_detail_switch) assertThat(listModel.footerResId).isEqualTo(R.string.picture_in_picture_app_detail_summary) } diff --git a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/TurnScreenOnAppsTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/TurnScreenOnAppsTest.kt index 54ae6c662b0..9c6079d5eca 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/TurnScreenOnAppsTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/TurnScreenOnAppsTest.kt @@ -31,32 +31,12 @@ class TurnScreenOnAppsTest { private val listModel = TurnScreenOnAppsListModel(context) @Test - fun pageTitleResId() { + fun modelResourceIdAndProperties() { assertThat(listModel.pageTitleResId).isEqualTo(com.android.settingslib.R.string.turn_screen_on_title) - } - - @Test - fun switchTitleResId() { assertThat(listModel.switchTitleResId).isEqualTo(com.android.settingslib.R.string.allow_turn_screen_on) - } - - @Test - fun footerResId() { assertThat(listModel.footerResId).isEqualTo(com.android.settingslib.R.string.allow_turn_screen_on_description) - } - - @Test - fun appOp() { assertThat(listModel.appOp).isEqualTo(AppOpsManager.OP_TURN_SCREEN_ON) - } - - @Test - fun permission() { assertThat(listModel.permission).isEqualTo(Manifest.permission.TURN_SCREEN_ON) - } - - @Test - fun setModeByUid() { assertThat(listModel.setModeByUid).isTrue() } } \ No newline at end of file diff --git a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt index 7d636b3f70a..a2aa293731a 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/VoiceActivationAppsTest.kt @@ -17,34 +17,14 @@ class VoiceActivationAppsTest { private val listModel = VoiceActivationAppsListModel(context) @Test - fun pageTitleResId() { + fun modelResourceIdAndProperties() { assertThat(listModel.pageTitleResId).isEqualTo(R.string.voice_activation_apps_title) - } - - @Test - fun switchTitleResId() { assertThat(listModel.switchTitleResId).isEqualTo(R.string.permit_voice_activation_apps) - } - - @Test - fun footerResId() { - assertThat(listModel.footerResId) - .isEqualTo(R.string.allow_voice_activation_apps_description) - } - - @Test - fun appOp() { + assertThat(listModel.footerResId).isEqualTo(R.string.allow_voice_activation_apps_description) assertThat(listModel.appOp).isEqualTo(AppOpsManager.OP_RECEIVE_SANDBOX_TRIGGER_AUDIO) - } - - @Test - fun permission() { assertThat(listModel.permission).isEqualTo( - Manifest.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO) - } - - @Test - fun setModeByUid() { + Manifest.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO + ) assertThat(listModel.setModeByUid).isTrue() } } \ No newline at end of file