diff options
author | 2024-08-14 17:33:02 -0700 | |
---|---|---|
committer | 2024-08-20 21:01:51 +0000 | |
commit | 34ce5df8371315bb87b5d7ad4f0d19c9e5ca8d2c (patch) | |
tree | ea3c4e024d1467e454f2fff6b86a0b4221f6527f | |
parent | e7f900f0db69942c2cc3cc8ffada569bcf6ae884 (diff) |
Migrate test options -> Android.bp for FrameworksMockingServicesTests
go/test-module-variant-migration-plan
Test: atest and compare test counts before and after
i.e.
With cl
----
atest-dev -p apex/blobstore:presubmit > apex_blobstore_presubmit.new
atest-dev -p apex/jobscheduler/service/java/com/android/server:presubmit > apex_jobscheduler_service_java_com_android_server_presubmit.new
atest-dev -p apex/jobscheduler/service/java/com/android/server/alarm:presubmit > apex_jobscheduler_service_java_com_android_server_alarm_presubmit.new
atest-dev -p apex/jobscheduler/service/java/com/android/server/deviceidle:presubmit > apex_jobscheduler_service_java_com_android_server_deviceidle_presubmit.new
On main
----
atest-dev -p apex/blobstore:presubmit > apex_blobstore_presubmit.main
atest-dev -p apex/jobscheduler/service/java/com/android/server:presubmit > apex_jobscheduler_service_java_com_android_server_presubmit.main
atest-dev -p apex/jobscheduler/service/java/com/android/server/alarm:presubmit > apex_jobscheduler_service_java_com_android_server_alarm_presubmit.main
atest-dev -p apex/jobscheduler/service/java/com/android/server/deviceidle:presubmit > apex_jobscheduler_service_java_com_android_server_deviceidle_presubmit.main
diff <(grep Tests\) services_core_java_com_android_server_am_presubmit.new) <(grep Tests\) services_core_java_com_android_server_am_presubmit.main)
Bug: b/344977366
Test-Mapping-Slo-Bypass-Bug: b/335015078
Change-Id: I50de852db1b3742efc3099298c7380bbdea84927
19 files changed, 218 insertions, 139 deletions
diff --git a/apex/blobstore/TEST_MAPPING b/apex/blobstore/TEST_MAPPING index 6d3c0d73f77f..5157ce43fd4c 100644 --- a/apex/blobstore/TEST_MAPPING +++ b/apex/blobstore/TEST_MAPPING @@ -7,12 +7,7 @@ "name": "CtsBlobStoreHostTestCases" }, { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.blob" - } - ] + "name": "FrameworksMockingServicesTests_blob" } ] } diff --git a/apex/jobscheduler/service/java/com/android/server/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/TEST_MAPPING index 6924cb210adb..b58cb881fade 100644 --- a/apex/jobscheduler/service/java/com/android/server/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/TEST_MAPPING @@ -1,23 +1,12 @@ { "presubmit": [ { - "name": "FrameworksMockingServicesTests", - "file_patterns": [ - "DeviceIdleController\\.java" - ], - "options": [ - {"include-filter": "com.android.server.DeviceIdleControllerTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"} - ] + "name": "FrameworksMockingServicesTests_IdleController", + "file_patterns": ["DeviceIdleController\\.java"] }, { - "name": "FrameworksMockingServicesTests", - "file_patterns": ["AppStateTrackerImpl\\.java"], - "options": [ - {"include-filter": "com.android.server.AppStateTrackerTest"}, - {"include-annotation": "android.platform.test.annotations.Presubmit"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"} - ] + "name": "FrameworksMockingServicesTests_AppStateTracker", + "file_patterns": ["AppStateTrackerImpl\\.java"] } ], "postsubmit": [ diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/alarm/TEST_MAPPING index d76ce7449e43..ab0f17810308 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/alarm/TEST_MAPPING @@ -1,18 +1,7 @@ { "presubmit": [ { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.alarm" - }, - { - "include-annotation": "android.platform.test.annotations.Presubmit" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] + "name": "FrameworksMockingServicesTests_com_android_server_alarm" } ], diff --git a/apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING index c06861164d31..afa509c6ea93 100644 --- a/apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING @@ -1,11 +1,7 @@ { "presubmit": [ { - "name": "FrameworksMockingServicesTests", - "options": [ - {"include-filter": "com.android.server.DeviceIdleControllerTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"} - ] + "name": "FrameworksMockingServicesTests_IdleController" } ], "postsubmit": [ diff --git a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING index 36b6c80eebe3..16c2fd4b73c3 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING @@ -8,12 +8,7 @@ ] }, { - "name": "FrameworksMockingServicesTests", - "options": [ - {"include-filter": "com.android.server.job"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "androidx.test.filters.LargeTest"} - ] + "name": "FrameworksMockingServicesTests_com_android_server_job_Presubmit" }, { "name": "FrameworksServicesTests_com_android_server_job_Presubmit" diff --git a/core/java/android/service/games/TEST_MAPPING b/core/java/android/service/games/TEST_MAPPING index 3e551ef6bb54..9767bcde3225 100644 --- a/core/java/android/service/games/TEST_MAPPING +++ b/core/java/android/service/games/TEST_MAPPING @@ -2,15 +2,7 @@ "presubmit": [ // TODO(b/245615658): fix flaky CTS test CtsGameServiceTestCases and add it as presubmit { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "android.service.games" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] + "name": "FrameworksMockingServicesTests_games_Presubmit" } ] }
\ No newline at end of file diff --git a/location/TEST_MAPPING b/location/TEST_MAPPING index 10da632e7b6f..256affd1040d 100644 --- a/location/TEST_MAPPING +++ b/location/TEST_MAPPING @@ -11,10 +11,7 @@ "name": "CtsLocationNoneTestCases" }, { - "name": "FrameworksMockingServicesTests", - "options": [{ - "include-filter": "com.android.server.location" - }] + "name": "FrameworksMockingServicesTests_location" } ] } diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING index 25337a434329..4a61a69dbadc 100644 --- a/services/core/java/com/android/server/TEST_MAPPING +++ b/services/core/java/com/android/server/TEST_MAPPING @@ -53,12 +53,7 @@ "file_patterns": ["StorageManagerService\\.java"] }, { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.sensorprivacy" - } - ], + "name": "FrameworksMockingServicesTests_sensorprivacy", "file_patterns": ["SensorPrivacyService\\.java"] }, { diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING index c138a592378b..d01d8f6688db 100644 --- a/services/core/java/com/android/server/am/TEST_MAPPING +++ b/services/core/java/com/android/server/am/TEST_MAPPING @@ -52,18 +52,7 @@ "name": "FrameworksServicesTests_android_server_am_Presubmit" }, { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.am." - }, - { - "include-annotation": "android.platform.test.annotations.Presubmit" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] + "name": "FrameworksMockingServicesTests_android_server_am_Presubmit" }, { "file_patterns": ["Battery[^/]*\\.java", "MeasuredEnergy[^/]*\\.java"], @@ -79,12 +68,7 @@ }, { "file_patterns": ["Broadcast.*"], - "name": "FrameworksMockingServicesTests", - "options": [ - { "include-filter": "com.android.server.am.BroadcastRecordTest" }, - { "include-filter": "com.android.server.am.BroadcastQueueTest" }, - { "include-filter": "com.android.server.am.BroadcastQueueModernImplTest" } - ] + "name": "FrameworksMockingServicesTests_android_server_am_broadcast" }, { "file_patterns": ["Broadcast.*"], diff --git a/services/core/java/com/android/server/app/TEST_MAPPING b/services/core/java/com/android/server/app/TEST_MAPPING index 82840ee5fcbb..b718ce62c118 100644 --- a/services/core/java/com/android/server/app/TEST_MAPPING +++ b/services/core/java/com/android/server/app/TEST_MAPPING @@ -26,15 +26,7 @@ ] }, { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.app" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - } - ] + "name": "FrameworksMockingServicesTests_android_server_app" }, { "name": "FrameworksCoreGameManagerTests", diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING index e7623e0a9e75..2a9dfa273e87 100644 --- a/services/core/java/com/android/server/appop/TEST_MAPPING +++ b/services/core/java/com/android/server/appop/TEST_MAPPING @@ -15,12 +15,7 @@ "name": "FrameworksServicesTests_android_server_appop" }, { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.appop" - } - ] + "name": "FrameworksMockingServicesTests_android_server_appop" }, { "name": "CtsPermissionTestCases", diff --git a/services/core/java/com/android/server/compat/overrides/TEST_MAPPING b/services/core/java/com/android/server/compat/overrides/TEST_MAPPING index 4b8f08ec9164..16497538344a 100644 --- a/services/core/java/com/android/server/compat/overrides/TEST_MAPPING +++ b/services/core/java/com/android/server/compat/overrides/TEST_MAPPING @@ -1,12 +1,7 @@ { "presubmit": [ { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.compat.overrides" - } - ] + "name": "FrameworksMockingServicesTests_android_server_compat_overrides" } ] } diff --git a/services/core/java/com/android/server/location/TEST_MAPPING b/services/core/java/com/android/server/location/TEST_MAPPING index f5deb2ba3e07..64b1ed20656e 100644 --- a/services/core/java/com/android/server/location/TEST_MAPPING +++ b/services/core/java/com/android/server/location/TEST_MAPPING @@ -16,10 +16,7 @@ "name": "CtsLocationNoneTestCases" }, { - "name": "FrameworksMockingServicesTests", - "options": [{ - "include-filter": "com.android.server.location" - }] + "name": "FrameworksMockingServicesTests_location" } ] } diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING index e12b70f033c3..372bbc445b79 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -29,12 +29,7 @@ "name": "CtsMatchFlagTestCases" }, { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.pm." - } - ] + "name": "FrameworksMockingServicesTests_android_server_pm" }, { "file_patterns": ["(/|^)PackageManagerService\\.java","(/|^)UserManagerService\\.java"], diff --git a/services/core/java/com/android/server/power/TEST_MAPPING b/services/core/java/com/android/server/power/TEST_MAPPING index e64704a84cdf..4ce01d21903f 100644 --- a/services/core/java/com/android/server/power/TEST_MAPPING +++ b/services/core/java/com/android/server/power/TEST_MAPPING @@ -8,11 +8,7 @@ ] }, { - "name": "FrameworksMockingServicesTests", - "options": [ - {"include-filter": "com.android.server.power"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"} - ] + "name": "FrameworksMockingServicesTests_android_server_power_Presubmit" }, { "name": "PowerServiceTests", diff --git a/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING b/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING index eb91a72c127a..d29dbfe4aa87 100644 --- a/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING +++ b/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING @@ -11,10 +11,7 @@ "name": "CtsLocationNoneTestCases" }, { - "name": "FrameworksMockingServicesTests", - "options": [ - {"include-filter": "com.android.server.location"} - ] + "name": "FrameworksMockingServicesTests_location" } ] } diff --git a/services/core/java/com/android/server/utils/TEST_MAPPING b/services/core/java/com/android/server/utils/TEST_MAPPING index bb7cea98eda0..dcf0049001cd 100644 --- a/services/core/java/com/android/server/utils/TEST_MAPPING +++ b/services/core/java/com/android/server/utils/TEST_MAPPING @@ -1,12 +1,7 @@ { "presubmit": [ { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.utils" - } - ] + "name": "FrameworksMockingServicesTests_android_server_utils" } ] }
\ No newline at end of file diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 7eb3441a487a..98968ac309aa 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -136,3 +136,199 @@ android_ravenwood_test { ], auto_gen_config: true, } + +FLAKY = ["androidx.test.filters.FlakyTest"] + +test_module_config { + name: "FrameworksMockingServicesTests_blob", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.blob"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_IdleController", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.DeviceIdleControllerTest"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_AppStateTracker", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.AppStateTrackerTest"], + include_annotations: ["android.platform.test.annotations.Presubmit"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server_alarm", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.alarm"], + include_annotations: ["android.platform.test.annotations.Presubmit"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server_job_Presubmit", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.job"], + exclude_annotations: FLAKY + ["androidx.test.filters.LargeTest"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server_job", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.job"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server_tare_Presubmit", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.tare"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server_tare", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.tare"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_games_Presubmit", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["android.service.games"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_location", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.location"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_backup", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.backup"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_sensorprivacy", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.sensorprivacy"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_am_Presubmit", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.am."], + include_annotations: ["android.platform.test.annotations.Presubmit"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_am_broadcast", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: [ + "com.android.server.am.BroadcastQueueTest", + "com.android.server.am.BroadcastRecordTest", + "com.android.server.am.BroadcastQueueModernImplTest", + ], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_app", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + // Matches appop too + include_filters: ["com.android.server.app"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_appop", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.appop"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_compat_overrides", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.compat.overrides"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_crashrecovery", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.RescuePartyTest"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_pm", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.pm."], +} + +test_module_config { + name: "FrameworksMockingServicesTests_com_android_server_pm_Presubmit", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.pm"], + exclude_annotations: FLAKY + ["org.junit.Ignore"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_power_Presubmit", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.power"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_power", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.power"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_trust", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.trust"], + exclude_annotations: FLAKY, +} + +test_module_config { + name: "FrameworksMockingServicesTests_android_server_utils", + base: "FrameworksMockingServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.utils"], +} diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/TEST_MAPPING b/services/tests/mockingservicestests/src/com/android/server/pm/TEST_MAPPING index 13e255fe4ab8..1f2d11c19a19 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/TEST_MAPPING +++ b/services/tests/mockingservicestests/src/com/android/server/pm/TEST_MAPPING @@ -1,18 +1,7 @@ { "presubmit": [ { - "name": "FrameworksMockingServicesTests", - "options": [ - { - "include-filter": "com.android.server.pm" - }, - { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "org.junit.Ignore" - } - ] + "name": "FrameworksMockingServicesTests_com_android_server_pm_Presubmit" } ] } |