Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mady Mellor
2023-07-06 23:12:51 +00:00
committed by Android (Google) Code Review
parent e450e5f078 f3fb0a3739
commit 59c8814abe
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times; 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.ShellController;
import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.sysui.ShellInit;
import com.android.wm.shell.taskview.TaskViewTransitions; import com.android.wm.shell.taskview.TaskViewTransitions;
import com.android.wm.shell.transition.Transitions;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -282,7 +284,7 @@ public class BubblesTest extends SysuiTestCase {
@Mock @Mock
private ScreenOffAnimationController mScreenOffAnimationController; private ScreenOffAnimationController mScreenOffAnimationController;
@Mock @Mock
private TaskViewTransitions mTaskViewTransitions; Transitions mTransitions;
@Mock @Mock
private Optional<OneHandedController> mOneHandedOptional; private Optional<OneHandedController> mOneHandedOptional;
@Mock @Mock
@@ -294,6 +296,8 @@ public class BubblesTest extends SysuiTestCase {
@Mock @Mock
private Icon mAppBubbleIcon; private Icon mAppBubbleIcon;
private TaskViewTransitions mTaskViewTransitions;
private TestableBubblePositioner mPositioner; private TestableBubblePositioner mPositioner;
private BubbleData mBubbleData; private BubbleData mBubbleData;
@@ -309,6 +313,12 @@ public class BubblesTest extends SysuiTestCase {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
if (Transitions.ENABLE_SHELL_TRANSITIONS) {
doReturn(true).when(mTransitions).isRegistered();
}
mTaskViewTransitions = new TaskViewTransitions(mTransitions);
mTestableLooper = TestableLooper.get(this); mTestableLooper = TestableLooper.get(this);
// For the purposes of this test, just run everything synchronously // For the purposes of this test, just run everything synchronously