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

Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 5c98cae298

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14806111

Change-Id: I5603fe721802538db00ed6263961fe0bc0cf61fd
This commit is contained in:
Chloris Kuo
2021-06-03 17:36:55 +00:00
committed by Automerger Merge Worker
parent 9816763dc0 5c98cae298
commit 0543feb1f7
1 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -3001,6 +3001,54 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(mAssistants, times(1)).getAllowedComponents(mContext.getUserId());
}
@Test
public void testSetNASMigrationDoneAndResetDefault_enableNAS() throws Exception {
int userId = 10;
when(mUm.getProfileIds(userId, false)).thenReturn(new int[]{userId});
mBinderService.setNASMigrationDoneAndResetDefault(userId, true);
assertTrue(mService.isNASMigrationDone(userId));
verify(mAssistants, times(1)).resetDefaultFromConfig();
}
@Test
public void testSetNASMigrationDoneAndResetDefault_disableNAS() throws Exception {
int userId = 10;
when(mUm.getProfileIds(userId, false)).thenReturn(new int[]{userId});
mBinderService.setNASMigrationDoneAndResetDefault(userId, false);
assertTrue(mService.isNASMigrationDone(userId));
verify(mAssistants, times(1)).clearDefaults();
}
@Test
public void testSetNASMigrationDoneAndResetDefault_multiProfile() throws Exception {
int userId1 = 11;
int userId2 = 12; //work profile
setUsers(new int[]{userId1, userId2});
when(mUm.isManagedProfile(userId2)).thenReturn(true);
when(mUm.getProfileIds(userId1, false)).thenReturn(new int[]{userId1, userId2});
mBinderService.setNASMigrationDoneAndResetDefault(userId1, true);
assertTrue(mService.isNASMigrationDone(userId1));
assertTrue(mService.isNASMigrationDone(userId2));
}
@Test
public void testSetNASMigrationDoneAndResetDefault_multiUser() throws Exception {
int userId1 = 11;
int userId2 = 12;
setUsers(new int[]{userId1, userId2});
when(mUm.getProfileIds(userId1, false)).thenReturn(new int[]{userId1});
when(mUm.getProfileIds(userId2, false)).thenReturn(new int[]{userId2});
mBinderService.setNASMigrationDoneAndResetDefault(userId1, true);
assertTrue(mService.isNASMigrationDone(userId1));
assertFalse(mService.isNASMigrationDone(userId2));
}
@Test
public void testSetDndAccessForUser() throws Exception {
UserHandle user = UserHandle.of(mContext.getUserId() + 10);