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

Merge "Update usages of TestModeBuilder" into main

Browse Source
This commit is contained in:
Ioana Alexandru
2025-01-09 13:46:05 -08:00
committed by Android (Google) Code Review
parent ee449cebde 0bb0d0c402
commit 2da22cd198
12 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/notification/modes/InterruptionFilterPreferenceControllerTest.java
View File

@@ -71,7 +71,7 @@ public final class InterruptionFilterPreferenceControllerTest {
@Test
public void updateState_dnd_enabled() {
TwoStatePreference preference = mock(TwoStatePreference.class);
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
ZenMode dnd = TestModeBuilder.MANUAL_DND;
mController.updateState(preference, dnd);
@@ -81,7 +81,11 @@ public final class InterruptionFilterPreferenceControllerTest {
@Test
public void updateState_specialDnd_disabled() {
TwoStatePreference preference = mock(TwoStatePreference.class);
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
ZenMode specialDnd = new TestModeBuilder()
.makeManualDnd()
.setInterruptionFilter(INTERRUPTION_FILTER_NONE)
.setActive(true)
.build();
mController.updateState(preference, specialDnd);

3
tests/robotests/src/com/android/settings/notification/modes/ManualDurationPreferenceControllerTest.java
View File

@@ -70,8 +70,7 @@ public class ManualDurationPreferenceControllerTest {
@Test
public void testIsAvailable_onlyForManualDnd() {
assertThat(mPrefController.isAvailable(TestModeBuilder.EXAMPLE)).isFalse();
assertThat(mPrefController.isAvailable(TestModeBuilder.MANUAL_DND_ACTIVE)).isTrue();
assertThat(mPrefController.isAvailable(TestModeBuilder.MANUAL_DND_INACTIVE)).isTrue();
assertThat(mPrefController.isAvailable(TestModeBuilder.MANUAL_DND)).isTrue();
}
@Test

9
tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
View File

@@ -63,7 +63,6 @@ import com.android.settingslib.notification.modes.TestModeBuilder;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.notification.modes.ZenModesBackend;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.MoreExecutors;
import org.junit.Before;
@@ -153,14 +152,18 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
@Test
public void updateState_dnd_enabled() {
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
ZenMode dnd = TestModeBuilder.MANUAL_DND;
mController.updateState(mPreference, dnd);
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
public void updateState_specialDnd_disabled() {
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
ZenMode specialDnd = new TestModeBuilder()
.makeManualDnd()
.setInterruptionFilter(INTERRUPTION_FILTER_NONE)
.setActive(true)
.build();
mController.updateState(mPreference, specialDnd);
assertThat(mPreference.isEnabled()).isFalse();
}

4
tests/robotests/src/com/android/settings/notification/modes/ZenModeButtonPreferenceControllerTest.java
View File

@@ -190,7 +190,7 @@ public final class ZenModeButtonPreferenceControllerTest {
Button button = new Button(mContext);
LayoutPreference pref = mock(LayoutPreference.class);
when(pref.findViewById(anyInt())).thenReturn(button);
ZenMode zenMode = TestModeBuilder.MANUAL_DND_INACTIVE;
ZenMode zenMode = TestModeBuilder.MANUAL_DND;
mController.updateZenMode(pref, zenMode);
button.callOnClick();
@@ -204,7 +204,7 @@ public final class ZenModeButtonPreferenceControllerTest {
Button button = new Button(mContext);
LayoutPreference pref = mock(LayoutPreference.class);
when(pref.findViewById(anyInt())).thenReturn(button);
ZenMode zenMode = TestModeBuilder.MANUAL_DND_INACTIVE;
ZenMode zenMode = TestModeBuilder.MANUAL_DND;
mController.updateZenMode(pref, zenMode);
button.callOnClick();

8
tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceControllerTest.java
View File

@@ -68,7 +68,7 @@ public final class ZenModeDisplayLinkPreferenceControllerTest {
@Test
public void updateState_dnd_enabled() {
Preference preference = mock(Preference.class);
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
ZenMode dnd = TestModeBuilder.MANUAL_DND;
mController.updateState(preference, dnd);
@@ -78,7 +78,11 @@ public final class ZenModeDisplayLinkPreferenceControllerTest {
@Test
public void updateState_specialDnd_disabled() {
Preference preference = mock(Preference.class);
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
ZenMode specialDnd = new TestModeBuilder()
.makeManualDnd()
.setInterruptionFilter(INTERRUPTION_FILTER_NONE)
.setActive(true)
.build();
mController.updateState(preference, specialDnd);

8
tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceControllerTest.java
View File

@@ -66,7 +66,7 @@ public final class ZenModeOtherLinkPreferenceControllerTest {
@Test
public void updateState_dnd_enabled() {
CircularIconsPreference preference = mock(CircularIconsPreference.class);
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
ZenMode dnd = TestModeBuilder.MANUAL_DND;
mController.updateState(preference, dnd);
@@ -76,7 +76,11 @@ public final class ZenModeOtherLinkPreferenceControllerTest {
@Test
public void updateState_specialDnd_disabled() {
CircularIconsPreference preference = mock(CircularIconsPreference.class);
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
ZenMode specialDnd = new TestModeBuilder()
.makeManualDnd()
.setInterruptionFilter(INTERRUPTION_FILTER_NONE)
.setActive(true)
.build();
mController.updateState(preference, specialDnd);

8
tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
View File

@@ -120,14 +120,18 @@ public final class ZenModePeopleLinkPreferenceControllerTest {
@Test
public void updateState_dnd_enabled() {
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
ZenMode dnd = TestModeBuilder.MANUAL_DND;
mController.updateState(mPreference, dnd);
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
public void updateState_specialDnd_disabled() {
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
ZenMode specialDnd = new TestModeBuilder()
.makeManualDnd()
.setInterruptionFilter(INTERRUPTION_FILTER_NONE)
.setActive(true)
.build();
mController.updateState(mPreference, specialDnd);
assertThat(mPreference.isEnabled()).isFalse();
}

10
tests/robotests/src/com/android/settings/notification/modes/ZenModeSummaryHelperTest.java
View File

@@ -529,7 +529,7 @@ public class ZenModeSummaryHelperTest {
@Test
public void getModesSummary_excludesImplicitModes() {
ImmutableList<ZenMode> modes = ImmutableList.of(
TestModeBuilder.MANUAL_DND_INACTIVE,
TestModeBuilder.MANUAL_DND,
new TestModeBuilder().implicitForPackage("com.annoying.one").build(),
new TestModeBuilder().setName("Chirping").build()
);
@@ -541,7 +541,7 @@ public class ZenModeSummaryHelperTest {
@Test
public void getModesSummary_oneModeActive_listsActiveMode() {
ImmutableList<ZenMode> modes = ImmutableList.of(
TestModeBuilder.MANUAL_DND_ACTIVE,
new TestModeBuilder().makeManualDnd().setActive(true).build(),
new TestModeBuilder().setName("Inactive").setActive(false).build());
String summary = mSummaryHelper.getModesSummary(modes);
@@ -551,7 +551,7 @@ public class ZenModeSummaryHelperTest {
@Test
public void getModesSummary_twoModesActive_listsActiveModes() {
ImmutableList<ZenMode> modes = ImmutableList.of(
TestModeBuilder.MANUAL_DND_ACTIVE,
new TestModeBuilder().makeManualDnd().setActive(true).build(),
new TestModeBuilder().setName("Inactive").setActive(false).build(),
new TestModeBuilder().setName("Active #1").setActive(true).build());
@@ -562,7 +562,7 @@ public class ZenModeSummaryHelperTest {
@Test
public void getModesSummary_threeModesActive_listsActiveModes() {
ImmutableList<ZenMode> modes = ImmutableList.of(
TestModeBuilder.MANUAL_DND_INACTIVE,
TestModeBuilder.MANUAL_DND,
new TestModeBuilder().setName("Inactive #1").setActive(false).build(),
new TestModeBuilder().setName("Active #1").setActive(true).build(),
new TestModeBuilder().setName("Active #2").setActive(true).build(),
@@ -576,7 +576,7 @@ public class ZenModeSummaryHelperTest {
@Test
public void getModesSummary_manyModesActive_listsSomeActiveModes() {
ImmutableList<ZenMode> modes = ImmutableList.of(
TestModeBuilder.MANUAL_DND_ACTIVE,
new TestModeBuilder().makeManualDnd().setActive(true).build(),
new TestModeBuilder().setName("Inactive #1").setActive(false).build(),
new TestModeBuilder().setName("Active #1").setActive(true).build(),
new TestModeBuilder().setName("Active #2").setActive(true).build(),

2
tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceControllerTest.java
View File

@@ -123,7 +123,7 @@ public class ZenModeTriggerAddPreferenceControllerTest {
@Test
public void isAvailable_manualDND_false() {
mController.setZenMode(TestModeBuilder.MANUAL_DND_INACTIVE);
mController.setZenMode(TestModeBuilder.MANUAL_DND);
assertThat(mController.isAvailable()).isFalse();
}

2
tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceControllerTest.java
View File

@@ -113,7 +113,7 @@ public class ZenModeTriggerCategoryPreferenceControllerTest {
@Test
public void isAvailable_manualDND_false() {
mController.setZenMode(TestModeBuilder.MANUAL_DND_INACTIVE);
mController.setZenMode(TestModeBuilder.MANUAL_DND);
assertThat(mController.isAvailable()).isFalse();
}
}

2
tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java
View File

@@ -148,7 +148,7 @@ public class ZenModeTriggerUpdatePreferenceControllerTest {
@Test
public void isAvailable_manualDND_false() {
mController.setZenMode(TestModeBuilder.MANUAL_DND_INACTIVE);
mController.setZenMode(TestModeBuilder.MANUAL_DND);
assertThat(mController.isAvailable()).isFalse();
}

12
tests/robotests/src/com/android/settings/notification/modes/ZenModesListPreferenceControllerTest.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static com.android.settingslib.notification.modes.TestModeBuilder.MANUAL_DND_INACTIVE;
import static com.android.settingslib.notification.modes.TestModeBuilder.MANUAL_DND;
import static com.google.common.truth.Truth.assertThat;
@@ -150,7 +150,7 @@ public class ZenModesListPreferenceControllerTest {
@DisableFlags(Flags.FLAG_MODES_UI)
public void testModesUiOff_notAvailableAndNoSearchData() {
// There exist modes
when(mBackend.getModes()).thenReturn(List.of(MANUAL_DND_INACTIVE, TEST_MODE));
when(mBackend.getModes()).thenReturn(List.of(MANUAL_DND, TEST_MODE));
assertThat(mPrefController.isAvailable()).isFalse();
List<SearchIndexableRaw> data = new ArrayList<>();
@@ -185,20 +185,20 @@ public class ZenModesListPreferenceControllerTest {
// Changing mode data so there's a different one mode doesn't keep any previous data
// (and setting that state up in the caller)
when(mBackend.getModes()).thenReturn(List.of(MANUAL_DND_INACTIVE));
when(mBackend.getModes()).thenReturn(List.of(MANUAL_DND));
List<SearchIndexableRaw> newData = new ArrayList<>();
mPrefController.updateDynamicRawDataToIndex(newData);
assertThat(newData).hasSize(1);
SearchIndexableRaw newItem = newData.get(0);
assertThat(newItem.key).isEqualTo(MANUAL_DND_INACTIVE.getId());
assertThat(newItem.key).isEqualTo(MANUAL_DND.getId());
assertThat(newItem.title).isEqualTo("Do Not Disturb"); // set above
}
@Test
@EnableFlags(Flags.FLAG_MODES_UI)
public void testUpdateDynamicRawDataToIndex_multipleModes() {
when(mBackend.getModes()).thenReturn(List.of(MANUAL_DND_INACTIVE, TEST_MODE));
when(mBackend.getModes()).thenReturn(List.of(MANUAL_DND, TEST_MODE));
List<SearchIndexableRaw> data = new ArrayList<>();
mPrefController.updateDynamicRawDataToIndex(data);
@@ -206,7 +206,7 @@ public class ZenModesListPreferenceControllerTest {
// Should keep the order presented by getModes()
SearchIndexableRaw item0 = data.get(0);
assertThat(item0.key).isEqualTo(MANUAL_DND_INACTIVE.getId());
assertThat(item0.key).isEqualTo(MANUAL_DND.getId());
assertThat(item0.title).isEqualTo("Do Not Disturb"); // set above
SearchIndexableRaw item1 = data.get(1);