Skip to content

Commit 82f02e9

Browse files
rbraunsteinandroid-build-merge-worker-robot
rbraunstein
authored and
android-build-merge-worker-robot
committed
Merge "Batch migration of frameworks/base TEST_MAPPING to test_module_config modules" into main am: f8ba370 am: b777779
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3263804 Change-Id: I6d38c92169c7c58c4c8dec3d6c1caaeb70804038 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents 2f529b4 + b777779 commit 82f02e9

File tree

106 files changed

+237
-1930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+237
-1930
lines changed

‎TEST_MAPPING

+18-156
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,46 @@
11
{
22
"presubmit-large": [
33
{
4-
"name": "FrameworksServicesTests",
5-
"options": [
6-
{
7-
"include-annotation": "android.platform.test.annotations.Presubmit"
8-
},
9-
{
10-
"exclude-annotation": "androidx.test.filters.FlakyTest"
11-
},
12-
{
13-
"exclude-annotation": "org.junit.Ignore"
14-
}
15-
]
4+
"name": "FrameworksServicesTests_Presubmit"
165
}
176
],
187
"presubmit-pm": [
198
{
20-
"name": "PackageManagerServiceServerTests",
21-
"options": [
22-
{
23-
"include-annotation": "android.platform.test.annotations.Presubmit"
24-
},
25-
{
26-
"exclude-annotation": "androidx.test.filters.FlakyTest"
27-
},
28-
{
29-
"exclude-annotation": "org.junit.Ignore"
30-
}
31-
]
9+
"name": "PackageManagerServiceServerTests_Presubmit"
3210
}
3311
],
3412
"presubmit": [
3513
{
36-
"name": "ManagedProvisioningTests",
37-
"options": [
38-
{
39-
"exclude-annotation": "androidx.test.filters.FlakyTest"
40-
}
41-
]
14+
"name": "ManagedProvisioningTests"
4215
},
4316
{
4417
"file_patterns": [
4518
"ApexManager\\.java",
4619
"SystemServer\\.java",
4720
"services/tests/apexsystemservices/.*"
4821
],
49-
"name": "ApexSystemServicesTestCases",
50-
"options": [
51-
{
52-
"exclude-annotation": "androidx.test.filters.FlakyTest"
53-
},
54-
{
55-
"exclude-annotation": "org.junit.Ignore"
56-
}
57-
]
22+
"name": "ApexSystemServicesTestCases"
5823
},
5924
{
60-
"name": "FrameworksUiServicesTests",
61-
"options": [
62-
{
63-
"exclude-annotation": "androidx.test.filters.FlakyTest"
64-
}
65-
]
25+
"name": "FrameworksUiServicesTests"
6626
},
6727
{
68-
"name": "FrameworksInputMethodSystemServerTests",
69-
"options": [
70-
{"include-filter": "com.android.server.inputmethod"},
71-
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
72-
{"exclude-annotation": "org.junit.Ignore"}
73-
]
28+
"name": "FrameworksInputMethodSystemServerTests_server_inputmethod"
7429
},
7530
{
76-
"name": "ExtServicesUnitTests-tplus",
77-
"options": [
78-
{
79-
"exclude-annotation": "androidx.test.filters.FlakyTest"
80-
}
81-
]
31+
"name": "ExtServicesUnitTests-tplus"
8232
},
8333
{
84-
"name": "ExtServicesUnitTests-sminus",
85-
"options": [
86-
{
87-
"exclude-annotation": "androidx.test.filters.FlakyTest"
88-
}
89-
]
34+
"name": "ExtServicesUnitTests-sminus"
9035
},
9136
{
92-
"name": "FrameworksCoreTests",
93-
"options": [
94-
{
95-
"include-annotation": "android.platform.test.annotations.Presubmit"
96-
},
97-
{
98-
"exclude-annotation": "androidx.test.filters.FlakyTest"
99-
},
100-
{
101-
"exclude-annotation": "org.junit.Ignore"
102-
}
103-
]
37+
"name": "FrameworksCoreTests_Presubmit"
10438
},
10539
{
106-
"name": "FrameworkPermissionTests",
107-
"options": [
108-
{
109-
"include-annotation": "android.platform.test.annotations.Presubmit"
110-
},
111-
{
112-
"exclude-annotation": "androidx.test.filters.FlakyTest"
113-
},
114-
{
115-
"exclude-annotation": "org.junit.Ignore"
116-
}
117-
]
40+
"name": "FrameworkPermissionTests_Presubmit"
11841
},
11942
{
120-
"name": "FrameworksInProcessTests",
121-
"options": [
122-
{
123-
"exclude-annotation": "androidx.test.filters.FlakyTest"
124-
},
125-
{
126-
"exclude-annotation": "org.junit.Ignore"
127-
}
128-
]
43+
"name": "FrameworksInProcessTests"
12944
},
13045
{
13146
"name": "vts_treble_vintf_framework_test"
@@ -166,78 +81,25 @@
16681
// infra during the hardening phase.
16782
// TODO: this tag to be removed once the above is no longer an issue.
16883
{
169-
"name": "FrameworksUiServicesTests",
170-
"options": [
171-
{
172-
"exclude-annotation": "androidx.test.filters.FlakyTest"
173-
}
174-
]
84+
"name": "FrameworksUiServicesTests"
17585
},
17686
{
177-
"name": "ExtServicesUnitTests-tplus",
178-
"options": [
179-
{
180-
"exclude-annotation": "androidx.test.filters.FlakyTest"
181-
}
182-
]
87+
"name": "ExtServicesUnitTests-tplus"
18388
},
18489
{
185-
"name": "ExtServicesUnitTests-sminus",
186-
"options": [
187-
{
188-
"exclude-annotation": "androidx.test.filters.FlakyTest"
189-
}
190-
]
90+
"name": "ExtServicesUnitTests-sminus"
19191
},
19292
{
193-
"name": "TestablesTests",
194-
"options": [
195-
{
196-
"exclude-annotation": "androidx.test.filters.FlakyTest"
197-
}
198-
]
93+
"name": "TestablesTests"
19994
},
20095
{
201-
"name": "FrameworksCoreTests",
202-
"options": [
203-
{
204-
"include-annotation": "android.platform.test.annotations.Presubmit"
205-
},
206-
{
207-
"exclude-annotation": "androidx.test.filters.FlakyTest"
208-
},
209-
{
210-
"exclude-annotation": "org.junit.Ignore"
211-
}
212-
]
96+
"name": "FrameworksCoreTests_Presubmit"
21397
},
21498
{
215-
"name": "FrameworksServicesTests",
216-
"options": [
217-
{
218-
"include-annotation": "android.platform.test.annotations.Presubmit"
219-
},
220-
{
221-
"exclude-annotation": "androidx.test.filters.FlakyTest"
222-
},
223-
{
224-
"exclude-annotation": "org.junit.Ignore"
225-
}
226-
]
99+
"name": "FrameworksServicesTests_presubmit"
227100
},
228101
{
229-
"name": "PackageManagerServiceServerTests",
230-
"options": [
231-
{
232-
"include-annotation": "android.platform.test.annotations.Presubmit"
233-
},
234-
{
235-
"exclude-annotation": "androidx.test.filters.FlakyTest"
236-
},
237-
{
238-
"exclude-annotation": "org.junit.Ignore"
239-
}
240-
]
102+
"name": "PackageManagerServiceServerTests_Presubmit"
241103
}
242104
]
243105
}

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
],
1212
"postsubmit": [
1313
{
14-
"name": "FrameworksMockingServicesTests",
15-
"options": [
16-
{"include-filter": "com.android.server"}
17-
]
14+
"name": "FrameworksMockingServicesTests_android_server"
1815
}
1916
]
2017
}

‎apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
],
77
"postsubmit": [
88
{
9-
"name": "FrameworksMockingServicesTests",
10-
"options": [
11-
{"include-filter": "com.android.server"}
12-
]
9+
"name": "FrameworksMockingServicesTests_android_server"
1310
}
1411
]
1512
}

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

+4-18
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"presubmit": [
33
{
4-
"name": "CtsJobSchedulerTestCases",
5-
"options": [
6-
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
7-
{"exclude-annotation": "androidx.test.filters.LargeTest"}
8-
]
4+
"name": "CtsJobSchedulerTestCases_com_android_server_job"
95
},
106
{
117
"name": "FrameworksMockingServicesTests_com_android_server_job_Presubmit"
@@ -19,26 +15,16 @@
1915
"name": "CtsJobSchedulerTestCases"
2016
},
2117
{
22-
"name": "FrameworksMockingServicesTests",
23-
"options": [
24-
{"include-filter": "com.android.server.job"}
25-
]
18+
"name": "FrameworksMockingServicesTests_com_android_server_job"
2619
},
2720
{
2821
"name": "FrameworksServicesTests_com_android_server_job"
2922
},
3023
{
31-
"name": "CtsHostsideNetworkPolicyTests",
32-
"options": [
33-
{"include-filter": "com.android.cts.netpolicy.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob"},
34-
{"include-filter": "com.android.cts.netpolicy.HostsideRestrictBackgroundNetworkTests#testNonMeteredNetworkAccess_expeditedJob"}
35-
]
24+
"name": "CtsHostsideNetworkPolicyTests_com_android_server_job"
3625
},
3726
{
38-
"name": "CtsStatsdAtomHostTestCases",
39-
"options": [
40-
{"include-filter": "android.cts.statsdatom.jobscheduler"}
41-
]
27+
"name": "CtsStatsdAtomHostTestCases_statsdatom_jobscheduler"
4228
}
4329
]
4430
}

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
{
22
"presubmit": [
33
{
4-
"name": "CtsUsageStatsTestCases",
5-
"options": [
6-
{"include-filter": "android.app.usage.cts.UsageStatsTest"},
7-
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
8-
{"exclude-annotation": "androidx.test.filters.MediumTest"},
9-
{"exclude-annotation": "androidx.test.filters.LargeTest"}
10-
]
4+
"name": "CtsUsageStatsTestCases_cts_usagestatstest"
115
},
126
{
137
"name": "CtsBRSTestCases"

‎cmds/locksettings/TEST_MAPPING

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
{
22
"presubmit-large": [
33
{
4-
"name": "CtsDevicePolicyManagerTestCases",
5-
"options": [
6-
{
7-
"include-annotation": "com.android.cts.devicepolicy.annotations.LockSettingsTest"
8-
},
9-
{
10-
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
11-
}
12-
]
4+
"name": "CtsDevicePolicyManagerTestCases_LockSettingsTest"
135
}
146
],
157
"postsubmit": [

0 commit comments

Comments
 (0)