Merge "Enable passing tests and delete shelltransit class" into udc-dev (2c2a2cf0) · Commits · e / os / android_frameworks_base

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

+2 −11

Original line number	Diff line number	Diff line
		@@ -16,13 +16,11 @@

		package com.android.server.wm.flicker.ime

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Presubmit
		import android.tools.common.NavBar
		import android.tools.common.Rotation
		import android.tools.common.datatypes.component.ComponentNameMatcher
		import com.android.server.wm.flicker.helpers.ImeShownOnAppStartHelper
		import android.tools.device.flicker.isShellTransitionsEnabled
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.FlickerTest
		@@ -31,8 +29,6 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.BaseTest
		import com.android.server.wm.flicker.helpers.SimpleAppHelper
		import com.android.server.wm.flicker.helpers.setRotation
		import org.junit.Assume
		import org.junit.Before
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -54,11 +50,6 @@ open class ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest(flicker: Flicker
		private val imeTestApp =
		ImeShownOnAppStartHelper(instrumentation, flicker.scenario.startRotation)

		@Before
		open fun before() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		}

		/** {@inheritDoc} */
		override val transition: FlickerBuilder.() -> Unit = {
		setup {
		@@ -95,7 +86,7 @@ open class ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest(flicker: Flicker
		}
		}
		/** {@inheritDoc} */
		@FlakyTest(bugId = 265016201)
		@Presubmit
		@Test
		override fun entireScreenCovered() = super.entireScreenCovered()

		@@ -115,7 +106,7 @@ open class ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest(flicker: Flicker
		}
		}

		@FlakyTest(bugId = 244414110)
		@Presubmit
		@Test
		open fun imeLayerIsVisibleWhenSwitchingToImeApp() {
		flicker.assertLayersStart { isVisible(ComponentNameMatcher.IME) }

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

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.platform.test.annotations.Presubmit
		import android.tools.device.flicker.isShellTransitionsEnabled
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerTest
		import androidx.test.filters.RequiresDevice
		import org.junit.Assume
		import org.junit.Before
		import org.junit.FixMethodOrder
		import org.junit.Ignore
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized

		/**
		* Test IME windows switching with 2-Buttons or gestural navigation. To run this test: `atest
		* FlickerTests:SwitchImeWindowsFromGestureNavTest`
		*/
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		class ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTestShellTransit(flicker: FlickerTest) :
		ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest(flicker) {
		@Before
		override fun before() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		}

		@Presubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()

		@Presubmit
		@Test
		override fun imeLayerIsVisibleWhenSwitchingToImeApp() =
		super.imeLayerIsVisibleWhenSwitchingToImeApp()

		@Presubmit
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
		super.visibleLayersShownMoreThanOneConsecutiveEntry()

		@Presubmit
		@Test
		override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
		super.visibleWindowsShownMoreThanOneConsecutiveEntry()

		/** {@inheritDoc} */
		@Ignore("Nav bar window becomes invisible during quick switch")
		@Test
		override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()
		}