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

Don't use mock TaskViewTransitions in BubblesTest

Browse Source 
I wasn't able to reproduce the test failure but I think this might
be the issue. Tests pass locally with non-mocked TaskViewTransitions.

Test: atest BubblesTest
Bug: 289444898
Bug: 288981689
Change-Id: Iddfb6a2c863083bff6f56713684b1c99b77a46db
This commit is contained in:
Mady Mellor
2023-07-06 13:32:53 -07:00
parent f58e1e47df
commit f3fb0a3739
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.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