Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6850d3f authored Aug 27, 2021 by Nataniel Borges

Create new test group to split the tests

Flicker tests are taking longer than the 30min Treehugger SLO. Introduce a new test group (group 4) to reduce the flicker impact on presubmit

Bug: 197230743
Test: atest FlickerTests
Change-Id: I3373622f6fde82307b25cbab8621c1045242837d

parent fedbf2a4

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.launchSplitScreen
		import com.android.server.wm.flicker.navBarWindowIsVisible
		@@ -50,7 +50,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		@Group4
		class EnterSplitScreenDockActivity(
		testSpec: FlickerTestParameter
		) : LegacySplitScreenTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenFromDetachedRecentTask.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.launchSplitScreen
		import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
		@@ -43,6 +44,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@Group4
		class EnterSplitScreenFromDetachedRecentTask(
		testSpec: FlickerTestParameter
		) : LegacySplitScreenTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.launchSplitScreen
		import com.android.server.wm.flicker.helpers.reopenAppFromOverview
		@@ -49,7 +49,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		@Group4
		class EnterSplitScreenLaunchToSide(
		testSpec: FlickerTestParameter
		) : LegacySplitScreenTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNotSupportNonResizable.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.canSplitScreen
		import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
		@@ -51,7 +51,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@Group1
		@Group4
		class EnterSplitScreenNotSupportNonResizable(
		testSpec: FlickerTestParameter
		) : LegacySplitScreenTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group3
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.WindowUtils
		import com.android.server.wm.flicker.helpers.setRotation
		@@ -43,7 +43,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group3
		@Group4
		class PipKeyboardTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
		private val imeApp = ImeAppHelper(instrumentation)