Merge "Skip stage-split stateChange tests when using shell transit" into sc-v2-dev am: 64c167d613 (642a68d7) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,11 +21,13 @@ import static android.view.Display.DEFAULT_DISPLAY;

	import static com.google.common.truth.Truth.assertThat;		import static com.google.common.truth.Truth.assertThat;

			import static org.junit.Assume.assumeFalse;
	import static org.mockito.ArgumentMatchers.eq;		import static org.mockito.ArgumentMatchers.eq;
	import static org.mockito.Mockito.times;		import static org.mockito.Mockito.times;
	import static org.mockito.Mockito.verify;		import static org.mockito.Mockito.verify;

	import android.app.ActivityManager;		import android.app.ActivityManager;
			import android.os.SystemProperties;
	import android.view.SurfaceControl;		import android.view.SurfaceControl;
	import android.view.SurfaceSession;		import android.view.SurfaceSession;

	@@ -52,6 +54,9 @@ import org.mockito.MockitoAnnotations;
	@SmallTest		@SmallTest
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public final class StageTaskListenerTests {		public final class StageTaskListenerTests {
			private static final boolean ENABLE_SHELL_TRANSITIONS =
			SystemProperties.getBoolean("persist.debug.shell_transit", false);

	@Mock private ShellTaskOrganizer mTaskOrganizer;		@Mock private ShellTaskOrganizer mTaskOrganizer;
	@Mock private StageTaskListener.StageListenerCallbacks mCallbacks;		@Mock private StageTaskListener.StageListenerCallbacks mCallbacks;
	@Mock private SyncTransactionQueue mSyncQueue;		@Mock private SyncTransactionQueue mSyncQueue;
	@@ -93,6 +98,8 @@ public final class StageTaskListenerTests {

	@Test		@Test
	public void testChildTaskAppeared() {		public void testChildTaskAppeared() {
			// With shell transitions, the transition manages status changes, so skip this test.
			assumeFalse(ENABLE_SHELL_TRANSITIONS);
	final ActivityManager.RunningTaskInfo childTask =		final ActivityManager.RunningTaskInfo childTask =
	new TestRunningTaskInfoBuilder().setParentTaskId(mRootTask.taskId).build();		new TestRunningTaskInfoBuilder().setParentTaskId(mRootTask.taskId).build();

	@@ -110,6 +117,8 @@ public final class StageTaskListenerTests {

	@Test		@Test
	public void testTaskVanished() {		public void testTaskVanished() {
			// With shell transitions, the transition manages status changes, so skip this test.
			assumeFalse(ENABLE_SHELL_TRANSITIONS);
	final ActivityManager.RunningTaskInfo childTask =		final ActivityManager.RunningTaskInfo childTask =
	new TestRunningTaskInfoBuilder().setParentTaskId(mRootTask.taskId).build();		new TestRunningTaskInfoBuilder().setParentTaskId(mRootTask.taskId).build();
	mStageTaskListener.mRootTaskInfo = mRootTask;		mStageTaskListener.mRootTaskInfo = mRootTask;