diff options
3 files changed, 50 insertions, 120 deletions
diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING index 78e7e4a42..0ae3818fd 100644 --- a/PermissionController/TEST_MAPPING +++ b/PermissionController/TEST_MAPPING @@ -11,6 +11,24 @@ } ], "file_patterns": ["res/xml/roles\\.xml"] + }, + { + "name": "PermissionUiTestCases", + "options": [ + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + } + ] + } + ], + "presubmit-large": [ + { + "name": "CtsPermission3TestCases", + "options": [ + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + } + ] } ], "mainline-presubmit": [ @@ -29,6 +47,38 @@ } ], "file_patterns": ["res/xml/roles\\.xml"] + }, + { + "name": "PermissionUiTestCases[com.google.android.permission.apex]", + "options": [ + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + }, + // TODO(b/238773220): These tests currently fails on R base image + { + "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsGranted" + }, + { + "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsRevoked" + }, + { + "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenAppGetsInstalled" + }, + { + "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenDefinerGetsUninstalled" + }, + { + "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenUserGetsUninstalled" + } + ] + }, + { + "name": "CtsPermission3TestCases[com.google.android.permission.apex]", + "options": [ + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + } + ] } ], "imports": [ diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING index 23ce155ed..de7511e19 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING @@ -27,30 +27,6 @@ ] }, { - "name": "PermissionUiTestCases", - "options": [ - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - // TODO(b/238773220): These tests currently fails on R base image - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsGranted" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsRevoked" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenAppGetsInstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenDefinerGetsUninstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenUserGetsUninstalled" - } - ] - }, - { "name": "CtsOsTestCases", "options": [ { @@ -65,16 +41,6 @@ ] } ], - "presubmit-large": [ - { - "name": "CtsPermission3TestCases", - "options": [ - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - } - ] - } - ], "mainline-presubmit": [ { "name": "CtsPermissionTestCases[com.google.android.permission.apex]", @@ -103,38 +69,6 @@ ] }, { - "name": "CtsPermission3TestCases[com.google.android.permission.apex]", - "options": [ - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - } - ] - }, - { - "name": "PermissionUiTestCases[com.google.android.permission.apex]", - "options": [ - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - // TODO(b/238773220): These tests currently fails on R base image - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsGranted" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsRevoked" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenAppGetsInstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenDefinerGetsUninstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenUserGetsUninstalled" - } - ] - }, - { "name": "CtsOsTestCases[com.google.android.permission.apex]", "options": [ { diff --git a/PermissionController/tests/permissionui/TEST_MAPPING b/PermissionController/tests/permissionui/TEST_MAPPING deleted file mode 100644 index 6a71e5ec0..000000000 --- a/PermissionController/tests/permissionui/TEST_MAPPING +++ /dev/null @@ -1,54 +0,0 @@ -{ - "presubmit": [ - { - "name": "PermissionUiTestCases", - "options": [ - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - // TODO(b/238773220): These tests currently fails on R base image - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsGranted" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsRevoked" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenAppGetsInstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenDefinerGetsUninstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenUserGetsUninstalled" - } - ] - } - ], - "mainline-presubmit": [ - { - "name": "PermissionUiTestCases[com.google.android.permission.apex]", - "options": [ - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" - }, - // TODO(b/238773220): These tests currently fails on R base image - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsGranted" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageCustomPermissionsFragmentTest#groupSummaryGetsUpdatedWhenPermissionGetsRevoked" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenAppGetsInstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenDefinerGetsUninstalled" - }, - { - "exclude-filter": "com.android.permissioncontroller.permissionui.ui.handheld.ManageStandardPermissionsFragmentTest#additionalPermissionSummaryGetUpdateWhenUserGetsUninstalled" - } - ] - } - ] -} |