Merge "Update texts for Settings->Sound->Do not disturb"

This commit is contained in:
TreeHugger Robot
2017-02-16 02:51:37 +00:00
committed by Android (Google) Code Review
5 changed files with 125 additions and 55 deletions

View File

@@ -16,7 +16,10 @@
package com.android.settings.notification;
import android.app.NotificationManager;
import android.app.NotificationManager.Policy;
import android.content.Context;
import android.support.v7.preference.Preference;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -27,8 +30,13 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -36,6 +44,12 @@ public class ZenModePreferenceControllerTest {
@Mock
private Context mContext;
@Mock
private Preference mPreference;
@Mock
private NotificationManager mNotificationManager;
@Mock
private Policy mPolicy;
private ZenModePreferenceController mController;
@@ -43,6 +57,9 @@ public class ZenModePreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new ZenModePreferenceController(mContext);
when(mContext.getSystemService(Context.NOTIFICATION_SERVICE))
.thenReturn(mNotificationManager);
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
}
@Test
@@ -50,4 +67,22 @@ public class ZenModePreferenceControllerTest {
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void updateState_preferenceEnabled_shouldSetSummary() {
when(mPreference.isEnabled()).thenReturn(true);
mController.updateState(mPreference);
verify(mPreference).setSummary(anyString());
}
@Test
public void updateState_preferenceDisabled_shouldNotSetSummary() {
when(mPreference.isEnabled()).thenReturn(false);
mController.updateState(mPreference);
verify(mPreference, never()).setSummary(anyString());
}
}

View File

@@ -36,21 +36,20 @@ import static org.mockito.Mockito.spy;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeSettingsTest {
private ZenModeSettings mSettings;
private ZenModeSettings.SummaryBuilder mBuilder;
private Context mContext;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application.getApplicationContext();
mSettings = spy(ZenModeSettings.class);
doReturn(mContext).when(mSettings).getContext();
mBuilder = new ZenModeSettings.SummaryBuilder(mContext);
}
@Test
public void testAppend_conditionFalse_shouldNotAppend() {
String original = "test";
final String result = mSettings.append(original, false, R.string.zen_mode_alarms);
final String result = mBuilder.append(original, false, R.string.zen_mode_alarms);
assertThat(result).isEqualTo(original);
}
@@ -60,7 +59,7 @@ public class ZenModeSettingsTest {
String original = "test";
String alarm = mContext.getString(R.string.zen_mode_alarms);
final String result = mSettings.append(original, true, R.string.zen_mode_alarms);
final String result = mBuilder.append(original, true, R.string.zen_mode_alarms);
assertThat(result).contains(alarm);
}