diff options
| author | 2023-11-02 23:02:15 +0000 | |
|---|---|---|
| committer | 2023-11-02 23:02:15 +0000 | |
| commit | 073e2b766b0e3abb3c7fd2216aecc6ff549c2a68 (patch) | |
| tree | c7d106dc7d5bca0ab6fb95a41146ef17d6e1ca48 | |
| parent | 4ce39bf5d0b447bf0a5ea5f06c58f29c8f01f76d (diff) | |
Make the 1P/3P PiP tests run without screen recorder.
The tests will run in infra where CAPTURE_VIDEO_OUTPUT is not granted.
Hence we should not attempt to use ScreenRecorder, that depends on it.
Test: atest WMShellFlickerTestsPipApps
Bug: 302034872
Change-Id: Iede6b25105d1d98314d6078e27d67c0a1337a598
2 files changed, 12 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt index be5a27ac7dcc..bd8b0056a6a3 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt @@ -20,6 +20,8 @@ import android.platform.test.annotations.Postsubmit import android.tools.common.Rotation import android.tools.common.traces.component.ComponentNameMatcher import android.tools.device.apphelpers.StandardAppHelper +import android.tools.device.flicker.junit.FlickerBuilderProvider +import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.LegacyFlickerTest import android.tools.device.flicker.legacy.LegacyFlickerTestFactory import com.android.wm.shell.flicker.pip.common.EnterPipTransition @@ -29,6 +31,15 @@ import org.junit.runners.Parameterized abstract class AppsEnterPipTransition(flicker: LegacyFlickerTest) : EnterPipTransition(flicker) { protected abstract val standardAppHelper: StandardAppHelper + @FlickerBuilderProvider + override fun buildFlicker(): FlickerBuilder { + return FlickerBuilder(instrumentation).apply { + withoutScreenRecorder() + setup { flicker.scenario.setIsTablet(tapl.isTablet) } + transition() + } + } + /** Checks [standardAppHelper] window remains visible throughout the animation */ @Postsubmit @Test diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseBenchmarkTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseBenchmarkTest.kt index 0f3e0f5ef043..e9363f725fd8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseBenchmarkTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseBenchmarkTest.kt @@ -38,7 +38,7 @@ constructor( * executions */ @FlickerBuilderProvider - fun buildFlicker(): FlickerBuilder { + open fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { flicker.scenario.setIsTablet(tapl.isTablet) } transition() |