PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix settings tests where we relied on the resId." into main

Browse Source
This commit is contained in:
Jakob Schneider
2023-12-12 19:41:53 +00:00
committed by Android (Google) Code Review
parent f1dd128c45 75b99cc6e4
commit accd9ca298
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/spa_unit/src/com/android/settings/spa/app/appinfo/HibernationSwitchPreferenceTest.kt
View File

@@ -24,8 +24,8 @@ import android.app.AppOpsManager.OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED
import android.apphibernation.AppHibernationManager import android.apphibernation.AppHibernationManager
import android.content.Context import android.content.Context
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import android.content.pm.Flags
import android.os.Build import android.os.Build
import android.os.UserHandle
import android.permission.PermissionControllerManager import android.permission.PermissionControllerManager
import android.permission.PermissionControllerManager.HIBERNATION_ELIGIBILITY_ELIGIBLE import android.permission.PermissionControllerManager.HIBERNATION_ELIGIBILITY_ELIGIBLE
import android.permission.PermissionControllerManager.HIBERNATION_ELIGIBILITY_EXEMPT_BY_SYSTEM import android.permission.PermissionControllerManager.HIBERNATION_ELIGIBILITY_EXEMPT_BY_SYSTEM
@@ -63,7 +63,6 @@ import org.mockito.Mockito.any
import org.mockito.Mockito.anyBoolean import org.mockito.Mockito.anyBoolean
import org.mockito.Mockito.anyString import org.mockito.Mockito.anyString
import org.mockito.Mockito.doAnswer import org.mockito.Mockito.doAnswer
import org.mockito.Mockito.doReturn
import org.mockito.Mockito.eq import org.mockito.Mockito.eq
import org.mockito.Mockito.never import org.mockito.Mockito.never
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
@@ -147,12 +146,20 @@ class HibernationSwitchPreferenceTest {
setContent() setContent()
composeTestRule.onNodeWithText(context.getString(R.string.unused_apps_switch)) val text = if (isArchivingEnabled()) {
context.getString(R.string.unused_apps_switch_v2)
} else {
context.getString(R.string.unused_apps_switch)
}
composeTestRule.onNodeWithText(text)
.assertIsDisplayed() .assertIsDisplayed()
.assertIsNotEnabled() .assertIsNotEnabled()
.assertIsOff() .assertIsOff()
} }
private fun isArchivingEnabled() =
Flags.archiving() || "true" == System.getProperty("pm.archiving.enabled")
@Test @Test
fun `An app targets Q with ops mode default when hibernation targets pre S - not exempted`() { fun `An app targets Q with ops mode default when hibernation targets pre S - not exempted`() {
mockOpsMode(MODE_DEFAULT) mockOpsMode(MODE_DEFAULT)