Merge "Update test config" into main (45412398) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/Android.bp

+24 −9

Original line number	Diff line number	Diff line
		@@ -59,8 +59,8 @@ test_module_config {
		"com.android.wm.shell.flicker.bubbles.CollapseBubbleAppViaBackTest",
		"com.android.wm.shell.flicker.bubbles.CollapseBubbleAppViaTouchOutsideTest",
		"com.android.wm.shell.flicker.bubbles.DismissAllCollapsedBubbleAppsTest",
		"com.android.wm.shell.flicker.bubbles.DismissExpandedBubbleViaBubbleBarTest",
		"com.android.wm.shell.flicker.bubbles.DismissExpandedBubbleViaBubbleBarHandleTest",
		"com.android.wm.shell.flicker.bubbles.DismissExpandedBubbleViaBubbleBarTest",
		"com.android.wm.shell.flicker.bubbles.DismissExpandedBubbleViaBubbleViewTest",
		"com.android.wm.shell.flicker.bubbles.EnterBubbleFromHomeScreenTest",
		"com.android.wm.shell.flicker.bubbles.EnterBubbleViaBubbleMenuTest",
		@@ -69,6 +69,7 @@ test_module_config {
		"com.android.wm.shell.flicker.bubbles.EnterBubbleWithImeViaBubbleMenuTest",
		"com.android.wm.shell.flicker.bubbles.ExpandBubbleViaBubbleStackTest",
		"com.android.wm.shell.flicker.bubbles.ExpandBubbleWithImeViaBubbleBarTest",
		"com.android.wm.shell.flicker.bubbles.ExpandedBubbleAppMoveTest",
		"com.android.wm.shell.flicker.bubbles.LaunchMultipleBubbleTest",
		"com.android.wm.shell.flicker.bubbles.ScrollableBubbleAppTest",
		"com.android.wm.shell.flicker.bubbles.SwitchBetweenBubblesTest",
		@@ -85,17 +86,17 @@ test_module_config {
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-BubbleIconMoveTest",
		name: "WMShellExplicitFlickerTestsBubbles-BubbleBarVisibilityTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.BubbleIconMoveTest"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.BubbleBarVisibilityTest"],
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-BubbleBarVisibilityTest",
		name: "WMShellExplicitFlickerTestsBubbles-BubbleIconMoveTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.BubbleBarVisibilityTest"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.BubbleIconMoveTest"],
		}

		test_module_config {
		@@ -105,6 +106,13 @@ test_module_config {
		include_filters: ["com.android.wm.shell.flicker.bubbles.CollapseBubbleAppViaBackTest"],
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-CollapseBubbleAppViaTouchOutsideTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.CollapseBubbleAppViaTouchOutsideTest"],
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-DismissAllCollapsedBubbleAppsTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		@@ -112,6 +120,13 @@ test_module_config {
		include_filters: ["com.android.wm.shell.flicker.bubbles.DismissAllCollapsedBubbleAppsTest"],
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleBarHandleTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.DismissExpandedBubbleViaBubbleBarHandleTest"],
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleBarTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		@@ -127,17 +142,17 @@ test_module_config {
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaBubbleMenuTest",
		name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleFromHomeScreenTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.EnterBubbleViaBubbleMenuTest"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.EnterBubbleFromHomeScreenTest"],
		}

		test_module_config {
		name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleFromHomeScreenTest",
		name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaBubbleMenuTest",
		base: "WMShellExplicitFlickerTestsBubbles",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.EnterBubbleFromHomeScreenTest"],
		include_filters: ["com.android.wm.shell.flicker.bubbles.EnterBubbleViaBubbleMenuTest"],
		}

		test_module_config {

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/TEST_MAPPING

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,19 +22,19 @@
		"name": "WMShellExplicitFlickerTestsBubbles-DismissAllCollapsedBubbleAppsTest"
		},
		{
		"name": "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleBarTest"
		"name": "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleBarHandleTest"
		},
		{
		"name": "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleBarHandleTest"
		"name": "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleBarTest"
		},
		{
		"name": "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleViewTest"
		},
		{
		"name": "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaBubbleMenuTest"
		"name": "WMShellExplicitFlickerTestsBubbles-EnterBubbleFromHomeScreenTest"
		},
		{
		"name": "WMShellExplicitFlickerTestsBubbles-EnterBubbleFromHomeScreenTest"
		"name": "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaBubbleMenuTest"
		},
		{
		"name": "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaDragToBubbleBarTest"