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

Commit 3d7bed9d authored May 22, 2021 by TreeHugger Robot Committed by Automerger Merge Worker May 22, 2021

Merge "Split flicker tests into groups" into sc-dev am: 608a4392

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601816

Change-Id: I579c9f2588bd492f3abc87fdfe7c1038e7433874

parents df12bfb9 608a4392

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.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.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.wm.shell.flicker.appPairsDividerIsInvisible
		import com.android.wm.shell.flicker.helpers.AppPairsHelper
		@@ -47,6 +48,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		class AppPairsTestCannotPairNonResizeableApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.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.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.traces.layers.getVisibleBounds
		import com.android.wm.shell.flicker.APP_PAIR_SPLIT_DIVIDER
		@@ -42,6 +43,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		class AppPairsTestPairPrimaryAndSecondaryApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.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.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.wm.shell.flicker.appPairsDividerIsVisible
		import com.android.wm.shell.flicker.helpers.AppPairsHelper
		@@ -47,6 +48,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		class AppPairsTestSupportPairNonResizeableApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.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.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.traces.layers.getVisibleBounds
		import com.android.wm.shell.flicker.APP_PAIR_SPLIT_DIVIDER
		@@ -42,6 +43,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		class AppPairsTestUnpairPrimaryAndSecondaryApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,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.dsl.FlickerBuilder
		import com.android.server.wm.flicker.endRotation
		import com.android.server.wm.flicker.helpers.setRotation
		@@ -46,6 +47,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group1
		class RotateTwoLaunchedAppsInAppPairsMode(
		testSpec: FlickerTestParameter
		) : RotateTwoLaunchedAppsTransition(testSpec) {