Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f36375d9 authored by Kevin Lim's avatar Kevin Lim
Browse files

[Tests] Clear MAIN_EXECUTOR in 

NavHandleLongPressInputConsumerTest#tearDown

Attempt at fixing flaky tests

Bug: b/359911511,b/355232772
Flag: EXEMPT Test change
Test: NavHandleLongPressInputConsumerTest
Change-Id: I8ea91f732e91b1a7df4b2e2816dc70e35f14d504
parent bb87ff95

quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java

+3 −2
Original line number Diff line number Diff line
@@ -92,14 +92,15 @@ public class NavHandleLongPressInputConsumerTest { 
        when(mTopTaskTracker.getCachedTopTask(anyBoolean())).thenReturn(mTaskInfo);

        when(mDeviceState.getSquaredTouchSlop()).thenReturn(SQUARED_TOUCH_SLOP);

        when(mDelegate.allowInterceptByParent()).thenReturn(true);

        MAIN_EXECUTOR.getHandler().removeCallbacks(mLongPressRunnable);

        mLongPressTriggered.set(false);

        when(mNavHandleLongPressHandler.getLongPressRunnable(any())).thenReturn(mLongPressRunnable);

        initializeObjectUnderTest();

    }



    @After

    public void tearDown() {

    public void tearDown() throws Exception {

        MAIN_EXECUTOR.getHandler().removeCallbacks(mLongPressRunnable);

        MAIN_EXECUTOR.submit(() -> null).get();

        mContext.onDestroy();

    }