diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 88df549d478..1d5f09ebe4d 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -18,16 +18,14 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.app.NotificationManager.Policy; +import android.content.Context; import android.os.Bundle; +import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.SettingsActivity; public class ZenModeSettings extends ZenModeSettingsBase { private static final String KEY_PRIORITY_SETTINGS = "priority_settings"; @@ -80,25 +78,25 @@ public class ZenModeSettings extends ZenModeSettingsBase { private void updatePrioritySettingsSummary() { String s = getResources().getString(R.string.zen_mode_alarms); - s = appendLowercase(s, isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_REMINDERS), + s = append(s, isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_REMINDERS), R.string.zen_mode_reminders); - s = appendLowercase(s, isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_EVENTS), + s = append(s, isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_EVENTS), R.string.zen_mode_events); if (isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_MESSAGES)) { if (mPolicy.priorityMessageSenders == Policy.PRIORITY_SENDERS_ANY) { - s = appendLowercase(s, true, R.string.zen_mode_all_messages); + s = append(s, true, R.string.zen_mode_all_messages); } else { - s = appendLowercase(s, true, R.string.zen_mode_selected_messages); + s = append(s, true, R.string.zen_mode_selected_messages); } } if (isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_CALLS)) { if (mPolicy.priorityCallSenders == Policy.PRIORITY_SENDERS_ANY) { - s = appendLowercase(s, true, R.string.zen_mode_all_callers); + s = append(s, true, R.string.zen_mode_all_callers); } else { - s = appendLowercase(s, true, R.string.zen_mode_selected_callers); + s = append(s, true, R.string.zen_mode_selected_callers); } } else if (isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_REPEAT_CALLERS)) { - s = appendLowercase(s, true, R.string.zen_mode_repeat_callers); + s = append(s, true, R.string.zen_mode_repeat_callers); } mPrioritySettings.setSummary(s); } @@ -124,10 +122,11 @@ public class ZenModeSettings extends ZenModeSettingsBase { return (policy.priorityCategories & categoryType) != 0; } - private String appendLowercase(String s, boolean condition, int resId) { + @VisibleForTesting + String append(String s, boolean condition, int resId) { if (condition) { - return getResources().getString(R.string.join_many_items_middle, s, - getResources().getString(resId).toLowerCase()); + final Context context = getContext(); + return context.getString(R.string.join_many_items_middle, s, context.getString(resId)); } return s; } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java new file mode 100644 index 00000000000..40cfed54ead --- /dev/null +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.notification; + +import android.content.Context; + +import com.android.settings.R; +import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class ZenModeSettingsTest { + + private ZenModeSettings mSettings; + private Context mContext; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application.getApplicationContext(); + mSettings = spy(ZenModeSettings.class); + doReturn(mContext).when(mSettings).getContext(); + } + + @Test + public void testAppend_conditionFalse_shouldNotAppend() { + String original = "test"; + + final String result = mSettings.append(original, false, R.string.zen_mode_alarms); + + assertThat(result).isEqualTo(original); + } + + @Test + public void testAppend_conditionTrue_shouldAppend() { + String original = "test"; + String alarm = mContext.getString(R.string.zen_mode_alarms); + + final String result = mSettings.append(original, true, R.string.zen_mode_alarms); + + assertThat(result).contains(alarm); + } + +}