Merge "FlickerTests: Fix focus change test during rotation" (4a5c1ed2) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+8 −3

Original line number	Diff line number	Diff line
		@@ -114,11 +114,16 @@ class ChangeAppRotationTest(
		flickerRule.checkFlakyAssertions()
		}

		/** {@inheritDoc} */
		/**
		* Windows maybe recreated when rotated. Checks that the focus does not change or if it does,
		* focus returns to [testApp]
		*/
		@FlakyTest(bugId = 190185577)
		@Test
		override fun focusDoesNotChange() {
		super.focusDoesNotChange()
		fun focusChanges() {
		testSpec.assertEventLog {
		this.focusChanges(testApp.`package`)
		}
		}

		/**

+0 −11

Original line number	Diff line number	Diff line
		@@ -128,17 +128,6 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter)
		@Test
		open fun entireScreenCovered() = testSpec.entireScreenCovered()

		/**
		* Checks that the focus doesn't change during animation
		*/
		@Presubmit
		@Test
		open fun focusDoesNotChange() {
		testSpec.assertEventLog {
		this.focusDoesNotChange()
		}
		}

		/**
		* Checks that [testApp] layer covers the entire screen at the start of the transition
		*/

+13 −9

Original line number	Diff line number	Diff line
		@@ -146,15 +146,6 @@ class SeamlessAppRotationTest(
		}
		}

		/** {@inheritDoc} */
		@Presubmit
		@Test
		override fun focusDoesNotChange() {
		// This test doesn't work in shell transitions because of b/206101151
		assumeFalse(isShellTransitionsEnabled)
		super.focusDoesNotChange()
		}

		/**
		* Checks that [testApp] layer covers the entire screen during the whole transition
		*/
		@@ -196,6 +187,19 @@ class SeamlessAppRotationTest(
		}
		}

		/**
		* Checks that the focus doesn't change during animation
		*/
		@Presubmit
		@Test
		fun focusDoesNotChange() {
		// This test doesn't work in shell transitions because of b/206101151
		assumeFalse(isShellTransitionsEnabled)
		testSpec.assertEventLog {
		this.focusDoesNotChange()
		}
		}

		/** {@inheritDoc} */
		@FlakyTest
		@Test