From a30e60b8af883c8953d53a5948d8a31239fce7c1 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Fri, 14 Jul 2023 16:38:51 +0000 Subject: [PATCH] Add missing FlickerConfigProvider Test: atest WMShellFlickerServiceTests Change-Id: I875b8a8f9fa7f3cd2418902eb95df90ae2a6b70a --- ...UnlockKeyguardToSplitScreenGesturalNavLandscape.kt | 11 +++++++++++ .../UnlockKeyguardToSplitScreenGesturalNavPortrait.kt | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavLandscape.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavLandscape.kt index 7cbc1c3c272cc..f4e72987becd8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavLandscape.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavLandscape.kt @@ -16,7 +16,11 @@ package com.android.wm.shell.flicker.service.splitscreen.flicker +import android.tools.common.flicker.FlickerConfig import android.tools.common.flicker.annotation.ExpectedScenarios +import android.tools.common.flicker.annotation.FlickerConfigProvider +import android.tools.common.flicker.config.FlickerConfig +import android.tools.common.flicker.config.FlickerServiceConfig import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner import com.android.wm.shell.flicker.service.splitscreen.scenarios.UnlockKeyguardToSplitScreen import org.junit.Test @@ -28,4 +32,11 @@ class UnlockKeyguardToSplitScreenGesturalNavLandscape : UnlockKeyguardToSplitScr @ExpectedScenarios(["QUICKSWITCH"]) @Test override fun unlockKeyguardToSplitScreen() = super.unlockKeyguardToSplitScreen() + + companion object { + @JvmStatic + @FlickerConfigProvider + fun flickerConfigProvider(): FlickerConfig = + FlickerConfig().use(FlickerServiceConfig.DEFAULT) + } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavPortrait.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavPortrait.kt index 2eb81e0d0492a..f38b2e8e12dd6 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavPortrait.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/flicker/UnlockKeyguardToSplitScreenGesturalNavPortrait.kt @@ -16,7 +16,11 @@ package com.android.wm.shell.flicker.service.splitscreen.flicker +import android.tools.common.flicker.FlickerConfig import android.tools.common.flicker.annotation.ExpectedScenarios +import android.tools.common.flicker.annotation.FlickerConfigProvider +import android.tools.common.flicker.config.FlickerConfig +import android.tools.common.flicker.config.FlickerServiceConfig import android.tools.device.flicker.junit.FlickerServiceJUnit4ClassRunner import com.android.wm.shell.flicker.service.splitscreen.scenarios.UnlockKeyguardToSplitScreen import org.junit.Test @@ -28,4 +32,11 @@ class UnlockKeyguardToSplitScreenGesturalNavPortrait : UnlockKeyguardToSplitScre @ExpectedScenarios(["QUICKSWITCH"]) @Test override fun unlockKeyguardToSplitScreen() = super.unlockKeyguardToSplitScreen() + + companion object { + @JvmStatic + @FlickerConfigProvider + fun flickerConfigProvider(): FlickerConfig = + FlickerConfig().use(FlickerServiceConfig.DEFAULT) + } }