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

Commit 4dffafcd authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Don't use mock TaskViewTransitions in BubblesTest" into udc-qpr-dev am:...

Merge "Don't use mock TaskViewTransitions in BubblesTest" into udc-qpr-dev am: 59c8814a am: ea27889a

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



Change-Id: I62ecfec054553673a11342addf44cb0d59a4a1d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d6a41ff ea27889a
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
@@ -153,6 +154,7 @@ import com.android.wm.shell.sysui.ShellCommandHandler;
import com.android.wm.shell.sysui.ShellController;
import com.android.wm.shell.sysui.ShellInit;
import com.android.wm.shell.taskview.TaskViewTransitions;
import com.android.wm.shell.transition.Transitions;

import org.junit.After;
import org.junit.Before;
@@ -282,7 +284,7 @@ public class BubblesTest extends SysuiTestCase {
    @Mock
    private ScreenOffAnimationController mScreenOffAnimationController;
    @Mock
    private TaskViewTransitions mTaskViewTransitions;
    Transitions mTransitions;
    @Mock
    private Optional<OneHandedController> mOneHandedOptional;
    @Mock
@@ -294,6 +296,8 @@ public class BubblesTest extends SysuiTestCase {
    @Mock
    private Icon mAppBubbleIcon;

    private TaskViewTransitions mTaskViewTransitions;

    private TestableBubblePositioner mPositioner;

    private BubbleData mBubbleData;
@@ -309,6 +313,12 @@ public class BubblesTest extends SysuiTestCase {
    @Before
    public void setUp() throws Exception {
        MockitoAnnotations.initMocks(this);

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {
            doReturn(true).when(mTransitions).isRegistered();
        }
        mTaskViewTransitions = new TaskViewTransitions(mTransitions);

        mTestableLooper = TestableLooper.get(this);

        // For the purposes of this test, just run everything synchronously