Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore Background for SurfaceView Camera surface on test" into udc-qpr-dev am: 2a5dfadbdd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23892144

Change-Id: I890329e1b657579e311ee23a16cd14c3b238a5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-03 21:11:09 +00:00
committed by Automerger Merge Worker
parent a326c752aa 2a5dfadbdd
commit 34116e8f20
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenCameraFromHomeOnDoubleClickPowerButtonTest.kt
View File

@@ -18,6 +18,8 @@ package com.android.server.wm.flicker.launch
import android.os.SystemClock import android.os.SystemClock
import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Postsubmit
import android.tools.common.flicker.subject.layers.LayersTraceSubject
import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.device.apphelpers.CameraAppHelper import android.tools.device.apphelpers.CameraAppHelper
import android.tools.device.apphelpers.StandardAppHelper import android.tools.device.apphelpers.StandardAppHelper
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -137,8 +139,14 @@ class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: LegacyFlickerTest)
@Postsubmit @Postsubmit
@Test @Test
override fun visibleLayersShownMoreThanOneConsecutiveEntry() = override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
super.visibleLayersShownMoreThanOneConsecutiveEntry() flicker.assertLayers {
this.visibleLayersShownMoreThanOneConsecutiveEntry(
LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS +
listOf(CAMERA_BACKGROUND)
)
}
}
@Postsubmit @Postsubmit
@Test @Test
@@ -161,5 +169,12 @@ class OpenCameraFromHomeOnDoubleClickPowerButtonTest(flicker: LegacyFlickerTest)
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")
@JvmStatic @JvmStatic
fun getParams() = LegacyFlickerTestFactory.nonRotationTests() fun getParams() = LegacyFlickerTestFactory.nonRotationTests()
private val CAMERA_BACKGROUND =
ComponentNameMatcher(
"Background for SurfaceView" +
"[com.google.android.GoogleCamera/" +
"com.google.android.apps.camera.legacy.app.activity.main.CameraActivity]"
)
} }
} }