Merge "Don't mock shell task organizer" into udc-qpr-dev

import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import java.util.List;

import java.util.Optional;

@Ignore("b/292153259")

@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

    @Mock

    private TaskStackListenerImpl mTaskStackListener;

    @Mock

    private ShellTaskOrganizer mShellTaskOrganizer;

    @Mock

    private KeyguardStateController mKeyguardStateController;

    @Mock

    private ScreenOffAnimationController mScreenOffAnimationController;

    @Mock

    private Icon mAppBubbleIcon;

    private ShellTaskOrganizer mShellTaskOrganizer;

    private TaskViewTransitions mTaskViewTransitions;

    private TestableBubblePositioner mPositioner;

                        mock(UiEventLogger.class),

                        mock(UserTracker.class)

                );

        when(mShellTaskOrganizer.getExecutor()).thenReturn(syncExecutor);

        mShellTaskOrganizer = new ShellTaskOrganizer(mock(ShellInit.class),

                mock(ShellCommandHandler.class),

                null,

                Optional.empty(),

                Optional.empty(),

                syncExecutor);

        mBubbleProperties = new FakeBubbleProperties();

        mBubbleController = new TestableBubbleController(

                mContext,