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

Commit 21b0b3bc authored by Ronald Braunstein's avatar Ronald Braunstein
Browse files

Migrate FrameworksServicesTests options to Android.bp 

Test: atest

Ran these commands (one per TEST_MAPPING file) with this change and on
main and compared results of test counts by module.

	atest -p apex/jobscheduler/service/java/com/android/server/job:presubmit --collect-tests-only > apex_jobscheduler_service_java_com_android_server_job_presubmit.new
	atest -p apex/jobscheduler/service/java/com/android/server/usage:presubmit --collect-tests-only > apex_jobscheduler_service_java_com_android_server_usage_presubmit.new
	atest -p core/java/android/app:presubmit --collect-tests-only > core_java_android_app_presubmit.new
	atest -p core/java/android/os:presubmit --collect-tests-only > core_java_android_os_presubmit.new
	atest -p core/java/com/android/internal/os:presubmit --collect-tests-only > core_java_com_android_internal_os_presubmit.new
	atest -p services/accessibility:presubmit --collect-tests-only > services_accessibility_presubmit.new
	atest -p services/core/java/com/android/server/am:presubmit --collect-tests-only > services_core_java_com_android_server_am_presubmit.new
	atest -p services/core/java/com/android/server/appop:presubmit --collect-tests-only > services_core_java_com_android_server_appop_presubmit.new
	atest -p services/core/java/com/android/server/audio:presubmit --collect-tests-only > services_core_java_com_android_server_audio_presubmit.new
	atest -p services/core/java/com/android/server/compat:presubmit --collect-tests-only > services_core_java_com_android_server_compat_presubmit.new
	...

Bug: b/344977340
Test-Mapping-Slo-Bypass-Bug: b/335015078
Change-Id: If13cb122dc263b2ec37fa63160f6bac35a13d853
parent ea598ed3

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ 
            ]

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {"include-filter": "com.android.server.job"},

                {"exclude-annotation": "androidx.test.filters.FlakyTest"},

                {"exclude-annotation": "androidx.test.filters.LargeTest"}

            ]

            "name": "FrameworksServicesTests_com_android_server_job_Presubmit"

        }

    ],

    "postsubmit": [

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+1 −5
Original line number Diff line number Diff line
@@ -17,11 +17,7 @@ 
      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.usage"},

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

      ]

      "name": "FrameworksServicesTests_com_android_server_usage_Presubmit"

    }

  ],

  "postsubmit": [

core/java/android/app/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -29,12 +29,7 @@ 
        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.appop"

                }

            ]

            "name": "FrameworksServicesTests_android_server_appop"

        },

        {

            "file_patterns": ["(/|^)AppOpsManager.java"],

core/java/android/os/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -82,10 +82,7 @@ 
        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" }

      ]

      "name": "FrameworksServicesTests_battery_stats"

    },

    {

      "file_patterns": [

core/java/com/android/internal/os/TEST_MAPPING

+1 −4
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ 
        "Kernel[^/]*\\.java",

        "[^/]*Power[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" }

      ]

      "name": "FrameworksServicesTests_battery_stats"

    },

    {

      "file_patterns": [