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

Merge "Fix VisibilityPreferenceControllerTest."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-11 18:45:33 +00:00
committed by Android (Google) Code Review
parent bbdeafe58b 8f68856823
commit d3d1cf75cb
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
View File

@@ -205,9 +205,10 @@ public class VisibilityPreferenceControllerTest {
RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class); RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
mController.updateState(pref); mController.updateState(pref);
ArgumentCaptor<String[]> argumentCaptor = ArgumentCaptor.forClass(String[].class); ArgumentCaptor<CharSequence[]> argumentCaptor =
ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
assertFalse(Arrays.asList(argumentCaptor.getValue()) assertFalse(toStringList(argumentCaptor.getValue())
.contains(VISIBILITY_NO_OVERRIDE)); .contains(VISIBILITY_NO_OVERRIDE));
} }
@@ -223,9 +224,10 @@ public class VisibilityPreferenceControllerTest {
RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class); RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
mController.updateState(pref); mController.updateState(pref);
ArgumentCaptor<String[]> argumentCaptor = ArgumentCaptor.forClass(String[].class); ArgumentCaptor<CharSequence[]> argumentCaptor =
ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
assertFalse(Arrays.asList(argumentCaptor.getValue()) assertFalse(toStringList(argumentCaptor.getValue())
.contains(VISIBILITY_NO_OVERRIDE)); .contains(VISIBILITY_NO_OVERRIDE));
} }
@@ -238,15 +240,24 @@ public class VisibilityPreferenceControllerTest {
RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class); RestrictedDropDownPreference pref = mock(RestrictedDropDownPreference.class);
mController.updateState(pref); mController.updateState(pref);
ArgumentCaptor<String[]> argumentCaptor = ArgumentCaptor.forClass(String[].class); ArgumentCaptor<CharSequence[]> argumentCaptor =
ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
List<String> values = Arrays.asList(argumentCaptor.getValue()); List<String> values = toStringList(argumentCaptor.getValue());
assertEquals(3, values.size()); assertEquals(3, values.size());
assertTrue(values.contains(String.valueOf(VISIBILITY_NO_OVERRIDE))); assertTrue(values.contains(String.valueOf(VISIBILITY_NO_OVERRIDE)));
assertTrue(values.contains(String.valueOf(Notification.VISIBILITY_PRIVATE))); assertTrue(values.contains(String.valueOf(Notification.VISIBILITY_PRIVATE)));
assertTrue(values.contains(String.valueOf(Notification.VISIBILITY_SECRET))); assertTrue(values.contains(String.valueOf(Notification.VISIBILITY_SECRET)));
} }
private static List<String> toStringList(CharSequence[] charSequences) {
List<String> result = new ArrayList<>();
for (CharSequence charSequence : charSequences) {
result.add(charSequence.toString());
}
return result;
}
@Test @Test
public void testUpdateState_noChannelOverride() throws Exception { public void testUpdateState_noChannelOverride() throws Exception {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),