From a233ca783ab4a547755561285eab24b4d1c4b11c Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 18 Jul 2024 11:39:13 +0800 Subject: [PATCH] Fix whenNoInstaller_notDisplayed Which is forgot to update in Icd5559bce06c059844269d70926b3c0b39589edb Bug: 355270127 Flag: EXEMPT test only Test: atest AppInstallerInfoPreferenceTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:512141619d041cc01e38f3c9b07a84b83a6a1354) Merged-In: If21215b81008c03a6b6ad2a77a90073a6d708390 Change-Id: If21215b81008c03a6b6ad2a77a90073a6d708390 --- .../spa/app/appinfo/AppInstallerInfoPreferenceTest.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt index 96e47076778..6297c62a015 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt @@ -68,7 +68,6 @@ class AppInstallerInfoPreferenceTest { @Before fun setUp() { mockSession = mockitoSession() - .initMocks(this) .mockStatic(AppStoreUtil::class.java) .mockStatic(Utils::class.java) .mockStatic(AppUtils::class.java) @@ -77,8 +76,7 @@ class AppInstallerInfoPreferenceTest { whenever(AppStoreUtil.getInstallerPackageName(any(), eq(PACKAGE_NAME))) .thenReturn(INSTALLER_PACKAGE_NAME) whenever(AppStoreUtil.getInstallerPackageNameAndInstallSourceInfo(any(), eq(PACKAGE_NAME))) - .thenReturn( - Pair(INSTALLER_PACKAGE_NAME, INSTALL_SOURCE_INFO)) + .thenReturn(Pair(INSTALLER_PACKAGE_NAME, INSTALL_SOURCE_INFO)) whenever(AppStoreUtil.getAppStoreLink(context, INSTALLER_PACKAGE_NAME, PACKAGE_NAME)) .thenReturn(STORE_LINK) whenever(AppStoreUtil.isInitiatedFromDifferentPackage(eq(INSTALL_SOURCE_INFO))) @@ -97,7 +95,8 @@ class AppInstallerInfoPreferenceTest { @Test fun whenNoInstaller_notDisplayed() { - whenever(AppStoreUtil.getInstallerPackageName(any(), eq(PACKAGE_NAME))).thenReturn(null) + whenever(AppStoreUtil.getInstallerPackageNameAndInstallSourceInfo(any(), eq(PACKAGE_NAME))) + .thenReturn(Pair(null, INSTALL_SOURCE_INFO)) setContent()