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

Commit 438270b3 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix flake in WindowOnBackInvokedDispatcherTest

Bug: 371638960
Flag: com.android.window.flags.predictive_back_priority_system_navigation_observer
Test: OnBackInvokedCallbackGestureTest
Change-Id: I4fae37f51ec63b4b5122ec6624a525f7c5e6ccc8
parent 8aac8f1a
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -586,13 +586,13 @@ public class WindowOnBackInvokedDispatcherTest {

    @Test(expected = IllegalArgumentException.class)
    @RequiresFlagsDisabled(FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER)
    public void testNoUiCallback_registrationFailsWithoutFlaggedApiEnabled() {
    public void testObserverCallback_registrationFailsWithoutFlaggedApiEnabled() {
        mDispatcher.registerOnBackInvokedCallback(PRIORITY_SYSTEM_NAVIGATION_OBSERVER, mCallback2);
    }

    @Test
    @RequiresFlagsEnabled(FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER)
    public void testNoUiCallback_invokedWithSystemCallback() throws RemoteException {
    public void testObserverCallback_invokedWithSystemCallback() throws RemoteException {
        mDispatcher.registerSystemOnBackInvokedCallback(mCallback1);
        mDispatcher.registerOnBackInvokedCallback(PRIORITY_SYSTEM_NAVIGATION_OBSERVER, mCallback2);

@@ -607,7 +607,7 @@ public class WindowOnBackInvokedDispatcherTest {

        callbackInfo.getCallback().onBackProgressed(mBackEvent);
        waitForIdle();
        verify(mCallback1).onBackProgressed(any());
        verify(mCallback1, atLeast(1)).onBackProgressed(any());
        verify(mCallback2, never()).onBackProgressed(any());

        callbackInfo.getCallback().onBackCancelled();
@@ -625,7 +625,7 @@ public class WindowOnBackInvokedDispatcherTest {

    @Test
    @RequiresFlagsEnabled(FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER)
    public void testNoUiCallback_notInvokedWithNonSystemCallback() throws RemoteException {
    public void testObserverCallback_notInvokedWithNonSystemCallback() throws RemoteException {
        mDispatcher.registerOnBackInvokedCallback(PRIORITY_DEFAULT, mCallback1);
        mDispatcher.registerOnBackInvokedCallback(PRIORITY_SYSTEM_NAVIGATION_OBSERVER, mCallback2);

@@ -640,7 +640,7 @@ public class WindowOnBackInvokedDispatcherTest {

        callbackInfo.getCallback().onBackProgressed(mBackEvent);
        waitForIdle();
        verify(mCallback1).onBackProgressed(any());
        verify(mCallback1, atLeast(1)).onBackProgressed(any());
        verify(mCallback2, never()).onBackProgressed(any());

        callbackInfo.getCallback().onBackCancelled();
@@ -658,7 +658,7 @@ public class WindowOnBackInvokedDispatcherTest {

    @Test
    @RequiresFlagsEnabled(FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER)
    public void testNoUiCallback_reregistrations() {
    public void testObserverCallback_reregistrations() {
        mDispatcher.registerOnBackInvokedCallback(PRIORITY_SYSTEM_NAVIGATION_OBSERVER, mCallback1);
        assertCallbacksSize(/* default */ 0, /* overlay */ 0, /* observer */ 1);
        assertEquals(mCallback1, mDispatcher.mSystemNavigationObserverCallback);