Merge "Revert "Use SysUI TAPL on flicker to fix lock screen tests"" (7f453452) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,6 @@ android_test {
		"app-helpers-core",
		"launcher-helper-lib",
		"launcher-aosp-tapl",
		"systemui-tapl",
		"systemui-helper",
		"wm-flicker-common-assertions",
		"wm-flicker-common-app-helpers",
		"platform-test-annotations",

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt

+7 −12

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.wm.shell.flicker.bubble

		import android.platform.systemui_tapl.controller.LockscreenController
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		@@ -47,23 +46,18 @@ import org.junit.runners.Parameterized
		@Group4
		class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {

		private val lockScreen = LockscreenController.get()

		/** {@inheritDoc} */
		override val transition: FlickerBuilder.() -> Unit
		get() = buildTransition {
		setup {
		test {
		lockScreen.setUnlockSwipe()
		}
		eachRun {
		val addBubbleBtn = waitAndGetAddBubbleBtn()
		addBubbleBtn?.click() ?: error("Bubble widget not found")
		lockScreen.lockScreen()
		device.sleep()
		wmHelper.StateSyncBuilder()
		.withKeyguardShowing()
		.withoutTopVisibleAppWindows()
		.waitForAndVerify()
		lockScreen.turnScreenOn()
		device.wakeUp()
		}
		}
		transitions {
		@@ -76,7 +70,8 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr
		or WindowInsets.Type.displayCutout()
		)
		device.swipe(100, insets.top + 100, 100, device.displayHeight / 2, 4)
		wmHelper.StateSyncBuilder().withAppTransitionIdle().waitForAndVerify()
		device.waitForIdle(2000)
		instrumentation.uiAutomation.syncInputTransactions()

		val notification = device.wait(
		Until.findObject(
		@@ -84,14 +79,14 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr
		), FIND_OBJECT_TIMEOUT
		)
		notification?.click() ?: error("Notification not found")
		wmHelper.StateSyncBuilder().withAppTransitionIdle().waitForAndVerify()
		instrumentation.uiAutomation.syncInputTransactions()
		val showBubble = device.wait(
		Until.findObject(
		By.res("com.android.systemui", "bubble_view")
		), FIND_OBJECT_TIMEOUT
		)
		showBubble?.click() ?: error("Bubble notify not found")
		wmHelper.StateSyncBuilder().withAppTransitionIdle().waitForAndVerify()
		instrumentation.uiAutomation.syncInputTransactions()
		val cancelAllBtn = waitAndGetCancelAllBtn()
		cancelAllBtn?.click() ?: error("Cancel widget not found")
		}

tests/FlickerTests/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,6 @@ android_test {
		"truth-prebuilt",
		"launcher-helper-lib",
		"launcher-aosp-tapl",
		"systemui-tapl",
		"systemui-helper",
		"platform-test-annotations",
		"wm-flicker-window-extensions",
		],

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt

+3 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.wm.flicker.launch

		import android.platform.systemui_tapl.controller.LockscreenController
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.RequiresDevice
		@@ -51,8 +50,6 @@ import org.junit.runners.Parameterized
		open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) :
		OpenAppFromNotificationCold(testSpec) {

		private val lockScreen = LockscreenController.get()

		override val openingNotificationsFromLockScreen = true

		override val transition: FlickerBuilder.() -> Unit
		@@ -60,7 +57,7 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) :
		// Needs to run at start of transition,
		// so before the transition defined in super.transition
		transitions {
		lockScreen.turnScreenOn()
		device.wakeUp()
		}

		super.transition(this)
		@@ -68,9 +65,9 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) :
		// Needs to run at the end of the setup, so after the setup defined in super.transition
		setup {
		eachRun {
		lockScreen.lockScreen()
		device.sleep()
		wmHelper.StateSyncBuilder()
		.withKeyguardShowing()
		.withoutTopVisibleAppWindows()
		.waitForAndVerify()
		}
		}

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt

+5 −7

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		package com.android.server.wm.flicker.launch

		import android.platform.systemui_tapl.controller.LockscreenController
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		@@ -52,8 +52,6 @@ import org.junit.runners.Parameterized
		open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :
		OpenAppFromNotificationWarm(testSpec) {

		private val lockScreen = LockscreenController.get()

		override val openingNotificationsFromLockScreen = true

		override val transition: FlickerBuilder.() -> Unit
		@@ -61,7 +59,7 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :
		// Needs to run at start of transition,
		// so before the transition defined in super.transition
		transitions {
		lockScreen.turnScreenOn()
		device.wakeUp()
		}

		super.transition(this)
		@@ -69,9 +67,9 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :
		// Needs to run at the end of the setup, so after the setup defined in super.transition
		setup {
		eachRun {
		lockScreen.lockScreen()
		device.sleep()
		wmHelper.StateSyncBuilder()
		.withKeyguardShowing()
		.withoutTopVisibleAppWindows()
		.waitForAndVerify()
		}
		}
		@@ -195,7 +193,7 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :
		super.appWindowIsTopWindowAtEnd()

		/** {@inheritDoc} */
		@Postsubmit
		@Presubmit
		@Test
		override fun appWindowBecomesTopWindow_ShellTransit() =
		super.appWindowBecomesTopWindow_ShellTransit()