Merge "Rename MANUAL_DND to MANUAL_DND_ACTIVE in TestModeBuilder" into main (133e7309) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/notification/modes/TestModeBuilder.java

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -40,13 +40,18 @@ public class TestModeBuilder {
	private ZenModeConfig.ZenRule mConfigZenRule;		private ZenModeConfig.ZenRule mConfigZenRule;

	public static final ZenMode EXAMPLE = new TestModeBuilder().build();		public static final ZenMode EXAMPLE = new TestModeBuilder().build();
	public static final ZenMode MANUAL_DND = ZenMode.manualDndMode(		public static final ZenMode MANUAL_DND_ACTIVE = ZenMode.manualDndMode(
	new AutomaticZenRule.Builder("Manual DND", Uri.parse("rule://dnd"))		new AutomaticZenRule.Builder("Do Not Disturb", Uri.parse("rule://dnd"))
	.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)		.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)
	.setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())		.setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())
	.build(),		.build(),
	true /* isActive */		/* isActive= */ true);
	);		public static final ZenMode MANUAL_DND_INACTIVE = ZenMode.manualDndMode(
			new AutomaticZenRule.Builder("Do Not Disturb", Uri.parse("rule://dnd"))
			.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)
			.setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())
			.build(),
			/* isActive= */ false);

	public TestModeBuilder() {		public TestModeBuilder() {
	// Reasonable defaults		// Reasonable defaults

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -172,7 +172,7 @@ class ZenModeInteractorTest : SysuiTestCase() {
	@Test		@Test
	fun shouldAskForZenDuration_changesWithSetting() =		fun shouldAskForZenDuration_changesWithSetting() =
	testScope.runTest {		testScope.runTest {
	val manualDnd = TestModeBuilder.MANUAL_DND		val manualDnd = TestModeBuilder.MANUAL_DND_ACTIVE

	settingsRepository.setInt(ZEN_DURATION, ZEN_DURATION_FOREVER)		settingsRepository.setInt(ZEN_DURATION, ZEN_DURATION_FOREVER)
	runCurrent()		runCurrent()
	@@ -201,7 +201,7 @@ class ZenModeInteractorTest : SysuiTestCase() {
	@Test		@Test
	fun activateMode_usesCorrectDuration() =		fun activateMode_usesCorrectDuration() =
	testScope.runTest {		testScope.runTest {
	val manualDnd = TestModeBuilder.MANUAL_DND		val manualDnd = TestModeBuilder.MANUAL_DND_ACTIVE
	zenModeRepository.addModes(listOf(manualDnd))		zenModeRepository.addModes(listOf(manualDnd))
	settingsRepository.setInt(ZEN_DURATION, ZEN_DURATION_FOREVER)		settingsRepository.setInt(ZEN_DURATION, ZEN_DURATION_FOREVER)
	runCurrent()		runCurrent()

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ class ModesDialogViewModelTest : SysuiTestCase() {
	.setName("Disabled by other")		.setName("Disabled by other")
	.setEnabled(false, /* byUser= */ false)		.setEnabled(false, /* byUser= */ false)
	.build(),		.build(),
	TestModeBuilder.MANUAL_DND,		TestModeBuilder.MANUAL_DND_ACTIVE,
	TestModeBuilder()		TestModeBuilder()
	.setName("Enabled")		.setName("Enabled")
	.setEnabled(true)		.setEnabled(true)
	@@ -91,7 +91,7 @@ class ModesDialogViewModelTest : SysuiTestCase() {
	assertThat(this.enabled).isEqualTo(false)		assertThat(this.enabled).isEqualTo(false)
	}		}
	with(tiles?.elementAt(1)!!) {		with(tiles?.elementAt(1)!!) {
	assertThat(this.text).isEqualTo("Manual DND")		assertThat(this.text).isEqualTo("Do Not Disturb")
	assertThat(this.subtext).isEqualTo("On")		assertThat(this.subtext).isEqualTo("On")
	assertThat(this.enabled).isEqualTo(true)		assertThat(this.enabled).isEqualTo(true)
	}		}