Merge "[PiP2] Assert for layer expand in flicker test" into main (780e4785) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/pip2/flicker-service/src/com/android/wm/shell/flicker/ExitPipToAppViaIntentTest.kt

+13 −6

Original line number	Diff line number	Diff line
		@@ -17,12 +17,14 @@
		package com.android.wm.shell.flicker

		import android.app.Instrumentation
		import androidx.test.filters.RequiresDevice
		import android.tools.NavBar
		import android.tools.Rotation
		import android.tools.flicker.AssertionInvocationGroup
		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.assertors.ComponentTemplate
		import android.tools.flicker.assertors.assertions.LayerExpands
		import android.tools.flicker.config.AssertionTemplates
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerConfigEntry
		@@ -32,6 +34,7 @@ import android.tools.flicker.extractors.TaggedScenarioExtractorBuilder
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import android.tools.traces.events.CujType
		import android.tools.traces.parsers.WindowManagerStateHelper
		import androidx.test.filters.RequiresDevice
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.helpers.PipAppHelper
		import com.android.server.wm.flicker.testapp.ActivityOptions
		@@ -56,10 +59,6 @@ import org.junit.runner.RunWith
		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class ExitPipToAppViaIntentTest {
		val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		val wmHelper = WindowManagerStateHelper(instrumentation)
		val pipApp: PipAppHelper = PipAppHelper(instrumentation)

		@Rule
		@JvmField
		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)
		@@ -84,15 +83,23 @@ class ExitPipToAppViaIntentTest {
		}

		companion object {
		val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		val wmHelper = WindowManagerStateHelper(instrumentation)
		val pipApp: PipAppHelper = PipAppHelper(instrumentation)
		private val pipAppComponentTemplate = ComponentTemplate("PIP_APP") { _ -> pipApp }

		private val PIP_EXPAND_CUJ_EXTRACTOR = TaggedScenarioExtractorBuilder()
		.setTargetTag(CujType.CUJ_PIP_TRANSITION)
		.setAdditionalCujFilter {
		it.tag == "EXIT_PIP"
		}.build()

		private val PIP_EXPAND_CUJ_CONFIG = FlickerConfigEntry(
		scenarioId = ScenarioId("PIP_EXPAND_TO_FULLSCREEN"),
		extractor = PIP_EXPAND_CUJ_EXTRACTOR,
		assertions = AssertionTemplates.COMMON_ASSERTIONS,
		assertions = AssertionTemplates.COMMON_ASSERTIONS + mapOf(
		LayerExpands(pipAppComponentTemplate) to AssertionInvocationGroup.BLOCKING
		),
		enabled = true
		)