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

Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4

Browse Source 
Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
This commit is contained in:
Julia Reynolds
2020-03-24 22:00:27 +00:00
committed by Automerger Merge Worker
parent a0ea8fb683 03c0421dc4
commit aaa0cc5238
6 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
View File

@@ -95,18 +95,16 @@ public class ConversationListPreferenceControllerTest {
@Test
public void testPopulateList_hideIfNoConversations() {
PreferenceCategory outerContainer = mock(PreferenceCategory.class);
PreferenceCategory innerContainer = mock(PreferenceCategory.class);
mController.populateList(new ArrayList<>(), outerContainer, innerContainer);
mController.populateList(new ArrayList<>(), outerContainer);
verify(outerContainer).setVisible(false);
verify(innerContainer, never()).addPreference(any());
verify(outerContainer, never()).addPreference(any());
}
@Test
public void testPopulateList_validConversations() {
PreferenceCategory outerContainer = mock(PreferenceCategory.class);
PreferenceCategory innerContainer = mock(PreferenceCategory.class);
ConversationChannelWrapper ccw = new ConversationChannelWrapper();
ccw.setNotificationChannel(mock(NotificationChannel.class));
@@ -117,10 +115,10 @@ public class ConversationListPreferenceControllerTest {
ArrayList<ConversationChannelWrapper> list = new ArrayList<>();
list.add(ccw);
mController.populateList(list, outerContainer, innerContainer);
mController.populateList(list, outerContainer);
verify(outerContainer).setVisible(true);
verify(innerContainer, times(1)).addPreference(any());
verify(outerContainer, times(1)).addPreference(any());
}
@Test
@@ -233,6 +231,11 @@ public class ConversationListPreferenceControllerTest {
super(context, backend);
}
@Override
boolean matchesFilter(ConversationChannelWrapper conversation) {
return true;
}
@Override
public String getPreferenceKey() {
return "test";