Merge "Temporality remove app handle test from cuj6p/e" into main (3f5a77d3) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/desktopmode/smoke/src/com/android/wm/shell/ConnectedDisplayCujSmokeTests.kt

+25 −2

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import org.junit.After
		import org.junit.Assert.assertTrue
		import org.junit.Assume
		import org.junit.Before
		import org.junit.Ignore
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -302,7 +303,7 @@ class ConnectedDisplayCujSmokeTests {
		verifyWindowCount(browserApp, expectedCount = 1)
		}

		fun cuj6() {
		fun cuj6(skipAppHandleTest: Boolean = false) {
		val externalDisplayId = connectedDisplayRule.setupTestDisplay()
		assertTaskbarVisible(externalDisplayId)
		context.startActivity(
		@@ -321,7 +322,11 @@ class ConnectedDisplayCujSmokeTests {
		visible = true
		)

		// Enter desktop via app header.
		if (skipAppHandleTest) {
		return
		}

		// Enter desktop via app handle.
		openAppHandleMenuForFullscreenApp(externalDisplayId)
		waitForSysUiObjectForTheApp(clockApp, DESKTOP_BUTTON_RES_ID).click()
		verifyActivityState(clockApp, WINDOWING_MODE_FREEFORM, externalDisplayId, visible = true)
		@@ -331,6 +336,7 @@ class ConnectedDisplayCujSmokeTests {

		// Extended: All window modes are supported on the connected display, including split screen
		@Test
		@Ignore("b/428563383")
		@ExtendedOnly
		fun cuj6e() {
		cuj6()
		@@ -338,11 +344,28 @@ class ConnectedDisplayCujSmokeTests {

		// Projected: All window modes are supported on the connected display, including split screen
		@Test
		@Ignore("b/428563383")
		@ProjectedOnly
		fun cuj6p() {
		cuj6()
		}

		// TODO(b/428563383) - Remove [cuj6e_skipAppHandle].
		// Extended: The same as CUJ6e but excluding app handle test.
		@Test
		@ExtendedOnly
		fun cuj6e_skipAppHandle() {
		cuj6(skipAppHandleTest = true)
		}

		// TODO(b/428563383) - Remove [cuj6p_skipAppHandle].
		// Extended: The same as CUJ6p but excluding app handle test.
		@Test
		@ProjectedOnly
		fun cuj6p_skipAppHandle() {
		cuj6(skipAppHandleTest = true)
		}

		// Extended: Opening an app from a full screen view will switch back to the desktop session,
		// going to overview in this state will show the desktop view, with any full screen apps as
		// tiles to the left