Merge "Move SystemUIGoogleBiometricsScreenshotTests to new test config." into main (e2dab5d3) · Commits · e / os / android_frameworks_base

packages/SystemUI/TEST_MAPPING

+38 −14

Original line number	Original line	Diff line number	Diff line
	@@ -31,20 +31,6 @@
	}		}
	]		]
	},		},
	{
	// TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
	"name": "SystemUIGoogleBiometricsScreenshotTests",
	"options": [
	{
	"exclude-annotation": "org.junit.Ignore"
	},
	{
	"exclude-annotation": "androidx.test.filters.FlakyTest"
	}
	],
	// The test doesn't run on AOSP Cuttlefish
	"keywords": ["internal"]
	},
	{		{
	// Permission indicators		// Permission indicators
	"name": "CtsPermissionUiTestCases",		"name": "CtsPermissionUiTestCases",
	@@ -73,6 +59,7 @@
	]		]
	}		}
	],		],

	"auto-end-to-end-postsubmit": [		"auto-end-to-end-postsubmit": [
	{		{
	"name": "AndroidAutomotiveHomeTests",		"name": "AndroidAutomotiveHomeTests",
	@@ -91,6 +78,7 @@
	]		]
	}		}
	],		],

	"postsubmit": [		"postsubmit": [
	{		{
	// Permission indicators		// Permission indicators
	@@ -116,6 +104,7 @@
	]		]
	}		}
	],		],

	// v2/sysui/suite/test-mapping-sysui-screenshot-test		// v2/sysui/suite/test-mapping-sysui-screenshot-test
	"sysui-screenshot-test": [		"sysui-screenshot-test": [
	{		{
	@@ -151,8 +140,27 @@
	"exclude-annotation": "android.platform.test.annotations.Postsubmit"		"exclude-annotation": "android.platform.test.annotations.Postsubmit"
	}		}
	]		]
			},
			{
			// TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
			"name": "SystemUIGoogleBiometricsScreenshotTests",
			"options": [
			{
			"exclude-annotation": "org.junit.Ignore"
			},
			{
			"exclude-annotation": "androidx.test.filters.FlakyTest"
			},
			{
			"exclude-annotation": "android.platform.test.annotations.FlakyTest"
			},
			{
			"exclude-annotation": "android.platform.test.annotations.Postsubmit"
			}
			]
	}		}
	],		],

	// v2/sysui/suite/test-mapping-sysui-screenshot-test-staged		// v2/sysui/suite/test-mapping-sysui-screenshot-test-staged
	"sysui-screenshot-test-staged": [		"sysui-screenshot-test-staged": [
	{		{
	@@ -188,6 +196,22 @@
	"include-annotation": "android.platform.test.annotations.Postsubmit"		"include-annotation": "android.platform.test.annotations.Postsubmit"
	}		}
	]		]
			},
			{ "name": "SystemUIGoogleBiometricsScreenshotTests",
			"options": [
			{
			"exclude-annotation": "org.junit.Ignore"
			},
			{
			"include-annotation": "androidx.test.filters.FlakyTest"
			},
			{
			"include-annotation": "android.platform.test.annotations.FlakyTest"
			},
			{
			"include-annotation": "android.platform.test.annotations.Postsubmit"
			}
			]
	}		}
	]		]
	}		}