diff options
4 files changed, 20 insertions, 8 deletions
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/FlickerAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/FlickerAppHelper.kt index e579533d2bb7..71475774343a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/FlickerAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/FlickerAppHelper.kt @@ -17,14 +17,15 @@ package com.android.server.wm.flicker.helpers import android.app.Instrumentation +import android.support.test.launcherhelper.ILauncherStrategy import com.android.server.wm.flicker.StandardAppHelper abstract class FlickerAppHelper( instr: Instrumentation, - launcherName: String -) : StandardAppHelper(instr, sFlickerPackage, launcherName) { + launcherName: String, + launcherStrategy: ILauncherStrategy +) : StandardAppHelper(instr, sFlickerPackage, launcherName, launcherStrategy) { companion object { - var sFindTimeout = 10000 var sFlickerPackage = "com.android.server.wm.flicker.testapp" } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt index aa0d7e0830ca..c1b765790ce5 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppHelper.kt @@ -17,6 +17,8 @@ package com.android.server.wm.flicker.helpers import android.app.Instrumentation +import android.support.test.launcherhelper.ILauncherStrategy +import android.support.test.launcherhelper.LauncherStrategyFactory import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.Until @@ -24,8 +26,11 @@ import org.junit.Assert open class ImeAppHelper( instr: Instrumentation, - launcherName: String = "ImeApp" -) : FlickerAppHelper(instr, launcherName) { + launcherName: String = "ImeApp", + launcherStrategy: ILauncherStrategy = LauncherStrategyFactory + .getInstance(instr) + .launcherStrategy +) : FlickerAppHelper(instr, launcherName, launcherStrategy) { open fun openIME(device: UiDevice) { val editText = device.wait( Until.findObject(By.res(getPackage(), "plain_text_input")), diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt index ca907d9ac80e..d10bb1ef3ee7 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt @@ -17,11 +17,18 @@ package com.android.server.wm.flicker.helpers import android.app.Instrumentation +import android.support.test.launcherhelper.ILauncherStrategy +import android.support.test.launcherhelper.LauncherStrategyFactory import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice import org.junit.Assert -class PipAppHelper(instr: Instrumentation) : FlickerAppHelper(instr, "PipApp") { +class PipAppHelper( + instr: Instrumentation, + launcherStrategy: ILauncherStrategy = LauncherStrategyFactory + .getInstance(instr) + .launcherStrategy +) : FlickerAppHelper(instr, "PipApp", launcherStrategy) { fun clickEnterPipButton(device: UiDevice) { val enterPipButton = device.findObject(By.res(getPackage(), "enter_pip")) Assert.assertNotNull("Pip button not found, this usually happens when the device " + diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt index 1a885bcdea96..a93330d900fb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt @@ -28,7 +28,6 @@ import com.android.server.wm.flicker.StandardAppHelper import com.android.server.wm.flicker.helpers.WindowUtils import com.android.server.wm.flicker.dsl.flicker import com.android.server.wm.flicker.helpers.ImeAppHelper -import com.android.server.wm.flicker.helpers.clearRecents import com.android.server.wm.flicker.helpers.exitSplitScreen import com.android.server.wm.flicker.helpers.isInSplitScreen import com.android.server.wm.flicker.helpers.launchSplitScreen @@ -75,7 +74,7 @@ class ResizeSplitScreenTest : FlickerTestBase() { eachRun { device.wakeUpAndGoToHomeScreen() this.setRotation(rotation) - clearRecents(instrumentation) + this.launcherStrategy.clearRecentAppsFromOverview() testAppBottom.open() device.pressHome() testAppTop.open() |