Merge "Add more FlickerTests for verifying IME transition" into tm-dev am: 70be500d02 (6c335b12) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/FixedOrientationAppHelper.kt

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.server.wm.flicker.helpers

		import android.app.Instrumentation
		import android.support.test.launcherhelper.ILauncherStrategy
		import android.support.test.launcherhelper.LauncherStrategyFactory
		import com.android.server.wm.flicker.testapp.ActivityOptions
		import com.android.server.wm.traces.common.FlickerComponentName
		import com.android.server.wm.traces.parser.toFlickerComponent

		class FixedOrientationAppHelper @JvmOverloads constructor(
		instr: Instrumentation,
		launcherName: String = ActivityOptions.PORTRAIT_ONLY_ACTIVITY_LAUNCHER_NAME,
		component: FlickerComponentName =
		ActivityOptions.PORTRAIT_ONLY_ACTIVITY_COMPONENT_NAME.toFlickerComponent(),
		launcherStrategy: ILauncherStrategy = LauncherStrategyFactory
		.getInstance(instr)
		.launcherStrategy
		) : StandardAppHelper(instr, launcherName, component, launcherStrategy)
		No newline at end of file

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt

0 → 100644

+113 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.server.wm.flicker.ime

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.*
		import com.android.server.wm.flicker.annotation.Group2
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.*
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized

		/**
		* Test IME window layer will become visible when switching from the fixed orientation activity.
		* To run this test: `atest FlickerTests:OpenImeWindowFromFixedOrientationAppTest`
		*/
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group2
		class OpenImeWindowFromFixedOrientationAppTest(private val testSpec: FlickerTestParameter) {
		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		private val fixedOrientationApp = FixedOrientationAppHelper(instrumentation)
		private val imeTestApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)

		@FlickerBuilderProvider
		fun buildFlicker(): FlickerBuilder {
		return FlickerBuilder(instrumentation).apply {
		setup {
		eachRun {
		fixedOrientationApp.launchViaIntent(wmHelper)
		this.setRotation(Surface.ROTATION_90)
		}
		}
		transitions {
		imeTestApp.launchViaIntent(wmHelper)
		}
		teardown {
		test {
		fixedOrientationApp.exit(wmHelper)
		}
		}
		}
		}

		@Postsubmit
		@Test
		fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()

		@Postsubmit
		@Test
		fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()

		@Postsubmit
		@Test
		fun imeWindowBecomesVisible() = testSpec.imeWindowBecomesVisible()

		@Postsubmit
		@Test
		fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

		@FlakyTest(bugId = 206753786)
		fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

		@Postsubmit
		@Test
		fun imeLayerBecomesVisible() = testSpec.imeLayerBecomesVisible()

		companion object {
		/**
		* Creates the test configurations.
		*
		* See [FlickerTestParameterFactory.getConfigNonRotationTests] for configuring
		* repetitions, screen orientation and navigation modes.
		*/
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams(): Collection<FlickerTestParameter> {
		return FlickerTestParameterFactory.getInstance()
		.getConfigNonRotationTests(
		repetitions = 3,
		supportedRotations = listOf(Surface.ROTATION_0),
		supportedNavigationModes = listOf(
		WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
		)
		)
		}
		}
		}
		No newline at end of file

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt

0 → 100644

+169 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.server.wm.flicker.ime

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.RequiresDevice
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.*
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper
		import com.android.server.wm.traces.common.FlickerComponentName
		import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
		import org.junit.Assume.assumeTrue
		import org.junit.Assume.assumeFalse
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized

		/**
		* Test IME window layer will be associated with the app task when going to the overview screen.
		* To run this test: `atest FlickerTests:OpenImeWindowToOverViewTest`
		*/
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group4
		class OpenImeWindowToOverViewTest(private val testSpec: FlickerTestParameter) {
		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		private val imeTestApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)

		@FlickerBuilderProvider
		fun buildFlicker(): FlickerBuilder {
		return FlickerBuilder(instrumentation).apply {
		setup {
		eachRun {
		imeTestApp.launchViaIntent(wmHelper)
		}
		}
		transitions {
		device.pressRecentApps()
		waitForRecentsActivityVisible(wmHelper)
		}
		teardown {
		test {
		device.pressHome()
		imeTestApp.exit(wmHelper)
		}
		}
		}
		}
		@Postsubmit
		@Test
		fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()

		@Postsubmit
		@Test
		fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()

		@Postsubmit
		@Test
		fun imeWindowIsAlwaysVisible() {
		testSpec.imeWindowIsAlwaysVisible()
		}

		@Postsubmit
		@Test
		fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible()

		@Postsubmit
		@Test
		fun statusBarLayerIsVisibleInPortrait() {
		assumeFalse(testSpec.isLandscapeOrSeascapeAtStart)
		testSpec.statusBarLayerIsVisible()
		}

		@Postsubmit
		@Test
		fun statusBarLayerIsInVisibleInLandscape() {
		assumeTrue(testSpec.isLandscapeOrSeascapeAtStart)
		testSpec.assertLayersStart {
		this.isVisible(FlickerComponentName.STATUS_BAR)
		}
		testSpec.assertLayersEnd {
		this.isInvisible(FlickerComponentName.STATUS_BAR)
		}
		}

		@Postsubmit
		@Test
		fun imeLayerIsVisibleAndAssociatedWithAppWidow() {
		testSpec.assertLayersStart {
		isVisible(FlickerComponentName.IME).visibleRegion(FlickerComponentName.IME)
		.coversAtMost(isVisible(imeTestApp.component)
		.visibleRegion(imeTestApp.component).region)
		}
		testSpec.assertLayers {
		this.invoke("imeLayerIsVisibleAndAlignAppWidow") {
		val imeVisibleRegion = it.visibleRegion(FlickerComponentName.IME)
		val appVisibleRegion = it.visibleRegion(imeTestApp.component)
		if (imeVisibleRegion.region.isNotEmpty) {
		it.isVisible(FlickerComponentName.IME)
		imeVisibleRegion.coversAtMost(appVisibleRegion.region)
		}
		}
		}
		}

		private fun waitForRecentsActivityVisible(
		wmHelper: WindowManagerStateHelper
		) {
		val waitMsg = "state of Recents activity to be visible"
		require(
		wmHelper.waitFor(waitMsg) {
		it.wmState.homeActivity?.let { act ->
		it.wmState.isActivityVisible(act.name)
		} == true \|\|
		it.wmState.recentsActivity?.let { act ->
		it.wmState.isActivityVisible(act.name)
		} == true
		}
		) { "Recents activity should be visible" }
		wmHelper.waitForAppTransitionIdle()
		// Ensure WindowManagerService wait until all animations have completed
		instrumentation.uiAutomation.syncInputTransactions()
		}

		companion object {
		/**
		* Creates the test configurations.
		*
		* See [FlickerTestParameterFactory.getConfigNonRotationTests] for configuring
		* repetitions, screen orientation and navigation modes.
		*/
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams(): Collection<FlickerTestParameter> {
		return FlickerTestParameterFactory.getInstance()
		.getConfigNonRotationTests(
		repetitions = 1,
		supportedRotations = listOf(Surface.ROTATION_0, Surface.ROTATION_90),
		supportedNavigationModes = listOf(
		WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,
		WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
		)
		)
		}
		}
		}
		No newline at end of file

tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -108,5 +108,16 @@
		<category android:name="android.intent.category.LAUNCHER"/>
		</intent-filter>
		</activity>
		<activity android:name=".PortraitOnlyActivity"
		android:taskAffinity="com.android.server.wm.flicker.testapp.PortraitOnlyActivity"
		android:theme="@style/CutoutShortEdges"
		android:screenOrientation="portrait"
		android:configChanges="orientation\|screenSize"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN"/>
		<category android:name="android.intent.category.LAUNCHER"/>
		</intent-filter>
		</activity>
		</application>
		</manifest>

tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -60,4 +60,9 @@ public class ActivityOptions {
		public static final ComponentName DIALOG_THEMED_ACTIVITY_COMPONENT_NAME =
		new ComponentName(FLICKER_APP_PACKAGE,
		FLICKER_APP_PACKAGE + ".DialogThemedActivity");

		public static final String PORTRAIT_ONLY_ACTIVITY_LAUNCHER_NAME = "PortraitOnlyActivity";
		public static final ComponentName PORTRAIT_ONLY_ACTIVITY_COMPONENT_NAME =
		new ComponentName(FLICKER_APP_PACKAGE,
		FLICKER_APP_PACKAGE + ".PortraitOnlyActivity");
		}