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

Zen priority settings update

Browse Source 
Reordering & adding summary

Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes: 63712680
Test: RunSettingsRoboTests
This commit is contained in:
Julia Reynolds
2017-07-17 10:33:04 -04:00
parent fdd294ef4c
commit 78f612b823
4 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification;
import android.app.NotificationManager;
import android.content.Context;
import com.android.settings.R;
@@ -30,6 +31,8 @@ import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.assertTrue;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeSettingsTest {
@@ -60,6 +63,38 @@ public class ZenModeSettingsTest {
final String result = mBuilder.append(original, true, R.string.zen_mode_alarms);
assertThat(result).contains(alarm);
assertThat(result).contains(original);
assertTrue(result.indexOf(original) < result.indexOf(alarm));
}
@Test
public void testPrepend() {
String original = mContext.getString(R.string.zen_mode_alarms);
String reminders = mContext.getString(R.string.zen_mode_reminders);
final String result = mBuilder.prepend(original, true, R.string.zen_mode_reminders);
assertThat(result).contains(original);
assertThat(result).contains(reminders);
assertTrue(result.indexOf(reminders) < result.indexOf(original));
}
@Test
public void testGetPrioritySettingSummary_sameOrderAsTargetPage() {
NotificationManager.Policy policy = new NotificationManager.Policy(
NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS
| NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
0, 0);
final String result = mBuilder.getPrioritySettingSummary(policy);
String alarms = mContext.getString(R.string.zen_mode_alarms);
String reminders = mContext.getString(R.string.zen_mode_reminders);
String events = mContext.getString(R.string.zen_mode_events);
assertThat(result).contains(alarms);
assertThat(result).contains(reminders);
assertThat(result).contains(events);
assertTrue(result.indexOf(reminders) < result.indexOf(events) &&
result.indexOf(events) < result.indexOf(alarms));
}
}