PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notification summary updates

Browse Source 
- Fix app info summary
- Add configure notifications summary

Test: make -j RunSettingsRoboTests
Change-Id: Ic3c3036ee903fe7403032925a8145693807793d5
Fixes: 77598357
Fixes: 73018368
This commit is contained in:
Julia Reynolds
2018-04-12 12:24:25 -04:00
parent e6750d6c2d
commit f5d1f165eb
7 changed files with 142 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
View File

@@ -150,4 +150,13 @@ public class AppNotificationPreferenceControllerTest {
appRow.channelCount = 10;
assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo("On");
}
@Test
public void getNotificationSummary_noChannels() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = false;
appRow.blockedChannelCount = 0;
appRow.channelCount = 0;
assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo("On");
}
}

64
tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
View File

@@ -17,17 +17,35 @@
package com.android.settings.notification;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN_WORK_PROFILE;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
import static com.android.settings.notification.ConfigureNotificationSettings
.KEY_LOCKSCREEN_WORK_PROFILE;
import static com.android.settings.notification.ConfigureNotificationSettings
.KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
import static com.android.settings.notification.ConfigureNotificationSettings
.SUMMARY_PROVIDER_FACTORY;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.notification.ConfigureNotificationSettings.SummaryProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -36,6 +54,13 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
public class ConfigureNotificationSettingsTest {
private Activity mActivity;
@Before
public void setUp() {
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
}
@Test
@Config(shadows = {
ShadowUtils.class,
@@ -49,4 +74,39 @@ public class ConfigureNotificationSettingsTest {
KEY_SWIPE_DOWN, KEY_LOCKSCREEN, KEY_LOCKSCREEN_WORK_PROFILE,
KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
}
@Test
public void getSummary_noneBlocked() {
SummaryLoader loader = mock(SummaryLoader.class);
NotificationBackend backend = mock(NotificationBackend.class);
when(backend.getBlockedAppCount()).thenReturn(0);
SummaryProvider provider =
(SummaryProvider) SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
provider.setBackend(backend);
provider.setListening(true);
ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);
verify(loader).setSummary(any(), captor.capture());
assertThat(captor.getValue().toString()).contains("On");
}
@Test
public void getSummary_someBlocked() {
SummaryLoader loader = mock(SummaryLoader.class);
NotificationBackend backend = mock(NotificationBackend.class);
when(backend.getBlockedAppCount()).thenReturn(5);
SummaryProvider provider =
(SummaryProvider) SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
provider.setBackend(backend);
provider.setListening(true);
ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);
verify(loader).setSummary(any(), captor.capture());
assertThat(captor.getValue().toString()).contains("Off");
assertThat(captor.getValue().toString()).contains("5");
}
}