Merge "Create PIP tests for CF ARM configuration" (d31d5486) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@ import org.junit.runners.Parameterized
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
	class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTest(flicker) {		open class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTest(flicker) {
	/** Defines the transition used to run the test */		/** Defines the transition used to run the test */
	override val transition: FlickerBuilder.() -> Unit		override val transition: FlickerBuilder.() -> Unit
	get() = {		get() = {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTestCfArm.kt

0 → 100644

+30 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2023 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.wm.shell.flicker.pip

			import com.android.server.wm.flicker.FlickerTest
			import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
			import org.junit.FixMethodOrder
			import org.junit.runner.RunWith
			import org.junit.runners.MethodSorters
			import org.junit.runners.Parameterized

			/** This test will fail because of b/264261596 */
			@RunWith(Parameterized::class)
			@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
			@FixMethodOrder(MethodSorters.NAME_ASCENDING)
			class EnterPipOnUserLeaveHintTestCfArm(flicker: FlickerTest) : EnterPipOnUserLeaveHintTest(flicker)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTestCfArm.kt

0 → 100644

+47 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2023 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.wm.shell.flicker.pip

			import com.android.server.wm.flicker.FlickerTest
			import com.android.server.wm.flicker.FlickerTestFactory
			import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
			import com.android.server.wm.traces.common.service.PlatformConsts
			import org.junit.FixMethodOrder
			import org.junit.runner.RunWith
			import org.junit.runners.MethodSorters
			import org.junit.runners.Parameterized

			@RunWith(Parameterized::class)
			@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
			@FixMethodOrder(MethodSorters.NAME_ASCENDING)
			class EnterPipTestCfArm(flicker: FlickerTest) : EnterPipTest(flicker) {
			companion object {
			/**
			* Creates the test configurations.
			*
			* See [FlickerTestFactory.nonRotationTests] for configuring repetitions, screen orientation
			* and navigation modes.
			*/
			@Parameterized.Parameters(name = "{0}")
			@JvmStatic
			fun getParams(): List<FlickerTest> {
			return FlickerTestFactory.nonRotationTests(
			supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)
			)
			}
			}
			}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,7 @@ import org.junit.runners.Parameterized
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
	class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flicker) {		open class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flicker) {
	private val testApp = FixedOrientationAppHelper(instrumentation)		private val testApp = FixedOrientationAppHelper(instrumentation)
	private val startingBounds = WindowUtils.getDisplayBounds(PlatformConsts.Rotation.ROTATION_90)		private val startingBounds = WindowUtils.getDisplayBounds(PlatformConsts.Rotation.ROTATION_90)
	private val endingBounds = WindowUtils.getDisplayBounds(PlatformConsts.Rotation.ROTATION_0)		private val endingBounds = WindowUtils.getDisplayBounds(PlatformConsts.Rotation.ROTATION_0)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTestCfArm.kt

0 → 100644

+49 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2023 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.wm.shell.flicker.pip

			import com.android.server.wm.flicker.FlickerTest
			import com.android.server.wm.flicker.FlickerTestFactory
			import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
			import com.android.server.wm.traces.common.service.PlatformConsts
			import org.junit.FixMethodOrder
			import org.junit.runner.RunWith
			import org.junit.runners.MethodSorters
			import org.junit.runners.Parameterized

			/** This test fails because of b/264261596 */
			@RunWith(Parameterized::class)
			@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
			@FixMethodOrder(MethodSorters.NAME_ASCENDING)
			open class EnterPipToOtherOrientationTestCfArm(flicker: FlickerTest) :
			EnterPipToOtherOrientationTest(flicker) {
			companion object {
			/**
			* Creates the test configurations.
			*
			* See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and
			* navigation modes.
			*/
			@Parameterized.Parameters(name = "{0}")
			@JvmStatic
			fun getParams(): Collection<FlickerTest> {
			return FlickerTestFactory.nonRotationTests(
			supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)
			)
			}
			}
			}