From 9d01fe6823c3172d852dc0138e403ea72b561c34 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Mon, 11 Dec 2017 17:36:39 +0000 Subject: [PATCH] Fix assertion in VisibilityPreferenceControllerTest. The test was asserting that VISIBILIY_NO_OVERRIDE (an int) is not contained in a List (*), which is (trivially) true but doesn't test what the test intends to test. (*) or a List, which is similarly wrong / meaningless, prior to the base CL http://ag/3345932 VisibilityPreferenceController uses Integer.toString() to construct corresponding String values, so the test should be checking for that String value. For consistency with testUpdateState_noGlobalRestriction() this CL uses the equivalent (and slightly shorter) String.valueOf(int) instead of Integer.toString(). Test: EXPERIMENTAL_USE_OPENJDK9=1.8 make RunSettingsRoboTests \ ROBOTEST_FILTER=VisibilityPreferenceControllerTest Change-Id: I48644729d3e0f29d7ffcc981aeef650f2b1426ef --- .../notification/VisibilityPreferenceControllerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index d0d8a25de9f..c18372c78bf 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -209,7 +209,7 @@ public class VisibilityPreferenceControllerTest { ArgumentCaptor.forClass(CharSequence[].class); verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); assertFalse(toStringList(argumentCaptor.getValue()) - .contains(VISIBILITY_NO_OVERRIDE)); + .contains(String.valueOf(VISIBILITY_NO_OVERRIDE))); } @Test @@ -228,7 +228,7 @@ public class VisibilityPreferenceControllerTest { ArgumentCaptor.forClass(CharSequence[].class); verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); assertFalse(toStringList(argumentCaptor.getValue()) - .contains(VISIBILITY_NO_OVERRIDE)); + .contains(String.valueOf(VISIBILITY_NO_OVERRIDE))); } @Test