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

Commit c6e40030 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when run the splitscreen test" into tm-qpr-dev

parents c5e098eb df3a229e

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.content.ComponentName; 
import android.content.Intent;

import android.content.pm.ActivityInfo;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -110,6 +111,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void instantiateController_registerDumpCallback() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());
@@ -118,6 +120,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void instantiateController_registerCommandCallback() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());
@@ -126,6 +129,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void testControllerRegistersKeyguardChangeListener() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());
@@ -134,6 +138,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    }



    @Test

    @UiThreadTest

    public void instantiateController_addExternalInterface() {

        doReturn(mMainExecutor).when(mTaskOrganizer).getExecutor();

        when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout());

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.SurfaceSession; 
import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import androidx.test.annotation.UiThreadTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -113,6 +114,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
    private StageCoordinator mStageCoordinator;



    @Before

    @UiThreadTest

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mStageCoordinator = spy(new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,