Merge "Update tests due to new platform API intruducing ambibuity"

This commit is contained in:
Svetoslav Ganov
2019-01-11 18:48:55 +00:00
committed by Android (Google) Code Review
3 changed files with 17 additions and 15 deletions

View File

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