Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bad test for testGetUserForAncestralSerialNumber which was previously marked as @Ignore."

Browse Source
This commit is contained in:
Chandan Nath
2020-01-13 11:40:46 +00:00
committed by Android (Google) Code Review
parent e3872f1fd3 b6798a7fb6
commit ea09e1ae0e
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -1406,10 +1406,7 @@ public class BackupManagerService extends IBackupManager.Stub {
long oldId = Binder.clearCallingIdentity();
final int[] userIds;
try {
userIds =
mContext
.getSystemService(UserManager.class)
.getProfileIds(callingUserId, false);
userIds = getUserManager().getProfileIds(callingUserId, false);
} finally {
Binder.restoreCallingIdentity(oldId);
}

23
services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java
View File

@@ -57,7 +57,6 @@ import com.android.server.backup.utils.RandomAccessFileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
@@ -523,7 +522,6 @@ public class BackupManagerServiceTest {
* Test that {@link BackupManagerService#dump()} dumps system user information before non-system
* user information.
*/
@Test
public void testDump_systemUserFirst() {
String[] args = new String[0];
@@ -539,16 +537,31 @@ public class BackupManagerServiceTest {
}
@Test
@Ignore("b/147012496")
public void testGetUserForAncestralSerialNumber() {
public void testGetUserForAncestralSerialNumber_forSystemUser() {
BackupManagerServiceTestable.sBackupDisabled = false;
BackupManagerService backupManagerService =
new BackupManagerServiceTestable(mContextMock, mUserServices);
when(mUserManagerMock.getProfileIds(UserHandle.getCallingUserId(), false))
.thenReturn(new int[] {UserHandle.USER_SYSTEM, NON_USER_SYSTEM});
when(mUserBackupManagerService.getAncestralSerialNumber()).thenReturn(11L);
UserHandle user = backupManagerService.getUserForAncestralSerialNumber(11L);
assertThat(user).isEqualTo(UserHandle.of(1));
assertThat(user).isEqualTo(UserHandle.of(UserHandle.USER_SYSTEM));
}
@Test
public void testGetUserForAncestralSerialNumber_forNonSystemUser() {
BackupManagerServiceTestable.sBackupDisabled = false;
BackupManagerService backupManagerService =
new BackupManagerServiceTestable(mContextMock, mUserServices);
when(mUserManagerMock.getProfileIds(UserHandle.getCallingUserId(), false))
.thenReturn(new int[] {UserHandle.USER_SYSTEM, NON_USER_SYSTEM});
when(mNonSystemUserBackupManagerService.getAncestralSerialNumber()).thenReturn(11L);
UserHandle user = backupManagerService.getUserForAncestralSerialNumber(11L);
assertThat(user).isEqualTo(UserHandle.of(NON_USER_SYSTEM));
}
@Test