From 43f5994b18e4254b0a936a16f71130535d2caeef Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Fri, 3 Mar 2023 16:50:47 +0000 Subject: [PATCH 1/2] Fix replacesLayer assertion to account for splashscreen layer Bug: 271553459 Test: atest FlickerTests Change-Id: Ie399c7333dc7af8c31a144e5e497c7abd96c5d6e --- .../src/com/android/server/wm/flicker/CommonAssertions.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt index 9dc4bf034e66a..9c3460c124baa 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -317,7 +317,8 @@ fun FlickerTest.replacesLayer( assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true) } if (ignoreSplashscreen) { - assertion.then().isSplashScreenVisibleFor(newLayer, isOptional = true) + assertion.then().isSplashScreenVisibleFor( + ComponentNameMatcher(newLayer.packageName, className = ""), isOptional = true) } assertion.then().isVisible(newLayer) From be284cebde3b3dfbae26e97fbaf8e2157a1013ee Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Fri, 3 Mar 2023 11:11:12 +0000 Subject: [PATCH 2/2] Stabalize OpenCameraOnDoubleClickPowerButton test Test: atest FlickerTests:OpenCameraOnDoubleClickPowerButton Bug: 271407889 Change-Id: I399e82b79a7d6aa522183747dadc1f91ddba1d22 --- .../flicker/launch/OpenCameraOnDoubleClickPowerButton.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt index 6005a81aac9ea..786bb32096ad1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraOnDoubleClickPowerButton.kt @@ -16,9 +16,10 @@ package com.android.server.wm.flicker.launch +import android.os.SystemClock import android.platform.test.annotations.Postsubmit import android.tools.device.apphelpers.CameraAppHelper -import android.tools.device.flicker.annotation.FlickerServiceCompatible +import android.tools.device.apphelpers.StandardAppHelper import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.legacy.FlickerBuilder import android.tools.device.flicker.legacy.FlickerTest @@ -54,13 +55,14 @@ import org.junit.runners.Parameterized * ``` */ @RequiresDevice -@FlickerServiceCompatible @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { private val cameraApp = CameraAppHelper(instrumentation) + override val testApp: StandardAppHelper + get() = cameraApp override val transition: FlickerBuilder.() -> Unit get() = { @@ -70,6 +72,7 @@ class OpenCameraOnDoubleClickPowerButton(flicker: FlickerTest) : } transitions { device.pressKeyCode(KeyEvent.KEYCODE_POWER) + SystemClock.sleep(100) device.pressKeyCode(KeyEvent.KEYCODE_POWER) wmHelper.StateSyncBuilder().withWindowSurfaceAppeared(cameraApp).waitForAndVerify() }