Merge "[Safer intents] App Time Spent Preference" into udc-qpr-dev

tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreferenceTest.kt

@@ -17,17 +17,16 @@
 package com.android.settings.spa.app.appinfo
 
 import android.content.Context
-import android.content.pm.ActivityInfo
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
-import android.content.pm.PackageManager.ResolveInfoFlags
 import android.content.pm.ResolveInfo
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotDisplayed
 import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.isEnabled
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.onRoot
@@ -35,12 +34,13 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.settings.R
 import com.android.settings.testutils.FakeFeatureFactory
+import com.android.settingslib.spa.testutils.any
+import com.android.settingslib.spa.testutils.waitUntilExists
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.any
 import org.mockito.Mockito.anyInt
 import org.mockito.Spy
 import org.mockito.junit.MockitoJUnit
@@ -59,39 +59,26 @@ class AppTimeSpentPreferenceTest {
     private val context: Context = ApplicationProvider.getApplicationContext()
 
     @Mock
-    private lateinit var packageManager: PackageManager
+    private lateinit var mockPackageManager: PackageManager
 
     private val fakeFeatureFactory = FakeFeatureFactory()
     private val appFeatureProvider = fakeFeatureFactory.mockApplicationFeatureProvider
 
     @Before
     fun setUp() {
-        whenever(context.packageManager).thenReturn(packageManager)
+        whenever(context.packageManager).thenReturn(mockPackageManager)
         whenever(appFeatureProvider.getTimeSpentInApp(PACKAGE_NAME)).thenReturn(TIME_SPENT)
     }
 
-    private fun mockActivitiesQueryResult(resolveInfos: List<ResolveInfo>) {
+    private fun mockActivityQueryResult(resolveInfo: ResolveInfo?) {
         whenever(
-            packageManager.queryIntentActivitiesAsUser(any(), any<ResolveInfoFlags>(), anyInt())
-        ).thenReturn(resolveInfos)
+            mockPackageManager.resolveActivityAsUser(any(), anyInt(), anyInt())
+        ).thenReturn(resolveInfo)
     }
 
     @Test
     fun noIntentHandler_notDisplay() {
-        mockActivitiesQueryResult(emptyList())
-
-        composeTestRule.setContent {
-            CompositionLocalProvider(LocalContext provides context) {
-                AppTimeSpentPreference(INSTALLED_APP)
-            }
-        }
-
-        composeTestRule.onRoot().assertIsNotDisplayed()
-    }
-
-    @Test
-    fun hasIntentHandler_notSystemApp_notDisplay() {
-        mockActivitiesQueryResult(listOf(ResolveInfo()))
+        mockActivityQueryResult(null)
 
         composeTestRule.setContent {
             CompositionLocalProvider(LocalContext provides context) {
@@ -104,7 +91,7 @@ class AppTimeSpentPreferenceTest {
 
     @Test
     fun installedApp_enabled() {
-        mockActivitiesQueryResult(listOf(MATCHED_RESOLVE_INFO))
+        mockActivityQueryResult(ResolveInfo())
 
         composeTestRule.setContent {
             CompositionLocalProvider(LocalContext provides context) {
@@ -112,18 +99,16 @@ class AppTimeSpentPreferenceTest {
             }
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.time_spent_in_app_pref_title))
-            .assertIsDisplayed()
-            .assertIsEnabled()
+        composeTestRule.waitUntilExists(
+            hasText(context.getString(R.string.time_spent_in_app_pref_title)) and isEnabled()
+        )
         composeTestRule.onNodeWithText(TIME_SPENT).assertIsDisplayed()
     }
 
     @Test
     fun notInstalledApp_disabled() {
-        mockActivitiesQueryResult(listOf(MATCHED_RESOLVE_INFO))
-        val notInstalledApp = ApplicationInfo().apply {
-            packageName = PACKAGE_NAME
-        }
+        mockActivityQueryResult(ResolveInfo())
+        val notInstalledApp = ApplicationInfo().apply { packageName = PACKAGE_NAME }
 
         composeTestRule.setContent {
             CompositionLocalProvider(LocalContext provides context) {
@@ -131,25 +116,19 @@ class AppTimeSpentPreferenceTest {
             }
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.time_spent_in_app_pref_title))
+        composeTestRule
+            .onNodeWithText(context.getString(R.string.time_spent_in_app_pref_title))
             .assertIsNotEnabled()
     }
 
     companion object {
-        private const val PACKAGE_NAME = "package name"
+        private const val PACKAGE_NAME = "package.name"
         private const val TIME_SPENT = "15 minutes"
 
-        private val INSTALLED_APP = ApplicationInfo().apply {
-            packageName = PACKAGE_NAME
-            flags = ApplicationInfo.FLAG_INSTALLED
-        }
-
-        private val MATCHED_RESOLVE_INFO = ResolveInfo().apply {
-            activityInfo = ActivityInfo().apply {
-                applicationInfo = ApplicationInfo().apply {
-                    flags = ApplicationInfo.FLAG_SYSTEM
-                }
+        private val INSTALLED_APP =
+            ApplicationInfo().apply {
+                packageName = PACKAGE_NAME
+                flags = ApplicationInfo.FLAG_INSTALLED
             }
-        }
     }
 }