diff options
5 files changed, 40 insertions, 75 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING index 38d46fe76..88f9a3e98 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING @@ -1,30 +1,7 @@ { "presubmit": [ { - "name": "CtsPermissionTestCases", - "options": [ - { - "include-filter": "android.permission.cts.BackgroundPermissionsTest" - }, - { - "include-filter": "android.permission.cts.LocationAccessCheckTest" - }, - { - "include-filter": "android.permission.cts.NotificationListenerCheckTest" - }, - { - "include-filter": "android.permission.cts.OneTimePermissionTest" - }, - { - "include-filter": "android.permission.cts.PermissionControllerTest" - }, - { - "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] + "name": "CtsPermissionTestCases_PermissionController" }, { "name": "CtsHibernationTestCases", diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING index 487701204..dc1bb28a5 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING @@ -1,20 +1,6 @@ { "presubmit": [ { - "name": "CtsPermissionTestCases", - "options": [ - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "include-filter": "android.permission.cts.PermissionControllerTest" - }, - { - "include-filter": "android.permission.cts.OneTimePermissionTest" - } - ] - }, - { "name": "CtsPermissionUiTestCases", "options": [ { @@ -26,18 +12,6 @@ ] }, { - "name": "CtsPermissionTestCases", - "options": [ - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "include-filter": "android.permission.cts.LocationAccessCheckTest" - } - ], - "file_patterns": ["LocationAccessCheck\\.java"] - }, - { "name": "CtsBackupTestCases", "options": [ { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING index d0b115bcb..507f19a15 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING @@ -1,17 +1,4 @@ { - "presubmit": [ - { - "name": "CtsPermissionTestCases", - "options": [ - { - "include-filter": "android.permission.cts.OneTimePermissionTest" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] - } - ], "presubmit-large": [ { "name": "CtsDevicePolicyManagerTestCases", diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING index 3e8c5a19c..abf0c4101 100644 --- a/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING @@ -23,18 +23,7 @@ ] }, { - "name": "CtsPermissionTestCases", - "options": [ - { - "include-filter": "android.permission.cts.NotificationListenerCheckTest" - }, - { - "include-filter": "android.permission.cts.AccessibilityPrivacySourceTest" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] + "name": "CtsPermissionTestCases_PrivacySources" } ], "postsubmit": [ diff --git a/tests/cts/permission/Android.bp b/tests/cts/permission/Android.bp index ed7fcea25..6fdda0fb5 100644 --- a/tests/cts/permission/Android.bp +++ b/tests/cts/permission/Android.bp @@ -128,3 +128,41 @@ android_test { ], per_testcase_directory: true, } + +test_module_config { + name: "CtsPermissionTestCases_Platform", + base: "CtsPermissionTestCases", + test_suites: ["general-tests"], + include_filters: [ + "android.permission.cts.BackgroundPermissionsTest", + "android.permission.cts.PermissionControllerTest", + "android.permission.cts.PermissionFlagsTest", + "android.permission.cts.RuntimePermissionPresentationInfoTest", + "android.permission.cts.SharedUidPermissionsTest", + "android.permission.cts.SplitPermissionTest", + ], +} + +test_module_config { + name: "CtsPermissionTestCases_PermissionController", + base: "CtsPermissionTestCases", + test_suites: ["general-tests"], + include_filters: [ + "android.permission.cts.BackgroundPermissionsTest", + "android.permission.cts.LocationAccessCheckTest", + "android.permission.cts.NotificationListenerCheckTest", + "android.permission.cts.OneTimePermissionTest", + "android.permission.cts.PermissionControllerTest", + "android.permission.cts.PlatformPermissionGroupMappingTest", + ], +} + +test_module_config { + name: "CtsPermissionTestCases_PrivacySources", + base: "CtsPermissionTestCases", + test_suites: ["general-tests"], + include_filters: [ + "android.permission.cts.AccessibilityPrivacySourceTest", + "android.permission.cts.NotificationListenerCheckTest", + ], +} |