From 61dc608007db81b4e0f098dc64cdd28f0dbac4ab Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Mon, 20 Mar 2023 09:29:47 +0800 Subject: [PATCH] Fix EnterSplitScreenByDrag#cujCompleted Set the appExistAtStart to false for splitScreenEntered while verify the appWindow isn't exist at start for EnterSplitScreenByDragFromAllApps. Update the target activity name for EnterSplitScreenByDragFromNotification. Bug: 270770472 Test: atest EnterSplitScreenByDragFromNotification#cujCompleted atest EnterSplitScreenByDragFromAllApps#cujCompleted Change-Id: I693ee343c99be387aaff00e19fa2207f396f5806 --- .../flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt | 3 ++- .../splitscreen/EnterSplitScreenByDragFromNotification.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt index ffdb87f190d55..5b06c9c3897db 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt @@ -79,7 +79,8 @@ class EnterSplitScreenByDragFromAllApps(flicker: FlickerTest) : SplitScreenBase( @IwTest(focusArea = "sysui") @Presubmit @Test - fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false) + fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false, + appExistAtStart = false) @Presubmit @Test diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt index 792e2b03522f1..c8401831bdbcf 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt @@ -82,7 +82,8 @@ class EnterSplitScreenByDragFromNotification(flicker: FlickerTest) : SplitScreen @IwTest(focusArea = "sysui") @Presubmit @Test - fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false) + fun cujCompleted() = flicker.splitScreenEntered(primaryApp, sendNotificationApp, + fromOtherApp = false) @Presubmit @Test