From 27b0668c916b437b1b4712248b9f5cd7b4ce3d72 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Thu, 10 Jan 2019 12:33:13 -0800 Subject: [PATCH] Update tests due to new platform API intruducing ambibuity Tests: atest MockLocationAppPreferenceControllerTest atest RestrictAppPreferenceControllerTest bug:111061782 Change-Id: I287d40d5b1e5a6fff6a85cb5ba6a8b87096da9d4 --- ...MockLocationAppPreferenceControllerTest.java | 7 ++++--- .../RestrictAppPreferenceControllerTest.java | 8 ++++---- .../android/settings/vpn2/AppSettingsTest.java | 17 +++++++++-------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index b0de02470ff..73c0d8e04bd 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -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); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index 3746d648ff4..368a93a4e40 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -111,7 +111,7 @@ public class RestrictAppPreferenceControllerTest { @Test public void testUpdateState_oneApp_showCorrectSummary() { mPackageOpsList.add(mRestrictedPackageOps); - doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); + doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class)); mRestrictAppPreferenceController.updateState(mPreference); @@ -124,7 +124,7 @@ public class RestrictAppPreferenceControllerTest { mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mAllowedPackageOps); mPackageOpsList.add(mOtherUserPackageOps); - doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); + doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class)); mRestrictAppPreferenceController.updateState(mPreference); @@ -137,7 +137,7 @@ public class RestrictAppPreferenceControllerTest { // Two packageOps share same package name but different uid. mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mOtherUserPackageOps); - doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); + doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class)); mRestrictAppPreferenceController.updateState(mPreference); @@ -152,7 +152,7 @@ public class RestrictAppPreferenceControllerTest { @Test public void testUpdateState_zeroRestrictApp_inVisible() { mPackageOpsList.add(mAllowedPackageOps); - doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); + doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class)); mRestrictAppPreferenceController.updateState(mPreference); diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java index 1a9701d68ab..014d8ea9f6d 100644 --- a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java +++ b/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java @@ -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)); }