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

Update tests due to new platform API intruducing ambibuity

Browse Source 
Tests: atest MockLocationAppPreferenceControllerTest
       atest RestrictAppPreferenceControllerTest

bug:111061782

Change-Id: I287d40d5b1e5a6fff6a85cb5ba6a8b87096da9d4
This commit is contained in:
Svet Ganov
2019-01-10 12:33:13 -08:00
parent 3137429192
commit 27b0668c91
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
View File

@@ -74,7 +74,7 @@ public class MockLocationAppPreferenceControllerTest {
final AppOpsManager.PackageOps packageOps = final AppOpsManager.PackageOps packageOps =
new AppOpsManager.PackageOps(appName, 0, new AppOpsManager.PackageOps(appName, 0,
Collections.singletonList(createOpEntry(AppOpsManager.MODE_ALLOWED))); Collections.singletonList(createOpEntry(AppOpsManager.MODE_ALLOWED)));
when(mAppOpsManager.getPackagesForOps(any())).thenReturn( when(mAppOpsManager.getPackagesForOps(any(int[].class))).thenReturn(
Collections.singletonList(packageOps)); Collections.singletonList(packageOps));
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -84,7 +84,8 @@ public class MockLocationAppPreferenceControllerTest {
@Test @Test
public void updateState_noAppSelected_shouldSetSummaryToDefault() { public void updateState_noAppSelected_shouldSetSummaryToDefault() {
when(mAppOpsManager.getPackagesForOps(any())).thenReturn(Collections.emptyList()); when(mAppOpsManager.getPackagesForOps(any(int[].class)))
.thenReturn(Collections.emptyList());
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -101,7 +102,7 @@ public class MockLocationAppPreferenceControllerTest {
final AppOpsManager.PackageOps packageOps = new AppOpsManager.PackageOps(prevAppName, 0, final AppOpsManager.PackageOps packageOps = new AppOpsManager.PackageOps(prevAppName, 0,
Collections.singletonList(createOpEntry(AppOpsManager.MODE_ALLOWED))); Collections.singletonList(createOpEntry(AppOpsManager.MODE_ALLOWED)));
when(mAppOpsManager.getPackagesForOps(any())) when(mAppOpsManager.getPackagesForOps(any(int[].class)))
.thenReturn(Collections.singletonList(packageOps)); .thenReturn(Collections.singletonList(packageOps));
when(mPackageManager.getApplicationInfo(anyString(), when(mPackageManager.getApplicationInfo(anyString(),
eq(PackageManager.MATCH_DISABLED_COMPONENTS))).thenReturn(mApplicationInfo); eq(PackageManager.MATCH_DISABLED_COMPONENTS))).thenReturn(mApplicationInfo);

8
tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
View File

@@ -111,7 +111,7 @@ public class RestrictAppPreferenceControllerTest {
@Test @Test
public void testUpdateState_oneApp_showCorrectSummary() { public void testUpdateState_oneApp_showCorrectSummary() {
mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mRestrictedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
mRestrictAppPreferenceController.updateState(mPreference); mRestrictAppPreferenceController.updateState(mPreference);
@@ -124,7 +124,7 @@ public class RestrictAppPreferenceControllerTest {
mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mAllowedPackageOps); mPackageOpsList.add(mAllowedPackageOps);
mPackageOpsList.add(mOtherUserPackageOps); mPackageOpsList.add(mOtherUserPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
mRestrictAppPreferenceController.updateState(mPreference); mRestrictAppPreferenceController.updateState(mPreference);
@@ -137,7 +137,7 @@ public class RestrictAppPreferenceControllerTest {
// Two packageOps share same package name but different uid. // Two packageOps share same package name but different uid.
mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mOtherUserPackageOps); mPackageOpsList.add(mOtherUserPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
mRestrictAppPreferenceController.updateState(mPreference); mRestrictAppPreferenceController.updateState(mPreference);
@@ -152,7 +152,7 @@ public class RestrictAppPreferenceControllerTest {
@Test @Test
public void testUpdateState_zeroRestrictApp_inVisible() { public void testUpdateState_zeroRestrictApp_inVisible() {
mPackageOpsList.add(mAllowedPackageOps); mPackageOpsList.add(mAllowedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
mRestrictAppPreferenceController.updateState(mPreference); mRestrictAppPreferenceController.updateState(mPreference);

17
tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
View File

@@ -57,23 +57,24 @@ public class AppSettingsTest extends AndroidTestCase {
}; };
// List with one package op // List with one package op
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any())) when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
.thenReturn(Arrays.asList(new AppOpsManager.PackageOps[] {blankOps[0]})); any(int[].class))).thenReturn(Arrays.asList(
new AppOpsManager.PackageOps[] {blankOps[0]}));
assertTrue(appHasVpnPermission(mContext, mockApp)); assertTrue(appHasVpnPermission(mContext, mockApp));
// List with more than one package op // List with more than one package op
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any())) when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
.thenReturn(Arrays.asList(blankOps)); any(int[].class))).thenReturn(Arrays.asList(blankOps));
assertTrue(appHasVpnPermission(mContext, mockApp)); assertTrue(appHasVpnPermission(mContext, mockApp));
// Empty list // Empty list
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any())) when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
.thenReturn(Collections.emptyList()); any(int[].class))).thenReturn(Collections.emptyList());
assertFalse(appHasVpnPermission(mContext, mockApp)); assertFalse(appHasVpnPermission(mContext, mockApp));
// Null list (may be returned in place of an empty list) // Null list (may be returned in place of an empty list)
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any())) when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
.thenReturn(null); any(int[].class))).thenReturn(null);
assertFalse(appHasVpnPermission(mContext, mockApp)); assertFalse(appHasVpnPermission(mContext, mockApp));
} }