Split app launch tests into multiple modules to comply with trunk stable runtime SLO (d2c95674) · Commits · e / os / android_frameworks_base

tests/FlickerTests/Android.bp

+48 −3

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,17 @@ filegroup {
	}		}

	filegroup {		filegroup {
	name: "FlickerTestsAppLaunch-src",		name: "FlickerTestsAppLaunchCommon-src",
			srcs: ["src/*/launch/common/.kt"],
			}

			filegroup {
			name: "FlickerTestsAppLaunch1-src",
			srcs: ["src/*/launch/OpenApp.kt"],
			}

			filegroup {
			name: "FlickerTestsAppLaunch2-src",
	srcs: ["src/*/launch/.kt"],		srcs: ["src/*/launch/.kt"],
	}		}

	@@ -119,7 +129,8 @@ android_test {
	exclude_srcs: [		exclude_srcs: [
	":FlickerTestsAppClose-src",		":FlickerTestsAppClose-src",
	":FlickerTestsIme-src",		":FlickerTestsIme-src",
	":FlickerTestsAppLaunch-src",		":FlickerTestsAppLaunch1-src",
			":FlickerTestsAppLaunch2-src",
	":FlickerTestsQuickswitch-src",		":FlickerTestsQuickswitch-src",
	":FlickerTestsRotation-src",		":FlickerTestsRotation-src",
	":FlickerTestsNotification-src",		":FlickerTestsNotification-src",
	@@ -162,10 +173,44 @@ android_test {
	instrumentation_target_package: "com.android.server.wm.flicker.launch",		instrumentation_target_package: "com.android.server.wm.flicker.launch",
	srcs: [		srcs: [
	":FlickerTestsBase-src",		":FlickerTestsBase-src",
	":FlickerTestsAppLaunch-src",		":FlickerTestsAppLaunchCommon-src",
			":FlickerTestsAppLaunch2-src",
			],
			exclude_srcs: [
			":FlickerTestsActivityEmbedding-src",
			],
			}

			android_test {
			name: "FlickerTestsAppLaunch1",
			defaults: ["FlickerTestsDefault"],
			additional_manifests: ["manifests/AndroidManifestAppLaunch.xml"],
			package_name: "com.android.server.wm.flicker.launch",
			instrumentation_target_package: "com.android.server.wm.flicker.launch",
			srcs: [
			":FlickerTestsBase-src",
			":FlickerTestsAppLaunchCommon-src",
			":FlickerTestsAppLaunch1-src",
			],
			exclude_srcs: [
			":FlickerTestsActivityEmbedding-src",
			],
			}

			android_test {
			name: "FlickerTestsAppLaunch2",
			defaults: ["FlickerTestsDefault"],
			additional_manifests: ["manifests/AndroidManifestAppLaunch.xml"],
			package_name: "com.android.server.wm.flicker.launch",
			instrumentation_target_package: "com.android.server.wm.flicker.launch",
			srcs: [
			":FlickerTestsBase-src",
			":FlickerTestsAppLaunchCommon-src",
			":FlickerTestsAppLaunch2-src",
	],		],
	exclude_srcs: [		exclude_srcs: [
	":FlickerTestsActivityEmbedding-src",		":FlickerTestsActivityEmbedding-src",
			":FlickerTestsAppLaunch1-src",
	],		],
	}		}

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

+2 −25

Original line number	Original line	Diff line number	Diff line
	@@ -16,13 +16,11 @@

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

	import android.tools.common.Rotation
	import android.tools.device.flicker.junit.FlickerParametersRunnerFactory		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.LegacyFlickerTest		import android.tools.device.flicker.legacy.LegacyFlickerTest
	import android.tools.device.flicker.legacy.LegacyFlickerTestFactory		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
	import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule
	import androidx.test.filters.FlakyTest		import androidx.test.filters.FlakyTest
			import com.android.server.wm.flicker.launch.common.OpenAppFromIconTransition
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	@@ -54,28 +52,7 @@ import org.junit.runners.Parameterized
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
	open class OpenAppFromIconColdTest(flicker: LegacyFlickerTest) :		open class OpenAppFromIconColdTest(flicker: LegacyFlickerTest) :
	OpenAppFromLauncherTransition(flicker) {		OpenAppFromIconTransition(flicker) {
	/** {@inheritDoc} */
	override val transition: FlickerBuilder.() -> Unit
	get() = {
	super.transition(this)
	setup {
	if (flicker.scenario.isTablet) {
	tapl.setExpectedRotation(flicker.scenario.startRotation.value)
	} else {
	tapl.setExpectedRotation(Rotation.ROTATION_0.value)
	}
	RemoveAllTasksButHomeRule.removeAllTasksButHome()
	}
	transitions {
	tapl
	.goHome()
	.switchToAllApps()
	.getAppIcon(testApp.appName)
	.launch(testApp.packageName)
	}
	teardown { testApp.exit(wmHelper) }
	}

	@FlakyTest(bugId = 240916028)		@FlakyTest(bugId = 240916028)
	@Test		@Test

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerBuilder		import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.LegacyFlickerTest		import android.tools.device.flicker.legacy.LegacyFlickerTest
	import android.tools.device.flicker.legacy.LegacyFlickerTestFactory		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
			import com.android.server.wm.flicker.launch.common.OpenAppFromLauncherTransition
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	import org.junit.runners.MethodSorters		import org.junit.runners.MethodSorters

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.tools.device.flicker.legacy.LegacyFlickerTest
	import android.tools.device.flicker.legacy.LegacyFlickerTestFactory		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
	import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome		import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
			import com.android.server.wm.flicker.launch.common.OpenAppFromLauncherTransition
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import android.tools.device.flicker.legacy.LegacyFlickerTest
	import android.tools.device.flicker.legacy.LegacyFlickerTestFactory		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
	import androidx.test.filters.FlakyTest		import androidx.test.filters.FlakyTest
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
			import com.android.server.wm.flicker.launch.common.OpenAppFromLauncherTransition
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith