From fea8025268eb6cd8a8ffa8a88a0082ddfa948ceb Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Wed, 20 Nov 2019 18:14:24 -0500 Subject: [PATCH] Unit tests for Override default assistant unit test were removed by acccident in CL https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/9764495 Test: atest NotificationManagerServiceTest Change-Id: I6de44390c6225a68ecf58fde278733307d7f70ab --- .../NotificationManagerServiceTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 4d0cfbc6ad11d..21de668e10c3a 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -57,6 +57,7 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; @@ -657,6 +658,43 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { return nrSummary; } + @Test + public void testDefaultAssistant_overrideDefault() { + final int userId = 0; + final String testComponent = "package/class"; + final List userInfos = new ArrayList<>(); + userInfos.add(new UserInfo(0, "", 0)); + final ArraySet validAssistants = new ArraySet<>(); + validAssistants.add(ComponentName.unflattenFromString(testComponent)); + final String originalComponent = DeviceConfig.getProperty( + DeviceConfig.NAMESPACE_SYSTEMUI, + SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE + ); + DeviceConfig.setProperty( + DeviceConfig.NAMESPACE_SYSTEMUI, + SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE, + testComponent, + false + ); + when(mActivityManager.isLowRamDevice()).thenReturn(false); + when(mAssistants.queryPackageForServices(isNull(), anyInt(), anyInt())) + .thenReturn(validAssistants); + when(mAssistants.getDefaultComponents()).thenReturn(new ArraySet<>()); + when(mUm.getEnabledProfiles(anyInt())).thenReturn(userInfos); + + mService.setDefaultAssistantForUser(userId); + + verify(mAssistants).setPackageOrComponentEnabled( + eq(testComponent), eq(userId), eq(true), eq(true)); + + DeviceConfig.setProperty( + DeviceConfig.NAMESPACE_SYSTEMUI, + SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE, + originalComponent, + false + ); + } + @Test public void testCreateNotificationChannels_SingleChannel() throws Exception { final NotificationChannel channel =