Merge "Merge WindowTestUtils into base class" (b511a73d) · Commits · e / os / android_frameworks_base

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1506,7 +1506,7 @@ public class ActivityRecordTests extends WindowTestsBase {
		final WindowManager.LayoutParams params = new WindowManager.LayoutParams(
		WindowManager.LayoutParams.TYPE_APPLICATION_STARTING);
		params.width = params.height = WindowManager.LayoutParams.MATCH_PARENT;
		final WindowTestUtils.TestWindowState w = new WindowTestUtils.TestWindowState(
		final TestWindowState w = new TestWindowState(
		mAtm.mWindowManager, mock(Session.class), new TestIWindow(), params, mActivity);
		mActivity.addWindow(w);

services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java

+26 −42

Original line number	Diff line number	Diff line
		@@ -133,10 +133,10 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		// [DisplayContent] -+- [TaskStack1] - [Task1] - [ActivityRecord1] (opening, visible)
		// +- [TaskStack2] - [Task2] - [ActivityRecord2] (closing, invisible)
		final Task stack1 = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1);
		final ActivityRecord activity1 = createTestActivityRecord(stack1);

		final Task stack2 = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2);
		final ActivityRecord activity2 = createTestActivityRecord(stack2);
		activity2.setVisible(false);
		activity2.mVisibleRequested = false;

		@@ -162,13 +162,13 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		// [DisplayContent] -+- [TaskStack1] - [Task1] - [ActivityRecord1] (closing, invisible)
		// +- [TaskStack2] - [Task2] - [ActivityRecord2] (opening, visible)
		final Task stack1 = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1);
		final ActivityRecord activity1 = createTestActivityRecord(stack1);
		activity1.setVisible(true);
		activity1.mVisibleRequested = true;
		activity1.mRequestForceTransition = true;

		final Task stack2 = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2);
		final ActivityRecord activity2 = createTestActivityRecord(stack2);
		activity2.setVisible(false);
		activity2.mVisibleRequested = false;
		activity2.mRequestForceTransition = true;
		@@ -193,10 +193,10 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		@Test
		public void testGetAnimationTargets_exitingBeforeTransition() {
		// Create another non-empty task so the animation target won't promote to task display area.
		WindowTestUtils.createTestActivityRecord(
		createTestActivityRecord(
		mDisplayContent.getDefaultTaskDisplayArea().getOrCreateRootHomeTask());
		final Task stack = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(stack);
		final ActivityRecord activity = createTestActivityRecord(stack);
		activity.setVisible(false);
		activity.mIsExiting = true;

		@@ -218,20 +218,20 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		// +- [TaskStack2] - [Task2] - [ActivityRecord2] (closing, invisible)
		// +- [AppWindow2] (being-replaced)
		final Task stack1 = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1);
		final ActivityRecord activity1 = createTestActivityRecord(stack1);
		final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
		TYPE_BASE_APPLICATION);
		attrs.setTitle("AppWindow1");
		final WindowTestUtils.TestWindowState appWindow1 = createWindowState(attrs, activity1);
		final TestWindowState appWindow1 = createWindowState(attrs, activity1);
		appWindow1.mWillReplaceWindow = true;
		activity1.addWindow(appWindow1);

		final Task stack2 = createTaskStackOnDisplay(mDisplayContent);
		final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2);
		final ActivityRecord activity2 = createTestActivityRecord(stack2);
		activity2.setVisible(false);
		activity2.mVisibleRequested = false;
		attrs.setTitle("AppWindow2");
		final WindowTestUtils.TestWindowState appWindow2 = createWindowState(attrs, activity2);
		final TestWindowState appWindow2 = createWindowState(attrs, activity2);
		appWindow2.mWillReplaceWindow = true;
		activity2.addWindow(appWindow2);

		@@ -262,21 +262,17 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		// +- [ActivityRecord4] (invisible)
		final Task stack1 = createTaskStackOnDisplay(mDisplayContent);
		final Task task1 = createTaskInStack(stack1, 0 /* userId */);
		final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity1 = createActivityRecordInTask(mDisplayContent, task1);
		activity1.setVisible(false);
		activity1.mVisibleRequested = true;
		final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity2 = createActivityRecordInTask(mDisplayContent, task1);
		activity2.setVisible(false);
		activity2.mVisibleRequested = false;

		final Task stack2 = createTaskStackOnDisplay(mDisplayContent);
		final Task task2 = createTaskInStack(stack2, 0 /* userId */);
		final ActivityRecord activity3 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity4 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity3 = createActivityRecordInTask(mDisplayContent, task2);
		final ActivityRecord activity4 = createActivityRecordInTask(mDisplayContent, task2);
		activity4.setVisible(false);
		activity4.mVisibleRequested = false;

		@@ -303,12 +299,10 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		// +- [ActivityRecord2] (closing, visible)
		final Task stack = createTaskStackOnDisplay(mDisplayContent);
		final Task task = createTaskInStack(stack, 0 /* userId */);
		final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task);
		final ActivityRecord activity1 = createActivityRecordInTask(mDisplayContent, task);
		activity1.setVisible(false);
		activity1.mVisibleRequested = true;
		final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task);
		final ActivityRecord activity2 = createActivityRecordInTask(mDisplayContent, task);

		final ArraySet<ActivityRecord> opening = new ArraySet<>();
		opening.add(activity1);
		@@ -337,22 +331,18 @@ public class AppTransitionControllerTest extends WindowTestsBase {

		final Task stack1 = createTaskStackOnDisplay(mDisplayContent);
		final Task task1 = createTaskInStack(stack1, 0 /* userId */);
		final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity1 = createActivityRecordInTask(mDisplayContent, task1);
		activity1.setVisible(false);
		activity1.mVisibleRequested = true;
		activity1.setOccludesParent(false);

		final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity2 = createActivityRecordInTask(mDisplayContent, task1);

		final Task stack2 = createTaskStackOnDisplay(mDisplayContent);
		final Task task2 = createTaskInStack(stack2, 0 /* userId */);
		final ActivityRecord activity3 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity3 = createActivityRecordInTask(mDisplayContent, task2);
		activity3.setOccludesParent(false);
		final ActivityRecord activity4 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity4 = createActivityRecordInTask(mDisplayContent, task2);

		final ArraySet<ActivityRecord> opening = new ArraySet<>();
		opening.add(activity1);
		@@ -381,24 +371,20 @@ public class AppTransitionControllerTest extends WindowTestsBase {

		final Task stack1 = createTaskStackOnDisplay(mDisplayContent);
		final Task task1 = createTaskInStack(stack1, 0 /* userId */);
		final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity1 = createActivityRecordInTask(mDisplayContent, task1);
		activity1.setVisible(false);
		activity1.mVisibleRequested = true;
		activity1.setOccludesParent(false);

		final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity2 = createActivityRecordInTask(mDisplayContent, task1);
		activity2.setVisible(false);
		activity2.mVisibleRequested = true;

		final Task stack2 = createTaskStackOnDisplay(mDisplayContent);
		final Task task2 = createTaskInStack(stack2, 0 /* userId */);
		final ActivityRecord activity3 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity3 = createActivityRecordInTask(mDisplayContent, task2);
		activity3.setOccludesParent(false);
		final ActivityRecord activity4 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity4 = createActivityRecordInTask(mDisplayContent, task2);

		final ArraySet<ActivityRecord> opening = new ArraySet<>();
		opening.add(activity1);
		@@ -425,13 +411,11 @@ public class AppTransitionControllerTest extends WindowTestsBase {
		// +- [Task2] - [ActivityRecord2] (closing, visible)
		final Task stack = createTaskStackOnDisplay(mDisplayContent);
		final Task task1 = createTaskInStack(stack, 0 /* userId */);
		final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task1);
		final ActivityRecord activity1 = createActivityRecordInTask(mDisplayContent, task1);
		activity1.setVisible(false);
		activity1.mVisibleRequested = true;
		final Task task2 = createTaskInStack(stack, 0 /* userId */);
		final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(
		mDisplayContent, task2);
		final ActivityRecord activity2 = createActivityRecordInTask(mDisplayContent, task2);

		final ArraySet<ActivityRecord> opening = new ArraySet<>();
		opening.add(activity1);

services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -151,8 +151,7 @@ public class AppTransitionTests extends WindowTestsBase {

		final Task stack1 = createTaskStackOnDisplay(dc1);
		final Task task1 = createTaskInStack(stack1, 0 /* userId */);
		final ActivityRecord activity1 =
		WindowTestUtils.createTestActivityRecord(dc1);
		final ActivityRecord activity1 = createTestActivityRecord(dc1);
		task1.addChild(activity1, 0);

		// Simulate same app is during opening / closing transition set stage.

services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		public void setUp() throws Exception {
		mStack = createTaskStackOnDisplay(mDisplayContent);
		mTask = createTaskInStack(mStack, 0 /* userId */);
		mActivity = WindowTestUtils.createTestActivityRecord(mDisplayContent);
		mActivity = createTestActivityRecord(mDisplayContent);

		mTask.addChild(mActivity, 0);
		}
		@@ -165,7 +165,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
		TYPE_BASE_APPLICATION);
		attrs.setTitle("AppWindow");
		final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mActivity);
		final TestWindowState appWindow = createWindowState(attrs, mActivity);
		mActivity.addWindow(appWindow);

		// Set initial orientation and update.
		@@ -198,7 +198,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
		TYPE_BASE_APPLICATION);
		attrs.setTitle("RotationByPolicy");
		final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mActivity);
		final TestWindowState appWindow = createWindowState(attrs, mActivity);
		mActivity.addWindow(appWindow);

		// Set initial orientation and update.
		@@ -244,7 +244,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		TYPE_BASE_APPLICATION);
		attrs.flags \|= FLAG_SHOW_WHEN_LOCKED \| FLAG_DISMISS_KEYGUARD;
		attrs.setTitle("AppWindow");
		final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mActivity);
		final TestWindowState appWindow = createWindowState(attrs, mActivity);

		// Add window with show when locked flag
		mActivity.addWindow(appWindow);
		@@ -307,7 +307,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		assertEquals(Configuration.ORIENTATION_PORTRAIT, displayConfig.orientation);
		assertEquals(Configuration.ORIENTATION_PORTRAIT, activityConfig.orientation);

		final ActivityRecord topActivity = WindowTestUtils.createTestActivityRecord(mStack);
		final ActivityRecord topActivity = createTestActivityRecord(mStack);
		topActivity.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

		assertEquals(Configuration.ORIENTATION_LANDSCAPE, displayConfig.orientation);
		@@ -490,8 +490,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		}

		private ActivityRecord createTestActivityRecordForGivenTask(Task task) {
		final ActivityRecord activity =
		WindowTestUtils.createTestActivityRecord(mDisplayContent);
		final ActivityRecord activity = createTestActivityRecord(mDisplayContent);
		task.addChild(activity, 0);
		waitUntilHandlersIdle();
		return activity;
		@@ -562,7 +561,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		public void testHasStartingWindow() {
		final WindowManager.LayoutParams attrs =
		new WindowManager.LayoutParams(TYPE_APPLICATION_STARTING);
		final WindowTestUtils.TestWindowState startingWindow = createWindowState(attrs, mActivity);
		final TestWindowState startingWindow = createWindowState(attrs, mActivity);
		mActivity.startingDisplayed = true;
		mActivity.addWindow(startingWindow);
		assertTrue("Starting window should be present", mActivity.hasStartingWindow());

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -326,7 +326,7 @@ public class DisplayContentTests extends WindowTestsBase {
		assertEquals(dc, stack.getDisplayContent());

		final Task task = createTaskInStack(stack, 0 /* userId */);
		final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(dc);
		final ActivityRecord activity = createTestActivityRecord(dc);
		task.addChild(activity, 0);
		assertEquals(dc, task.getDisplayContent());
		assertEquals(dc, activity.getDisplayContent());
		@@ -397,16 +397,14 @@ public class DisplayContentTests extends WindowTestsBase {
		// Add stack with activity.
		final Task stack0 = createTaskStackOnDisplay(dc0);
		final Task task0 = createTaskInStack(stack0, 0 /* userId */);
		final ActivityRecord activity =
		WindowTestUtils.createTestActivityRecord(dc0);
		final ActivityRecord activity = createTestActivityRecord(dc0);
		task0.addChild(activity, 0);
		dc0.configureDisplayPolicy();
		assertNotNull(dc0.mTapDetector);

		final Task stack1 = createTaskStackOnDisplay(dc1);
		final Task task1 = createTaskInStack(stack1, 0 /* userId */);
		final ActivityRecord activity1 =
		WindowTestUtils.createTestActivityRecord(dc0);
		final ActivityRecord activity1 = createTestActivityRecord(dc0);
		task1.addChild(activity1, 0);
		dc1.configureDisplayPolicy();
		assertNotNull(dc1.mTapDetector);
		@@ -1296,7 +1294,7 @@ public class DisplayContentTests extends WindowTestsBase {
		final ActivityRecord pinnedActivity = createActivityRecord(displayContent,
		WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD);
		final Task pinnedTask = pinnedActivity.getRootTask();
		final ActivityRecord homeActivity = WindowTestUtils.createTestActivityRecord(
		final ActivityRecord homeActivity = createTestActivityRecord(
		displayContent.getDefaultTaskDisplayArea().getOrCreateRootHomeTask());
		if (displayConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
		homeActivity.setOrientation(SCREEN_ORIENTATION_PORTRAIT);