PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AppButtonPreferenceControllerTest

Browse Source 
* isSystem was not being mocked.
* The tests where isSystem should return true
  were not being tested properly.

Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
This commit is contained in:
Alex Johnston
2020-03-16 09:31:39 +00:00
parent 59b3974433
commit 8d430de5d5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -396,7 +396,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
// We don't allow uninstalling DO/PO on *any* users if it's a system app, because // We don't allow uninstalling DO/PO on *any* users if it's a system app, because
// "uninstall" is actually "downgrade to the system version + disable", and "downgrade" // "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
// will clear data on all users. // will clear data on all users.
if (Utils.isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) { if (isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {
if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) { if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
enabled = false; enabled = false;
} }

6
tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
View File

@@ -275,7 +275,7 @@ public class AppButtonsPreferenceControllerTest {
@Test @Test
public void updateUninstallButton_isSystemAndIsProfileOrDeviceOwner_setButtonDisable() { public void updateUninstallButton_isSystemAndIsProfileOrDeviceOwner_setButtonDisable() {
mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM; doReturn(true).when(mController).isSystemPackage(any(), any(), any());
doReturn(true).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString()); doReturn(true).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());
mController.updateUninstallButton(); mController.updateUninstallButton();
@@ -285,7 +285,7 @@ public class AppButtonsPreferenceControllerTest {
@Test @Test
public void updateUninstallButton_isSystemAndIsNotProfileOrDeviceOwner_setButtonEnabled() { public void updateUninstallButton_isSystemAndIsNotProfileOrDeviceOwner_setButtonEnabled() {
mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM; doReturn(true).when(mController).isSystemPackage(any(), any(), any());
doReturn(false).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString()); doReturn(false).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());
mController.updateUninstallButton(); mController.updateUninstallButton();
@@ -295,6 +295,7 @@ public class AppButtonsPreferenceControllerTest {
@Test @Test
public void updateUninstallButton_isNotSystemAndIsProfileOrDeviceOwner_setButtonDisable() { public void updateUninstallButton_isNotSystemAndIsProfileOrDeviceOwner_setButtonDisable() {
doReturn(false).when(mController).isSystemPackage(any(), any(), any());
doReturn(0).when(mDpm).getDeviceOwnerUserId(); doReturn(0).when(mDpm).getDeviceOwnerUserId();
doReturn(true).when(mDpm).isDeviceOwnerApp(anyString()); doReturn(true).when(mDpm).isDeviceOwnerApp(anyString());
@@ -305,6 +306,7 @@ public class AppButtonsPreferenceControllerTest {
@Test @Test
public void updateUninstallButton_isNotSystemAndIsNotProfileOrDeviceOwner_setButtonEnabled() { public void updateUninstallButton_isNotSystemAndIsNotProfileOrDeviceOwner_setButtonEnabled() {
doReturn(false).when(mController).isSystemPackage(any(), any(), any());
doReturn(10).when(mDpm).getDeviceOwnerUserId(); doReturn(10).when(mDpm).getDeviceOwnerUserId();
doReturn(false).when(mDpm).isDeviceOwnerApp(anyString()); doReturn(false).when(mDpm).isDeviceOwnerApp(anyString());