Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18f8143c authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Add tests for PackageInfoPresenter"

parents bfac23fc 6d19ecdb

src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt

+5 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.spa.app.appinfo



import android.app.ActivityManager

import android.app.settings.SettingsEnums

import android.content.Context

import android.content.Intent
@@ -29,8 +28,10 @@ import android.util.Log 
import androidx.compose.runtime.Composable

import com.android.settings.overlay.FeatureFactory

import com.android.settingslib.spa.framework.compose.LocalNavController

import com.android.settingslib.spaprivileged.framework.common.activityManager

import com.android.settingslib.spaprivileged.framework.common.asUser

import com.android.settingslib.spaprivileged.framework.compose.DisposableBroadcastReceiverAsUser

import com.android.settingslib.spaprivileged.model.app.IPackageManagers

import com.android.settingslib.spaprivileged.model.app.PackageManagers

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers
@@ -48,6 +49,7 @@ class PackageInfoPresenter( 
    val packageName: String,

    val userId: Int,

    private val coroutineScope: CoroutineScope,

    private val packageManagers: IPackageManagers = PackageManagers,

) {

    private val metricsFeatureProvider = FeatureFactory.getFactory(context).metricsFeatureProvider

    private val userHandle = UserHandle.of(userId)
@@ -134,9 +136,8 @@ class PackageInfoPresenter( 
    fun forceStop() {

        logAction(SettingsEnums.ACTION_APP_FORCE_STOP)

        coroutineScope.launch(Dispatchers.Default) {

            val activityManager = context.getSystemService(ActivityManager::class.java)!!

            Log.d(TAG, "Stopping package $packageName")

            activityManager.forceStopPackageAsUser(packageName, userId)

            context.activityManager.forceStopPackageAsUser(packageName, userId)

            notifyChange()

        }

    }
@@ -146,7 +147,7 @@ class PackageInfoPresenter( 
    }



    private fun getPackageInfo() =

        PackageManagers.getPackageInfoAsUser(

        packageManagers.getPackageInfoAsUser(

            packageName = packageName,

            flags = PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.GET_PERMISSIONS,

            userId = userId,

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

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ import org.mockito.Mockito.`when` as whenever 


@RunWith(AndroidJUnit4::class)

class AppAllServicesPreferenceTest {

    @JvmField

    @Rule

    @get:Rule

    val mockito: MockitoRule = MockitoJUnit.rule()



    @get:Rule

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

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ import org.mockito.Mockito.`when` as whenever 
@RunWith(AndroidJUnit4::class)

class AppButtonRepositoryTest {



    @JvmField

    @Rule

    @get:Rule

    val mockito: MockitoRule = MockitoJUnit.rule()



    @Spy

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

+3 −3
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import androidx.compose.ui.test.onRoot 
import androidx.test.core.app.ApplicationProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.settings.R

import com.android.settings.testutils.mockAsUser

import com.android.settingslib.spaprivileged.framework.common.domainVerificationManager

import org.junit.Before

import org.junit.Rule
@@ -51,8 +52,7 @@ import org.mockito.Mockito.`when` as whenever 


@RunWith(AndroidJUnit4::class)

class AppOpenByDefaultPreferenceTest {

    @JvmField

    @Rule

    @get:Rule

    val mockito: MockitoRule = MockitoJUnit.rule()



    @get:Rule
@@ -76,7 +76,7 @@ class AppOpenByDefaultPreferenceTest { 
    @Before

    fun setUp() {

        whenever(context.packageManager).thenReturn(packageManager)

        doReturn(context).`when`(context).createContextAsUser(any(), anyInt())

        context.mockAsUser()

        whenever(context.domainVerificationManager).thenReturn(domainVerificationManager)

        whenever(allowedUserState.isLinkHandlingAllowed).thenReturn(true)

        whenever(notAllowedUserState.isLinkHandlingAllowed).thenReturn(false)

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

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ import org.mockito.Mockito.`when` as whenever 


@RunWith(AndroidJUnit4::class)

class AppSettingsPreferenceTest {

    @JvmField

    @Rule

    @get:Rule

    val mockito: MockitoRule = MockitoJUnit.rule()



    @get:Rule