Merge "[Trunk Stable] Use SetFlagsRule.initAllFlagsToReleaseConfigDefault instead of disabling all flags in setUp." into main

This commit is contained in:
Uwais Ashraf authored and Android (Google) Code Review committed 2023-10-17 14:09:47 +00:00
commit c1eecf21e9
2 files changed
+1 -8

No files matched your search

@@ -101,11 +101,6 @@ public class RecentsModelTest {
when(mContext.getResources()).thenReturn(mResource);
}
@After
public void tearDown() throws Exception {
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW);
}
@Test
@UiThreadTest
public void preloadOnHighResolutionEnabled() {
@@ -97,9 +97,7 @@ public class BubbleTextViewTest {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_TWOLINE_ALLAPPS);
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_CURSOR_HOVER_STATES);
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_OVERVIEW_ICON_MENU);
mSetFlagsRule.initAllFlagsToReleaseConfigDefault();
Utilities.enableRunningInTestHarnessForTests();
mContext = new ActivityContextWrapper(getApplicationContext());
mBubbleTextView = new BubbleTextView(mContext);