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

Merge "Use CheckFlagsRule when the test requires the device's implementation" into main

Browse Source
This commit is contained in:
Chun-Ku Lin
2024-05-29 03:10:17 +00:00
committed by Android (Google) Code Review
parent e6c6b24f1e 0122f8a1dc
commit a384bb2cbc
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
View File

@@ -25,9 +25,10 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.RequiresFlagsDisabled;
import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.SetFlagsRule; import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import android.provider.Settings; import android.provider.Settings;
import android.view.accessibility.Flags; import android.view.accessibility.Flags;
@@ -61,7 +62,7 @@ public class PreferredShortcutsTest {
private static final ContentResolver sContentResolver = private static final ContentResolver sContentResolver =
ApplicationProvider.getApplicationContext().getContentResolver(); ApplicationProvider.getApplicationContext().getContentResolver();
@Rule @Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
private final Context mContext = ApplicationProvider.getApplicationContext(); private final Context mContext = ApplicationProvider.getApplicationContext();
@Before @Before
@@ -174,7 +175,7 @@ public class PreferredShortcutsTest {
} }
@Test @Test
@EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT) @RequiresFlagsEnabled(Flags.FLAG_A11Y_QS_SHORTCUT)
public void updatePreferredShortcutFromSettings_colorInversionWithQsAndSoftwareShortcut_preferredShortcutsMatches() { public void updatePreferredShortcutFromSettings_colorInversionWithQsAndSoftwareShortcut_preferredShortcutsMatches() {
String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString(); String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString();
Settings.Secure.putString(sContentResolver, Settings.Secure.putString(sContentResolver,
@@ -192,7 +193,7 @@ public class PreferredShortcutsTest {
} }
@Test @Test
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT) @RequiresFlagsDisabled(Flags.FLAG_A11Y_QS_SHORTCUT)
public void updatePreferredShortcutFromSettings_colorInversionWithQsAndHardwareShortcut_qsShortcutNotSaved() { public void updatePreferredShortcutFromSettings_colorInversionWithQsAndHardwareShortcut_qsShortcutNotSaved() {
String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString(); String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString();
Settings.Secure.putString(sContentResolver, Settings.Secure.putString(sContentResolver,