Migrate more of FrameworksServicesTests to use options from Android.bp
Followup to cl aosp/3225805, update non-presubmit groups and files I
missed.
go/test-module-variant-migration-plan
Test: atest FrameworksServicesTests_accessibility \
FrameworksServicesTests_android_server_am \
FrameworksServicesTests_android_server_hdmi \
FrameworksServicesTests_android_server_logcat \
FrameworksServicesTests_android_server_power \
FrameworksServicesTests_binary_transparency \
FrameworksServicesTests_com_android_server_job \
FrameworksServicesTests_com_android_server_usage \
FrameworksServicesTests_pinner_service \
FrameworksServicesTests_presubmit
% grep -B2 Tests\) fst.log [8:07:14]/0
x86_64 FrameworksServicesTests_accessibility
--------------------------------------------
com.android.frameworks.servicestests (812 Tests)
--
x86_64 FrameworksServicesTests_android_server_am
------------------------------------------------
com.android.frameworks.servicestests (102 Tests)
--
x86_64 FrameworksServicesTests_android_server_hdmi
--------------------------------------------------
com.android.frameworks.servicestests (749 Tests)
--
x86_64 FrameworksServicesTests_android_server_logcat
----------------------------------------------------
com.android.frameworks.servicestests (13 Tests)
--
x86_64 FrameworksServicesTests_android_server_power
---------------------------------------------------
com.android.frameworks.servicestests (87 Tests)
--
x86_64 FrameworksServicesTests_binary_transparency
--------------------------------------------------
com.android.frameworks.servicestests (6 Tests)
--
x86_64 FrameworksServicesTests_com_android_server_job
-----------------------------------------------------
com.android.frameworks.servicestests (72 Tests)
--
x86_64 FrameworksServicesTests_com_android_server_usage
-------------------------------------------------------
com.android.frameworks.servicestests (125 Tests)
--
x86_64 FrameworksServicesTests_pinner_service
---------------------------------------------
com.android.frameworks.servicestests (6 Tests)
--
x86_64 FrameworksServicesTests_presubmit
----------------------------------------
com.android.frameworks.servicestests (3288 Tests)
Bug: b/344977340
Test-Mapping-Slo-Bypass-Bug: b/335015078
Change-Id: I4766a0f62358ff3e266a100ff3edcf439e9a1999
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 36b6c80..e89d80d 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING
+++ b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING
@@ -30,10 +30,7 @@
]
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {"include-filter": "com.android.server.job"}
- ]
+ "name": "FrameworksServicesTests_com_android_server_job"
},
{
"name": "CtsHostsideNetworkPolicyTests",
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
index 52670a2..38a922a 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
+++ b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
@@ -25,10 +25,7 @@
"name": "CtsUsageStatsTestCases"
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {"include-filter": "com.android.server.usage"}
- ]
+ "name": "FrameworksServicesTests_com_android_server_usage"
}
]
}
diff --git a/services/accessibility/TEST_MAPPING b/services/accessibility/TEST_MAPPING
index 454a329..b122d1f 100644
--- a/services/accessibility/TEST_MAPPING
+++ b/services/accessibility/TEST_MAPPING
@@ -45,12 +45,7 @@
"name": "CtsUiAutomationTestCases"
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.accessibility"
- }
- ]
+ "name": "FrameworksServicesTests_accessibility"
},
{
"name": "FrameworksCoreTests",
diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING
index 25337a4..bacbd8b 100644
--- a/services/core/java/com/android/server/TEST_MAPPING
+++ b/services/core/java/com/android/server/TEST_MAPPING
@@ -62,24 +62,11 @@
"file_patterns": ["SensorPrivacyService\\.java"]
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.BinaryTransparencyServiceTest"
- }
- ],
+ "name": "FrameworksServicesTests_binary_transparency",
"file_patterns": ["BinaryTransparencyService\\.java"]
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.PinnerServiceTest"
- },
- {
- "exclude-annotation": "org.junit.Ignore"
- }
- ],
+ "name": "FrameworksServicesTests_pinner_service",
"file_patterns": ["PinnerService\\.java"]
},
{
@@ -153,15 +140,7 @@
"name": "CtsPackageManagerTestCases"
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.PinnerServiceTest"
- },
- {
- "exclude-annotation": "org.junit.Ignore"
- }
- ],
+ "name": "FrameworksServicesTests_pinner_service",
"file_patterns": ["PinnerService\\.java"]
}
]
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index c138a59..46684bb 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -109,12 +109,7 @@
],
"postsubmit": [
{
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.am."
- }
- ]
+ "name": "FrameworksServicesTests_android_server_am"
},
{
"name": "CtsAppDataIsolationHostTestCases"
diff --git a/services/core/java/com/android/server/hdmi/TEST_MAPPING b/services/core/java/com/android/server/hdmi/TEST_MAPPING
index 64c06a6..bef1294 100644
--- a/services/core/java/com/android/server/hdmi/TEST_MAPPING
+++ b/services/core/java/com/android/server/hdmi/TEST_MAPPING
@@ -6,15 +6,7 @@
],
"postsubmit": [
{
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.hdmi"
- },
- {
- "exclude-annotation": "org.junit.Ignore"
- }
- ]
+ "name": "FrameworksServicesTests_android_server_hdmi"
}
]
}
diff --git a/services/core/java/com/android/server/logcat/TEST_MAPPING b/services/core/java/com/android/server/logcat/TEST_MAPPING
index 5b07cd9..c9d21de 100644
--- a/services/core/java/com/android/server/logcat/TEST_MAPPING
+++ b/services/core/java/com/android/server/logcat/TEST_MAPPING
@@ -6,10 +6,7 @@
],
"postsubmit": [
{
- "name": "FrameworksServicesTests",
- "options": [
- {"include-filter": "com.android.server.logcat"}
- ]
+ "name": "FrameworksServicesTests_android_server_logcat"
}
]
}
diff --git a/services/core/java/com/android/server/power/TEST_MAPPING b/services/core/java/com/android/server/power/TEST_MAPPING
index e64704a..701e83b 100644
--- a/services/core/java/com/android/server/power/TEST_MAPPING
+++ b/services/core/java/com/android/server/power/TEST_MAPPING
@@ -34,10 +34,7 @@
]
},
{
- "name": "FrameworksServicesTests",
- "options": [
- {"include-filter": "com.android.server.power"}
- ]
+ "name": "FrameworksServicesTests_android_server_power"
},
{
"name": "PowerServiceTests",