diff options
author | 2022-12-26 12:25:08 +0000 | |
---|---|---|
committer | 2023-01-04 10:55:00 +0000 | |
commit | 0c1ef9487775b7cf074b2aa29624da0f4e3c05f5 (patch) | |
tree | bfa30016a3ee53bd623a30d2133dc644ec8dd33a /services/robotests/backup | |
parent | 383a053610486636b0b6fd4064195b2a3d5055eb (diff) |
Update BackupTransportClient#getAvailableRestoreSets() to return List instead of array
Test: ActiveRestoreSessionTest, RestoreSessionHostSideTest
Bug: 210085179
Fix: 210085179
Change-Id: I889e5579e8ca37ce2de38e88a293ad477ae6e40f
Diffstat (limited to 'services/robotests/backup')
-rw-r--r-- | services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java b/services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java index e0812d6a77ea..73ddbe8cec7c 100644 --- a/services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java +++ b/services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java @@ -78,6 +78,7 @@ import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayDeque; +import java.util.Arrays; @RunWith(RobolectricTestRunner.class) @Config( @@ -196,7 +197,7 @@ public class ActiveRestoreSessionTest { mShadowApplication.grantPermissions(android.Manifest.permission.BACKUP); TransportMock transportMock = setUpTransport(mTransport); when(transportMock.transport.getAvailableRestoreSets()) - .thenReturn(new RestoreSet[] {mRestoreSet1, mRestoreSet2}); + .thenReturn(Arrays.asList(mRestoreSet1, mRestoreSet2)); IRestoreSession restoreSession = createActiveRestoreSession(PACKAGE_1, mTransport); int result = restoreSession.getAvailableRestoreSets(mObserver, mMonitor); @@ -214,7 +215,8 @@ public class ActiveRestoreSessionTest { public void testGetAvailableRestoreSets_forEmptyRestoreSets() throws Exception { mShadowApplication.grantPermissions(android.Manifest.permission.BACKUP); TransportMock transportMock = setUpTransport(mTransport); - when(transportMock.transport.getAvailableRestoreSets()).thenReturn(new RestoreSet[0]); + when(transportMock.transport.getAvailableRestoreSets()).thenReturn( + Arrays.asList(new RestoreSet[0])); IRestoreSession restoreSession = createActiveRestoreSession(PACKAGE_1, mTransport); int result = restoreSession.getAvailableRestoreSets(mObserver, mMonitor); @@ -593,7 +595,7 @@ public class ActiveRestoreSessionTest { new ActiveRestoreSession( mBackupManagerService, packageName, transport.transportName, mBackupEligibilityRules); - restoreSession.setRestoreSets(restoreSets); + restoreSession.setRestoreSets(Arrays.asList(restoreSets)); return restoreSession; } |