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

Merge "Notification settings updates" into pi-dev am: d7a1c39694

Browse Source 
am: 88fa6fd0fb

Change-Id: I5771abecd37d732e11dbf9c7f1c31ac6b7993d6c
This commit is contained in:
Julia Reynolds
2018-04-10 07:06:39 -07:00
committed by android-build-merger
parent d1a6a71567 88fa6fd0fb
commit 15dcf14191
14 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
View File

@@ -109,6 +109,11 @@ public class HeaderPreferenceControllerTest {
NotificationChannel channel = new NotificationChannel("cid", "cname", IMPORTANCE_NONE);
mController.onResume(appRow, channel, group, null);
assertEquals(channel.getName(), mController.getLabel());
NotificationChannel defaultChannel = new NotificationChannel(
NotificationChannel.DEFAULT_CHANNEL_ID, "", IMPORTANCE_NONE);
mController.onResume(appRow, defaultChannel, null, null);
assertEquals(appRow.label, mController.getLabel());
}
@Test
@@ -130,5 +135,10 @@ public class HeaderPreferenceControllerTest {
mController.onResume(appRow, channel, null, null);
assertFalse(mController.getSummary().toString().contains(group.getName()));
assertTrue(mController.getSummary().toString().contains(appRow.label));
NotificationChannel defaultChannel = new NotificationChannel(
NotificationChannel.DEFAULT_CHANNEL_ID, "", IMPORTANCE_NONE);
mController.onResume(appRow, defaultChannel, null, null);
assertEquals("", mController.getSummary());
}
}

24
tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
View File

@@ -294,6 +294,30 @@ public class NotificationPreferenceControllerTest {
assertTrue(mController.isChannelGroupBlockable());
}
@Test
public void testIsDefaultChannel_noChannel() {
mController.onResume(mock(NotificationBackend.AppRow.class), null, null, null);
assertFalse(mController.isDefaultChannel());
}
@Test
public void testIsDefaultChannel_nonDefaultChannel() {
NotificationChannel channel = mock(NotificationChannel.class);
mController.onResume(mock(NotificationBackend.AppRow.class), channel, null, null);
assertFalse(mController.isDefaultChannel());
}
@Test
public void testIsDefaultChannel() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn(NotificationChannel.DEFAULT_CHANNEL_ID);
mController.onResume(mock(NotificationBackend.AppRow.class), channel, null, null);
assertTrue(mController.isDefaultChannel());
}
private final class TestPreferenceController extends NotificationPreferenceController {
private TestPreferenceController(Context context, NotificationBackend backend) {