From 0721f5c5b2480fb43c3add8e7ec4b3b10da0d71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Hern=C3=A1ndez?= Date: Fri, 2 Aug 2024 19:01:04 +0200 Subject: [PATCH] Replace direct usage of update origin by TestModeBuilder.setEnabled() overload Bug: 333527800 Test: atest ZenModesListItemPreferenceTest Flag: android.app.modes_ui Change-Id: Ice6144b8a15641703495d18b57f5b56cda91e92a --- .../modes/ZenModesListItemPreferenceTest.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java index ea45a71d057..1c8e96e7d86 100644 --- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java @@ -22,7 +22,6 @@ import android.app.Flags; import android.content.Context; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; -import android.service.notification.ZenModeConfig; import com.android.settingslib.notification.modes.TestModeBuilder; import com.android.settingslib.notification.modes.ZenMode; @@ -94,14 +93,10 @@ public class ZenModesListItemPreferenceTest { @Test public void setZenMode_modeDisabledByApp() { - ZenModeConfig.ZenRule configRule = new ZenModeConfig.ZenRule(); - configRule.enabled = false; - configRule.disabledOrigin = ZenModeConfig.UPDATE_ORIGIN_APP; ZenMode mode = new TestModeBuilder() .setName("Mode disabled by app") .setTriggerDescription("When the cat's away") - .setEnabled(false) - .setConfigZenRule(configRule) + .setEnabled(false, /* byUser= */ false) .build(); ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode); @@ -114,14 +109,10 @@ public class ZenModesListItemPreferenceTest { @Test public void setZenMode_modeDisabledByUser() { - ZenModeConfig.ZenRule configRule = new ZenModeConfig.ZenRule(); - configRule.enabled = false; - configRule.disabledOrigin = ZenModeConfig.UPDATE_ORIGIN_USER; ZenMode mode = new TestModeBuilder() .setName("Mode disabled by user") .setTriggerDescription("When the Levee Breaks") - .setEnabled(false) - .setConfigZenRule(configRule) + .setEnabled(false, /* byUser= */ true) .build(); ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);