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

Merge "Fix null object ref in UserAspectRatioAppPreferenceTest" into udc-qpr-dev

Browse Source
This commit is contained in:
Graciela Putri
2023-09-21 18:25:29 +00:00
committed by Android (Google) Code Review
parent f1c7bf3440 88f8ebe3e3
commit 7dff7a0d56
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreferenceTest.kt
View File

@@ -37,7 +37,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.dx.mockito.inline.extended.ExtendedMockito
import com.android.settings.R import com.android.settings.R
import com.android.settings.applications.appcompat.UserAspectRatioDetails import com.android.settings.applications.appcompat.UserAspectRatioDetails
import com.android.settings.applications.appcompat.UserAspectRatioManager
import com.android.settings.applications.appinfo.AppInfoDashboardFragment import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
import com.android.settings.testutils.TestDeviceConfig import com.android.settings.testutils.TestDeviceConfig
@@ -87,6 +86,8 @@ class UserAspectRatioAppPreferenceTest {
.startMocking() .startMocking()
whenever(context.resources).thenReturn(resources) whenever(context.resources).thenReturn(resources)
whenever(context.packageManager).thenReturn(packageManager) whenever(context.packageManager).thenReturn(packageManager)
// True is ignored but need this here or getBoolean will complain null object
mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true)
} }
@After @After
@@ -124,8 +125,6 @@ class UserAspectRatioAppPreferenceTest {
@Test @Test
fun whenCannotDisplayAspectRatioUiAndConfigTrue_notDisplayed() { fun whenCannotDisplayAspectRatioUiAndConfigTrue_notDisplayed() {
// True is ignored but need this here or getBoolean will complain null object
mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true)
setConfig(true) setConfig(true)
setContent() setContent()
@@ -135,8 +134,6 @@ class UserAspectRatioAppPreferenceTest {
@Test @Test
fun whenCanDisplayAspectRatioUiAndConfigTrue_Displayed() { fun whenCanDisplayAspectRatioUiAndConfigTrue_Displayed() {
// True is ignored but need this here or getBoolean will complain null object
mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true)
setConfig(true) setConfig(true)
whenever(packageManager.queryIntentActivities(any(), anyInt())) whenever(packageManager.queryIntentActivities(any(), anyInt()))
.thenReturn(listOf(RESOLVE_INFO)) .thenReturn(listOf(RESOLVE_INFO))
@@ -153,8 +150,6 @@ class UserAspectRatioAppPreferenceTest {
@Test @Test
fun onClick_startActivity() { fun onClick_startActivity() {
// True is ignored but need this here or getBoolean will complain null object
mockProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, true)
setConfig(true) setConfig(true)
whenever(packageManager.queryIntentActivities(any(), anyInt())) whenever(packageManager.queryIntentActivities(any(), anyInt()))
.thenReturn(listOf(RESOLVE_INFO)) .thenReturn(listOf(RESOLVE_INFO))