Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5d75001 authored by Ronald Braunstein's avatar Ronald Braunstein
Browse files

Convert CtsPermissionTestCase to test_module_config. 

go/test-module-variant-migration-plan
Bug: b/344977291
Test: atest all the new presubmit groups and compare counts of tests
On both this CL and main, run these and compare the number of tests per
class.
	atest -p core/java/android/permission:presubmit --collect-tests-only
	atest -p core/java/com/android/internal/infra:presubmit --collect-tests-only
	atest -p services/core/java/com/android/server/appop:presubmit --collect-tests-only
	atest -p services/core/java/com/android/server/pm/permission:presubmit --collect-tests-only
	atest -p services/core/java/com/android/server/policy:presubmit --collect-tests-only

Test-Mapping-Slo-Bypass-Bug: b/335015078

Change-Id: I856954198e306c449fd2d2ce6b4d5476ed0c052e
parent 448a9ffa

core/java/android/permission/TEST_MAPPING

+2 −10
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "CtsPermissionTestCases",

            "options": [

                {

                    "include-filter": "android.permission.cts.PermissionControllerTest"

                },

                {

                    "include-filter": "android.permission.cts.RuntimePermissionPresentationInfoTest"

                }

            ]

            "name": "CtsPermissionTestCases_Platform"

        }

    ]

}

core/java/com/android/internal/infra/TEST_MAPPING

+1 −9
Original line number Diff line number Diff line
@@ -9,15 +9,7 @@ 
      ]

    },

    {

      "name": "CtsPermissionTestCases",

      "options": [

          {

            "include-filter": "android.permission.cts.PermissionControllerTest"

          },

          {

            "exclude-annotation": "androidx.test.filters.FlakyTest"

          }

      ]

      "name": "CtsPermissionTestCases_Platform"

    },

    {

      "name": "FrameworksCoreTests_internal_infra"

services/core/java/com/android/server/appop/TEST_MAPPING

+1 −18
Original line number Diff line number Diff line
@@ -18,24 +18,7 @@ 
            "name": "FrameworksMockingServicesTests_android_server_appop"

        },

        {

            "name": "CtsPermissionTestCases",

            "options": [

                {

                    "exclude-annotation": "androidx.test.filters.FlakyTest"

                },

                {

                    "include-filter": "android.permission.cts.BackgroundPermissionsTest"

                },

                {

                    "include-filter": "android.permission.cts.SplitPermissionTest"

                },

                {

                    "include-filter": "android.permission.cts.PermissionFlagsTest"

                },

                {

                    "include-filter": "android.permission.cts.SharedUidPermissionsTest"

                }

            ]

            "name": "CtsPermissionTestCases_Platform"

        },

        {

            "name": "CtsAppTestCases",

services/core/java/com/android/server/pm/permission/TEST_MAPPING

+1 −18
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "CtsPermissionTestCases",

            "options": [

                {

                    "exclude-annotation": "androidx.test.filters.FlakyTest"

                },

                {

                    "include-filter": "android.permission.cts.BackgroundPermissionsTest"

                },

                {

                    "include-filter": "android.permission.cts.SplitPermissionTest"

                },

                {

                    "include-filter": "android.permission.cts.PermissionFlagsTest"

                },

                {

                    "include-filter": "android.permission.cts.SharedUidPermissionsTest"

                }

            ]

            "name": "CtsPermissionTestCases_Platform"

        },

        {

            "name": "CtsAppSecurityHostTestCases",

services/core/java/com/android/server/policy/TEST_MAPPING

+1 −12
Original line number Diff line number Diff line
@@ -46,18 +46,7 @@ 
      ]

    },

    {

      "name": "CtsPermissionTestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "include-filter": "android.permission.cts.SplitPermissionTest"

        },

        {

          "include-filter": "android.permission.cts.BackgroundPermissionsTest"

        }

      ]

      "name": "CtsPermissionTestCases_Platform"

    },

    {

      "name": "CtsBackupTestCases",