From d91824db270ef41f560ce33f847f142ca93a38a4 Mon Sep 17 00:00:00 2001 From: Omer Ozer Date: Wed, 7 Feb 2024 19:04:03 +0000 Subject: [PATCH] Disable nfc foreground tests when the role flag is disabled. Bug: 315194263 Test: SettingsRoboTests:com.android.settings.nfc.NfcForegroundPreferenceControllerTest Change-Id: I21037ac3323d4a0322c10450be0dfbb8c9d0d3a0 --- .../nfc/NfcForegroundPreferenceControllerTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java index 63fa320fbe2..56326ef185f 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java @@ -25,6 +25,9 @@ import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.PackageManager; +import android.platform.test.annotations.RequiresFlagsDisabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; @@ -33,6 +36,7 @@ import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -43,10 +47,14 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; @RunWith(RobolectricTestRunner.class) +@RequiresFlagsDisabled(android.permission.flags.Flags.FLAG_WALLET_ROLE_ENABLED) public class NfcForegroundPreferenceControllerTest { private static final String PREF_KEY = PaymentSettingsTest.FOREGROUND_KEY; + @Rule + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + @Mock private PaymentBackend mPaymentBackend; @Mock