diff options
author | 2024-12-02 18:46:01 +0000 | |
---|---|---|
committer | 2024-12-02 18:46:01 +0000 | |
commit | e312b3099e75171c4c9d85aa1b2606908552b42d (patch) | |
tree | bd368800b93303575b9bbcda8331468cc8ca885c /services/robotests/backup | |
parent | dd413e96b6bee523d35d99353a6b75eec0582e17 (diff) |
Delete Filipendo workaround code for R
It seems this was intended to be removed for S. I've also double checked
this setting isn't used anywhere that I can find.
Fixes: 154822946
Test: presubmit
Change-Id: I974b30a54883280d16dacf9a2de876d87f1e2c13
Diffstat (limited to 'services/robotests/backup')
-rw-r--r-- | services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java index 02e0bbfd3519..eb61a40e0ba5 100644 --- a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -30,13 +30,10 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; import static org.testng.Assert.expectThrows; import android.app.backup.BackupManager; @@ -90,7 +87,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -110,7 +106,6 @@ public class UserBackupManagerServiceTest { private static final String TAG = "BMSTest"; private static final String PACKAGE_1 = "some.package.1"; private static final String PACKAGE_2 = "some.package.2"; - private static final String USER_FACING_PACKAGE = "user.facing.package"; private static final int USER_ID = 10; @Mock private TransportManager mTransportManager; @@ -1213,47 +1208,6 @@ public class UserBackupManagerServiceTest { eq(packageTrackingReceiver), eq(UserHandle.of(USER_ID)), any(), any(), any()); } - @Test - public void testFilterUserFacingPackages_shouldSkipUserFacing_filtersUserFacing() { - List<PackageInfo> packages = Arrays.asList(getPackageInfo(USER_FACING_PACKAGE), - getPackageInfo(PACKAGE_1)); - UserBackupManagerService backupManagerService = spy( - createUserBackupManagerServiceAndRunTasks()); - when(backupManagerService.shouldSkipUserFacingData()).thenReturn(true); - when(backupManagerService.shouldSkipPackage(eq(USER_FACING_PACKAGE))).thenReturn(true); - - List<PackageInfo> filteredPackages = backupManagerService.filterUserFacingPackages( - packages); - - assertFalse(containsPackage(filteredPackages, USER_FACING_PACKAGE)); - assertTrue(containsPackage(filteredPackages, PACKAGE_1)); - } - - @Test - public void testFilterUserFacingPackages_shouldNotSkipUserFacing_doesNotFilterUserFacing() { - List<PackageInfo> packages = Arrays.asList(getPackageInfo(USER_FACING_PACKAGE), - getPackageInfo(PACKAGE_1)); - UserBackupManagerService backupManagerService = spy( - createUserBackupManagerServiceAndRunTasks()); - when(backupManagerService.shouldSkipUserFacingData()).thenReturn(false); - when(backupManagerService.shouldSkipPackage(eq(USER_FACING_PACKAGE))).thenReturn(true); - - List<PackageInfo> filteredPackages = backupManagerService.filterUserFacingPackages( - packages); - - assertTrue(containsPackage(filteredPackages, USER_FACING_PACKAGE)); - assertTrue(containsPackage(filteredPackages, PACKAGE_1)); - } - - private static boolean containsPackage(List<PackageInfo> packages, String targetPackage) { - for (PackageInfo packageInfo : packages) { - if (targetPackage.equals(packageInfo.packageName)) { - return true; - } - } - return false; - } - private UserBackupManagerService createUserBackupManagerServiceAndRunTasks() { return BackupManagerServiceTestUtils.createUserBackupManagerServiceAndRunTasks( USER_ID, mContext, mBackupThread, mBaseStateDir, mDataDir, mTransportManager); |