diff options
7 files changed, 19 insertions, 14 deletions
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/PackageManagerLocalSnapshotTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/PackageManagerLocalSnapshotTest.kt index 5f26d6f846aa..cd37674f4f8c 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/PackageManagerLocalSnapshotTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/PackageManagerLocalSnapshotTest.kt @@ -31,6 +31,7 @@ import org.junit.Test import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.anyString +import org.mockito.Mockito.doReturn import kotlin.test.assertFailsWith class PackageManagerLocalSnapshotTest { @@ -154,7 +155,7 @@ class PackageManagerLocalSnapshotTest { put(packageStateUser0.packageName, packageStateUser0) put(packageStateUser10.packageName, packageStateUser10) } - whenever(this.packageStates) { packageStates } + doReturn(packageStates).whenever(this).packageStates whenever(getPackageStateFiltered(anyString(), anyInt(), anyInt())) { packageStates[arguments[0]]?.takeUnless { shouldFilterApplication(it, arguments[1] as Int, arguments[2] as Int) diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt index 55645d7f80b1..9fbf86e36df4 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt @@ -48,6 +48,7 @@ import org.mockito.Mockito.any import org.mockito.Mockito.anyInt import org.mockito.Mockito.anyLong import org.mockito.Mockito.anyString +import org.mockito.Mockito.doReturn import org.mockito.Mockito.eq import org.mockito.Mockito.mock import org.mockito.Mockito.verifyNoMoreInteractions @@ -351,12 +352,12 @@ class DomainVerificationEnforcerTest { whenever(this.domainSetId) { domainSetId } whenever(getUserStateOrDefault(0)) { PackageUserStateInternal.DEFAULT } whenever(getUserStateOrDefault(1)) { PackageUserStateInternal.DEFAULT } - whenever(userStates) { + doReturn( SparseArray<PackageUserStateInternal>().apply { this[0] = PackageUserStateInternal.DEFAULT this[1] = PackageUserStateInternal.DEFAULT } - } + ).whenever(this).userStates whenever(isSystem) { false } whenever(signingDetails) { SigningDetails.UNKNOWN } } diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt index 86c4335ecfe9..47d9196b502b 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationManagerApiTest.kt @@ -44,6 +44,7 @@ import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.anyLong import org.mockito.ArgumentMatchers.anyString +import org.mockito.Mockito.doReturn import java.util.UUID import java.util.concurrent.atomic.AtomicBoolean import kotlin.test.assertFailsWith @@ -555,12 +556,12 @@ class DomainVerificationManagerApiTest { whenever(this.domainSetId) { domainSetId } whenever(getUserStateOrDefault(0)) { pkgUserState0() } whenever(getUserStateOrDefault(1)) { pkgUserState1() } - whenever(userStates) { + doReturn( SparseArray<PackageUserStateInternal>().apply { this[0] = pkgUserState0() this[1] = pkgUserState1() } - } + ).whenever(this).userStates whenever(isSystem) { false } } diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPackageTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPackageTest.kt index e55ff3b7c229..98d780143ff7 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPackageTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPackageTest.kt @@ -1084,12 +1084,12 @@ class DomainVerificationPackageTest { whenever(this.domainSetId) { domainSetId } whenever(getUserStateOrDefault(0)) { PackageUserStateInternal.DEFAULT } whenever(getUserStateOrDefault(10)) { PackageUserStateInternal.DEFAULT } - whenever(userStates) { + doReturn( SparseArray<PackageUserStateInternal>().apply { this[0] = PackageUserStateInternal.DEFAULT this[1] = PackageUserStateInternal.DEFAULT } - } + ).whenever(this).userStates whenever(isSystem) { isSystemApp } val mockSigningDetails = SigningDetails(arrayOf(spy(Signature(signature)) { diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationSettingsMutationTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationSettingsMutationTest.kt index 427b5b3494b2..4a211dfeb91e 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationSettingsMutationTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationSettingsMutationTest.kt @@ -41,6 +41,7 @@ import org.mockito.Mockito.any import org.mockito.Mockito.anyInt import org.mockito.Mockito.anyLong import org.mockito.Mockito.anyString +import org.mockito.Mockito.doReturn import org.mockito.Mockito.eq import org.mockito.Mockito.verify import java.util.UUID @@ -218,12 +219,12 @@ class DomainVerificationSettingsMutationTest { whenever(domainSetId) { TEST_UUID } whenever(getUserStateOrDefault(0)) { PackageUserStateInternal.DEFAULT } whenever(getUserStateOrDefault(10)) { PackageUserStateInternal.DEFAULT } - whenever(userStates) { + doReturn( SparseArray<PackageUserStateInternal>().apply { this[0] = PackageUserStateInternal.DEFAULT this[1] = PackageUserStateInternal.DEFAULT } - } + ).whenever(this).userStates whenever(isSystem) { false } } } diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationUserSelectionOverrideTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationUserSelectionOverrideTest.kt index 6bb5f393f0d2..d54d608e48c2 100644 --- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationUserSelectionOverrideTest.kt +++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationUserSelectionOverrideTest.kt @@ -41,6 +41,8 @@ import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.anyLong import org.mockito.ArgumentMatchers.anyString +import org.mockito.Mockito.doReturn + import java.util.UUID class DomainVerificationUserStateOverrideTest { @@ -155,12 +157,12 @@ class DomainVerificationUserStateOverrideTest { whenever(this.domainSetId) { domainSetId } whenever(getUserStateOrDefault(0)) { PackageUserStateInternal.DEFAULT } whenever(getUserStateOrDefault(1)) { PackageUserStateInternal.DEFAULT } - whenever(userStates) { + doReturn( SparseArray<PackageUserStateInternal>().apply { this[0] = PackageUserStateInternal.DEFAULT this[1] = PackageUserStateInternal.DEFAULT } - } + ).whenever(this).userStates whenever(isSystem) { false } } diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt index 3c753326fb7d..e578ea35518d 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt @@ -567,9 +567,8 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { @Throws(Exception::class) private fun stageInstantAppResolverScan() { - whenever(mocks.resources.getStringArray(R.array.config_ephemeralResolverPackage)) { - arrayOf("com.android.test.ephemeral.resolver") - } + doReturn(arrayOf("com.android.test.ephemeral.resolver")) + .whenever(mocks.resources).getStringArray(R.array.config_ephemeralResolverPackage) stageScanNewPackage("com.android.test.ephemeral.resolver", 1L, getPartitionFromFlag(PackageManagerService.SCAN_AS_PRODUCT).privAppFolder, withPackage = { pkg: PackageImpl -> |