From a6c32cc9afecac555dbdc813828b8e058498cf10 Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Wed, 18 Nov 2020 15:44:52 +0800 Subject: [PATCH] 4-2/ Enhance AbstractStandardAppHelper.exit() to exit PIP at end Integrate forceStop() in exit() that PIP window could really exit after each round of test Bug: 173567664 Test: atest com.android.wm.shell.flicker Test: atest com.android.server.wm.flicker.Flicker Change-Id: I8aaa4f590344f8fb1e6e731ed865f21f63892bb2 --- .../com/android/wm/shell/flicker/apppairs/AppPairsTest.kt | 4 ++-- .../com/android/wm/shell/flicker/helpers/BaseAppHelper.kt | 8 -------- .../com/android/wm/shell/flicker/pip/PipKeyboardTest.kt | 6 +++--- .../com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt | 2 +- .../wm/shell/flicker/splitscreen/EnterSplitScreenTest.kt | 4 ++-- .../wm/shell/flicker/splitscreen/ExitSplitScreenTest.kt | 4 ++-- tests/FlickerTests/AndroidManifest.xml | 2 ++ 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt index c33dbbc3f53a4..2fc6944a3a5f3 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt @@ -70,8 +70,8 @@ class AppPairsTest( eachRun { executeShellCommand(composePairsCommand( primaryTaskId, secondaryTaskId, false /* pair */)) - primaryApp.forceStop() - secondaryApp.forceStop() + primaryApp.exit() + secondaryApp.exit() } } assertions { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt index 6f008ce64fb42..22496a506e0da 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt @@ -16,7 +16,6 @@ package com.android.wm.shell.flicker.helpers -import android.app.ActivityManager import android.app.Instrumentation import android.content.ComponentName import android.content.Context @@ -46,9 +45,6 @@ abstract class BaseAppHelper( protected val context: Context get() = mInstrumentation.context - private val activityManager: ActivityManager? - get() = context.getSystemService(ActivityManager::class.java) - private val appSelector = By.pkg(packageName).depth(0) protected val isTelevision: Boolean @@ -77,10 +73,6 @@ abstract class BaseAppHelper( return uiDevice.wait(Until.gone(appSelector), APP_CLOSE_WAIT_TIME_MS) } - fun forceStop() { - activityManager?.forceStopPackage(packageName) - } - override fun getOpenAppIntent(): Intent { val intent = Intent() intent.component = launcherActivityComponent diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt index 3813d4dc37000..abb8fc52abbb0 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt @@ -76,12 +76,12 @@ class PipKeyboardTest( } teardown { test { - keyboardApp.forceStop() + keyboardApp.exit() if (device.hasPipWindow()) { device.closePipWindow() } - testApp.forceStop() + testApp.exit() this.setRotation(Surface.ROTATION_0) } } @@ -210,4 +210,4 @@ class PipKeyboardTest( return supportedRotations.map { arrayOf(Surface.rotationToString(it), it) } } } -} \ No newline at end of file +} diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt index d1906ba2e27e5..251bc064352dc 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt @@ -53,7 +53,7 @@ abstract class TvPipTestBase : PipTestBase(rotationToString(ROTATION_0), ROTATIO open fun tearDown() { if (!isTelevision) return - testApp.forceStop() + testApp.exit() // Wait for 1 second, and check if the SystemUI has been alive and well since the start. SystemClock.sleep(AFTER_TEXT_PROCESS_CHECK_DELAY) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenTest.kt index 6e10f932c7456..a0056dfc09480 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenTest.kt @@ -60,8 +60,8 @@ class EnterSplitScreenTest( } teardown { eachRun { - splitScreenApp.forceStop() - secondaryApp.forceStop() + splitScreenApp.exit() + secondaryApp.exit() } } assertions { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/ExitSplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/ExitSplitScreenTest.kt index 17fc862fffec9..32e112dbd5984 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/ExitSplitScreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/ExitSplitScreenTest.kt @@ -65,8 +65,8 @@ class ExitSplitScreenTest( } teardown { eachRun { - splitScreenApp.forceStop()!! - secondaryApp.forceStop()!! + splitScreenApp.exit() + secondaryApp.exit() } } } diff --git a/tests/FlickerTests/AndroidManifest.xml b/tests/FlickerTests/AndroidManifest.xml index 98e02ced8d0b5..58f56f29528ca 100644 --- a/tests/FlickerTests/AndroidManifest.xml +++ b/tests/FlickerTests/AndroidManifest.xml @@ -27,6 +27,8 @@ + +