From 6a725695b7af99ea1a02217fce06da55273e22c2 Mon Sep 17 00:00:00 2001 From: Oli Thompson Date: Wed, 29 Nov 2023 15:06:22 +0000 Subject: [PATCH] Fix broken ManagedProfileQuietModeEnablerTest test Bug: 313573729 Test: atest ManagedProfileQuietModeEnablerTest Change-Id: I33eb9763e92f3060e65a3e7e498cad965aa55600 --- .../accounts/ManagedProfileQuietModeEnablerTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/accounts/ManagedProfileQuietModeEnablerTest.java b/tests/robotests/src/com/android/settings/accounts/ManagedProfileQuietModeEnablerTest.java index c003de2c0f8..1a0f9d0600a 100644 --- a/tests/robotests/src/com/android/settings/accounts/ManagedProfileQuietModeEnablerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ManagedProfileQuietModeEnablerTest.java @@ -35,6 +35,8 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.platform.test.annotations.RequiresFlagsEnabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleOwner; @@ -42,7 +44,7 @@ import androidx.lifecycle.LifecycleRegistry; import androidx.test.core.app.ApplicationProvider; import org.junit.Before; -import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -70,6 +72,9 @@ public class ManagedProfileQuietModeEnablerTest { } }; + @Rule + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + @ParameterizedRobolectricTestRunner.Parameters public static List params() { return Arrays.asList(true, false); @@ -112,7 +117,6 @@ public class ManagedProfileQuietModeEnablerTest { verify(mUserManager).requestQuietModeEnabled(mEnable, mManagedUser); } - @Ignore("b/313573729") @Test @RequiresFlagsEnabled(Flags.FLAG_QUIET_MODE_CREDENTIAL_BUG_FIX) public void onSetQuietMode_ifQuietModeAlreadyInDesiredState_shouldNotRequestQuietModeEnabled() {