From aa207f2efdfddfc16cab93b6127f461b5c4e30ac Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Tue, 2 Feb 2021 15:57:31 +0800 Subject: 3/ Add wmHelper to controll the state of test activity * launchSplitScreen(wmHelper) * reopenAppFromOverview(wmHelper) * openQuickstep(wmHelper) + waitForActivityDestroyed() Test: atest FlickerTests Test: atest WMShellFlickerTests Test: atest WindowManagerSmokeTest Bug: 179116910 Change-Id: Ic050a255ebfe5bbe657af7383e5bbe90ca0d56a8 --- .../src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt | 2 +- .../src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index 2fe49af26cc1..52549a23c9bb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -83,7 +83,7 @@ class ReOpenImeWindowTest( } } transitions { - device.reopenAppFromOverview() + device.reopenAppFromOverview(wmHelper) wmHelper.waitImeWindowShown() } teardown { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 84cc8e3ab058..5fb050927dad 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -81,7 +81,7 @@ class OpenAppFromOverviewTest( } } transitions { - device.reopenAppFromOverview() + device.reopenAppFromOverview(wmHelper) wmHelper.waitForFullScreenApp(testApp.component) } teardown { -- cgit v1.2.3-59-g8ed1b