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

Commit 2f2ad207 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix warnings in SpaPrivileged tests 

Bug: 332487783
Test: unit test
Change-Id: I32e138e815c1424c8459cb8f77ac3c8d769b14e1
parent c92aa737

packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/framework/compose/DisposableBroadcastReceiverAsUserTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.content.IntentFilter 
import android.os.UserHandle

import androidx.compose.runtime.CompositionLocalProvider

import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.platform.LocalLifecycleOwner

import androidx.compose.ui.test.junit4.createComposeRule

import androidx.lifecycle.compose.LocalLifecycleOwner

import androidx.lifecycle.testing.TestLifecycleOwner

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

import org.junit.Rule

packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.content.res.Resources 
import android.os.BadParcelableException

import android.os.DeadObjectException

import android.os.UserManager

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.SetFlagsRule

import androidx.test.core.app.ApplicationProvider

import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -76,9 +78,7 @@ class AppListRepositoryTest { 
    }



    private val mockUserManager = mock<UserManager> {

        on { getUserInfo(ADMIN_USER_ID) } doReturn UserInfo().apply {

            flags = UserInfo.FLAG_ADMIN

        }

        on { getUserInfo(ADMIN_USER_ID) } doReturn UserInfo(0, "admin", UserInfo.FLAG_ADMIN)

        on { getProfileIdsWithDisabled(ADMIN_USER_ID) } doReturn

            intArrayOf(ADMIN_USER_ID, MANAGED_PROFILE_USER_ID)

    }
@@ -281,9 +281,9 @@ class AppListRepositoryTest { 
        )

    }



    @EnableFlags(Flags.FLAG_PROVIDE_INFO_OF_APK_IN_APEX)

    @Test

    fun loadApps_hasApkInApexInfo_shouldNotIncludeAllHiddenApps() = runTest {

        mSetFlagsRule.enableFlags(Flags.FLAG_PROVIDE_INFO_OF_APK_IN_APEX)

        packageManager.stub {

            on { getInstalledModules(any()) } doReturn listOf(HIDDEN_MODULE)

        }
@@ -297,9 +297,9 @@ class AppListRepositoryTest { 
        assertThat(appList).containsExactly(NORMAL_APP)

    }



    @DisableFlags(Flags.FLAG_PROVIDE_INFO_OF_APK_IN_APEX)

    @Test

    fun loadApps_noApkInApexInfo_shouldNotIncludeHiddenSystemModule() = runTest {

        mSetFlagsRule.disableFlags(Flags.FLAG_PROVIDE_INFO_OF_APK_IN_APEX)

        packageManager.stub {

            on { getInstalledModules(any()) } doReturn listOf(HIDDEN_MODULE)

        }