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

Commit e93d74ff authored by Mady Mellor's avatar Mady Mellor
Browse files

Don't mock shell task organizer 

Test: atest BubblesTest WMShellTest
Bug: 292153259
Change-Id: Ib192dd3883a3b80f58f3bf2268f1cd613343d9ad
parent 240c542b

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+8 −5
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ import com.android.wm.shell.transition.Transitions; 


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;
@@ -174,7 +173,6 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Optional;



@Ignore("b/292153259")

@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)
@@ -280,8 +278,6 @@ public class BubblesTest extends SysuiTestCase { 
    @Mock

    private TaskStackListenerImpl mTaskStackListener;

    @Mock

    private ShellTaskOrganizer mShellTaskOrganizer;

    @Mock

    private KeyguardStateController mKeyguardStateController;

    @Mock

    private ScreenOffAnimationController mScreenOffAnimationController;
@@ -298,6 +294,7 @@ public class BubblesTest extends SysuiTestCase { 
    @Mock

    private Icon mAppBubbleIcon;



    private ShellTaskOrganizer mShellTaskOrganizer;

    private TaskViewTransitions mTaskViewTransitions;



    private TestableBubblePositioner mPositioner;
@@ -379,7 +376,13 @@ public class BubblesTest extends SysuiTestCase { 
                        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,