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

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
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
.thenReturn(Arrays.asList(new AppOpsManager.PackageOps[] {blankOps[0]}));
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
any(int[].class))).thenReturn(Arrays.asList(
new AppOpsManager.PackageOps[] {blankOps[0]}));
assertTrue(appHasVpnPermission(mContext, mockApp));
// List with more than one package op
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
.thenReturn(Arrays.asList(blankOps));
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
any(int[].class))).thenReturn(Arrays.asList(blankOps));
assertTrue(appHasVpnPermission(mContext, mockApp));
// Empty list
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
.thenReturn(Collections.emptyList());
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
any(int[].class))).thenReturn(Collections.emptyList());
assertFalse(appHasVpnPermission(mContext, mockApp));
// Null list (may be returned in place of an empty list)
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName), any()))
.thenReturn(null);
when(mAppOps.getOpsForPackage(eq(mockApp.uid), eq(mockApp.packageName),
any(int[].class))).thenReturn(null);
assertFalse(appHasVpnPermission(mContext, mockApp));
}