Merge "Move OpenAppFromTaskbar E2E tests into /fundamentals subdir" into main (9a380758) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/OpenAppFromAllAppsFlickerTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/fundamentals/OpenAppFromAllAppsFlickerTest.kt

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.wm.shell.flicker		package com.android.wm.shell.flicker.fundamentals

	import android.platform.test.annotations.RequiresDevice		import android.platform.test.annotations.RequiresDevice
	import android.tools.NavBar		import android.tools.NavBar
	@@ -24,6 +24,7 @@ import android.tools.flicker.legacy.FlickerBuilder
	import android.tools.flicker.legacy.LegacyFlickerTest		import android.tools.flicker.legacy.LegacyFlickerTest
	import android.tools.flicker.legacy.LegacyFlickerTestFactory		import android.tools.flicker.legacy.LegacyFlickerTestFactory
	import com.android.wm.shell.Utils		import com.android.wm.shell.Utils
			import com.android.wm.shell.flicker.DesktopModeBaseTest
	import org.junit.Rule		import org.junit.Rule
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	@@ -42,7 +43,7 @@ class OpenAppFromAllAppsFlickerTest(flicker: LegacyFlickerTest) : DesktopModeBas
	@JvmField		@JvmField
	val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)
	val scenario = OpenAppFromAllApps()		val scenario = OpenAppFromAllApps()
	private val openedApp = scenario.getOpenedApp()		private val openedApp = scenario.calculatorApp

	override val transition: FlickerBuilder.() -> Unit		override val transition: FlickerBuilder.() -> Unit
	get() = {		get() = {

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/OpenAppFromTaskbarFlickerTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/fundamentals/OpenAppFromTaskbarFlickerTest.kt

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.wm.shell.flicker		package com.android.wm.shell.flicker.fundamentals

	import android.platform.test.annotations.RequiresDevice		import android.platform.test.annotations.RequiresDevice
	import android.tools.NavBar		import android.tools.NavBar
	@@ -24,6 +24,7 @@ import android.tools.flicker.legacy.FlickerBuilder
	import android.tools.flicker.legacy.LegacyFlickerTest		import android.tools.flicker.legacy.LegacyFlickerTest
	import android.tools.flicker.legacy.LegacyFlickerTestFactory		import android.tools.flicker.legacy.LegacyFlickerTestFactory
	import com.android.wm.shell.Utils		import com.android.wm.shell.Utils
			import com.android.wm.shell.flicker.DesktopModeBaseTest
	import com.android.wm.shell.scenarios.OpenAppFromTaskbar		import com.android.wm.shell.scenarios.OpenAppFromTaskbar
	import org.junit.Rule		import org.junit.Rule
	import org.junit.Test		import org.junit.Test
	@@ -42,7 +43,7 @@ class OpenAppFromTaskbarFlickerTest(flicker: LegacyFlickerTest) : DesktopModeBas
	@JvmField		@JvmField
	val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)
	val scenario = OpenAppFromTaskbar()		val scenario = OpenAppFromTaskbar()
	private val openedApp = scenario.getOpenedApp()		private val openedApp = scenario.browserApp

	override val transition: FlickerBuilder.() -> Unit		override val transition: FlickerBuilder.() -> Unit
	get() = {		get() = {

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/OpenAppFromAllAppsTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/fundamentals/OpenAppFromAllAppsTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.wm.shell.functional		package com.android.wm.shell.functional.fundamentals

	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import android.platform.test.rule.ScreenRecordRule		import android.platform.test.rule.ScreenRecordRule

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/OpenAppFromTaskbarTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/fundamentals/OpenAppFromTaskbarTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.wm.shell.functional		package com.android.wm.shell.functional.fundamentals

	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import android.platform.test.rule.ScreenRecordRule		import android.platform.test.rule.ScreenRecordRule

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/OpenAppFromAllApps.kt

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@ open class OpenAppFromAllApps() : TestScenarioBase() {
	private val wmHelper = WindowManagerStateHelper(instrumentation)		private val wmHelper = WindowManagerStateHelper(instrumentation)
	private val device = UiDevice.getInstance(instrumentation)		private val device = UiDevice.getInstance(instrumentation)
	private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))		private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))
	private val calculatorApp = CalculatorAppHelper(instrumentation)		val calculatorApp = CalculatorAppHelper(instrumentation)

	@Before		@Before
	fun setup() {		fun setup() {
	@@ -61,6 +61,4 @@ open class OpenAppFromAllApps() : TestScenarioBase() {
	calculatorApp.exit(wmHelper)		calculatorApp.exit(wmHelper)
	testApp.exit(wmHelper)		testApp.exit(wmHelper)
	}		}

	fun getOpenedApp() = calculatorApp
	}		}