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

Commit 811e9a73 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "propagatesTopCallback_samePriority now verifies that onBackStarted()... 

Merge "propagatesTopCallback_samePriority now verifies that onBackStarted() calls are made on the right Callback" into udc-qpr-dev am: 88e43515

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24281475



Change-Id: Id4b731d6370c74d88f96ad2f9bf659314727cf95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2bcab64 88e43515

core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java

+7 −10
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import static org.junit.Assert.assertEquals; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atMost;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;



import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -254,18 +254,15 @@ public class WindowOnBackInvokedDispatcherTest { 
        callbackInfo1.getCallback().onBackStarted(mBackEvent);



        waitForIdle();

        verify(mCallback1).onBackStarted(any(BackEvent.class));

        verifyZeroInteractions(mCallback2);

        verify(mCallback1, times(1)).onBackStarted(any(BackEvent.class));

        verify(mCallback2, never()).onBackStarted(any(BackEvent.class));

        clearInvocations(mCallback1);



        callbackInfo2.getCallback().onBackStarted(mBackEvent);



        waitForIdle();

        verify(mCallback2).onBackStarted(any(BackEvent.class));



        // Calls sequence: BackProgressAnimator.onBackStarted() -> BackProgressAnimator.reset() ->

        // Spring.animateToFinalPosition(0). This causes a progress event to be fired.

        verify(mCallback1, atMost(1)).onBackProgressed(any(BackEvent.class));

        verifyNoMoreInteractions(mCallback1);

        verify(mCallback1, never()).onBackStarted(any(BackEvent.class));

        verify(mCallback2, times(1)).onBackStarted(any(BackEvent.class));

    }



    @Test