Skip to content

Commit 06ad874

Browse files
brettchabotcopybara-androidxtest
brettchabot
authored and
copybara-androidxtest
committed
Replace now-unnecessary reflection from TestLooperManagerCompat.
Now that androidx.test's bazel build compiles against Android SDK 36, the new TestLooperManager APIs added in 36 cn be referenced directly. PiperOrigin-RevId: 792717966
1 parent 0483654 commit 06ad874

15 files changed

Lines changed: 49 additions & 64 deletions

File tree

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
android_sdk_repository(
77
name = "androidsdk",
8-
api_level = 35,
9-
build_tools_version = "35.0.0",
8+
api_level = 36,
9+
build_tools_version = "36.0.0",
1010
)
1111

1212
register_toolchains("//:kotlin_toolchain")

‎espresso/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ The following artifacts were released:
1616

1717
**Bug Fixes**
1818

19+
* Replace now-unnecessary reflection from TestLooperManagerCompat when using Android SDK 36 APIs
20+
1921
**New Features**
2022

2123
**Breaking Changes**

‎espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,10 @@ final class TestLooperManagerCompat {
2626
private static Method messageQueueNextMethod;
2727
private static Field messageQueueHeadField;
2828
private static Method recycleUncheckedMethod;
29-
private static Method peekWhenMethod;
30-
private static Method blockedOnBarrierMethod;
31-
32-
private static boolean initTestLooperManager() {
33-
// TODO(b/112000181): update this check and remove reflection when compiling against Baklava
34-
if (VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM) {
35-
try {
36-
peekWhenMethod = TestLooperManager.class.getDeclaredMethod("peekWhen");
37-
blockedOnBarrierMethod =
38-
TestLooperManager.class.getDeclaredMethod("isBlockedOnSyncBarrier");
39-
return true;
40-
} catch (ReflectiveOperationException e) {
41-
// fall through
42-
}
43-
}
44-
return false;
45-
}
4629

4730
static {
4831
try {
49-
if (!initTestLooperManager()) {
32+
if (VERSION.SDK_INT < VERSION_CODES.BAKLAVA) {
5033
messageQueueNextMethod = MessageQueue.class.getDeclaredMethod("next");
5134
messageQueueNextMethod.setAccessible(true);
5235
messageQueueHeadField = MessageQueue.class.getDeclaredField("mMessages");
@@ -76,7 +59,7 @@ private TestLooperManagerCompat(TestLooperManager testLooperManager) {
7659
}
7760

7861
static TestLooperManagerCompat acquire(Looper looper) {
79-
if (peekWhenMethod != null) {
62+
if (VERSION.SDK_INT >= VERSION_CODES.BAKLAVA) {
8063
// running on a newer Android version that has the supported TestLooperManagerCompat changes
8164
Checks.checkState(looper.isCurrentThread());
8265
TestLooperManager testLooperManager =
@@ -91,7 +74,7 @@ static TestLooperManagerCompat acquire(Looper looper) {
9174
Long peekWhen() {
9275
try {
9376
if (delegate != null) {
94-
return (Long) peekWhenMethod.invoke(delegate);
77+
return delegate.peekWhen();
9578
} else {
9679
Message msg = legacyPeek();
9780
if (msg != null && msg.getTarget() == null) {
@@ -131,7 +114,7 @@ void release() {
131114
boolean isBlockedOnSyncBarrier() {
132115
try {
133116
if (delegate != null) {
134-
return (boolean) blockedOnBarrierMethod.invoke(delegate);
117+
return delegate.isBlockedOnSyncBarrier();
135118
} else {
136119
Message msg = legacyPeek();
137120
return msg != null && msg.getTarget() == null;

‎espresso/core/javatests/androidx/test/espresso/matcher/BUILD‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ axt_android_library_test(
4242
"//runner/android_junit_runner",
4343
"//runner/rules",
4444
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
45-
"@androidsdk//:legacy_test-35",
45+
"@androidsdk//:legacy_test-36",
4646
"@maven//:junit_junit",
4747
"@maven//:org_hamcrest_hamcrest_core",
4848
"@maven//:org_hamcrest_hamcrest_library",
@@ -65,7 +65,7 @@ axt_android_library_test(
6565
"//runner/android_junit_runner",
6666
"//runner/rules",
6767
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
68-
"@androidsdk//:legacy_test-35",
68+
"@androidsdk//:legacy_test-36",
6969
"@maven//:junit_junit",
7070
"@maven//:org_hamcrest_hamcrest_core",
7171
"@maven//:org_hamcrest_hamcrest_library",
@@ -83,7 +83,7 @@ axt_android_library_test(
8383
"//ext/junit",
8484
"//runner/android_junit_runner",
8585
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
86-
"@androidsdk//:legacy_test-35",
86+
"@androidsdk//:legacy_test-36",
8787
"@maven//:junit_junit",
8888
],
8989
)
@@ -137,7 +137,7 @@ axt_android_library_test(
137137
"//runner/android_junit_runner",
138138
"//runner/rules",
139139
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
140-
"@androidsdk//:legacy_test-35",
140+
"@androidsdk//:legacy_test-36",
141141
"@maven//:junit_junit",
142142
"@maven//:org_hamcrest_hamcrest_core",
143143
"@maven//:org_hamcrest_hamcrest_library",
@@ -167,7 +167,7 @@ axt_android_library_test(
167167
"//runner/android_junit_runner",
168168
"//runner/rules",
169169
"//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
170-
"@androidsdk//:legacy_test-35",
170+
"@androidsdk//:legacy_test-36",
171171
"@maven//:junit_junit",
172172
"@maven//:org_hamcrest_hamcrest_core",
173173
"@maven//:org_hamcrest_hamcrest_library",

‎espresso/intents/java/androidx/test/espresso/intent/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android_library(
3535
"//espresso/intents/java/androidx/test/espresso/intent/matcher",
3636
"//opensource/androidx:annotation",
3737
"//runner/android_junit_runner",
38-
"@androidsdk//:legacy_test-35",
38+
"@androidsdk//:legacy_test-36",
3939
"@maven//:com_google_errorprone_error_prone_annotations",
4040
"@maven//:org_hamcrest_hamcrest_core",
4141
"@maven//:org_hamcrest_hamcrest_library",

‎espresso/remote/javatests/androidx/test/espresso/remote/BUILD‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android_library(
3434
"//espresso/remote/java/androidx/test/espresso/remote:registry",
3535
"//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
3636
"//espresso/web/java/androidx/test/espresso/web/model",
37-
"@androidsdk//:legacy_test-35",
37+
"@androidsdk//:legacy_test-36",
3838
"@com_google_protobuf//:protobuf_javalite",
3939
"@maven//:junit_junit",
4040
"@maven//:org_hamcrest_hamcrest_core",
@@ -72,7 +72,7 @@ axt_android_library_test(
7272
"//ext/junit",
7373
"//opensource/proto:any_java_proto_lite",
7474
"//runner/android_junit_runner/java/androidx/test:runner",
75-
"@androidsdk//:legacy_test-35",
75+
"@androidsdk//:legacy_test-36",
7676
"@com_google_protobuf//:protobuf_javalite",
7777
"@maven//:junit_junit",
7878
"@maven//:org_hamcrest_hamcrest_core",
@@ -141,7 +141,7 @@ axt_android_library_test(
141141
"//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
142142
"//ext/junit",
143143
"//runner/android_junit_runner/java/androidx/test:runner",
144-
"@androidsdk//:legacy_test-35",
144+
"@androidsdk//:legacy_test-36",
145145
"@maven//:junit_junit",
146146
"@maven//:org_hamcrest_hamcrest_core",
147147
"@maven//:org_mockito_mockito_core",
@@ -174,7 +174,7 @@ axt_android_library_test(
174174
"//ext/junit",
175175
"//opensource/proto:any_java_proto_lite",
176176
"//runner/android_junit_runner/java/androidx/test:runner",
177-
"@androidsdk//:legacy_test-35",
177+
"@androidsdk//:legacy_test-36",
178178
"@maven//:junit_junit",
179179
"@maven//:org_hamcrest_hamcrest_core",
180180
"@maven//:org_hamcrest_hamcrest_library",
@@ -266,7 +266,7 @@ axt_android_library_test(
266266
"//ext/junit",
267267
"//opensource/proto:any_java_proto_lite",
268268
"//runner/android_junit_runner/java/androidx/test:runner",
269-
"@androidsdk//:legacy_test-35",
269+
"@androidsdk//:legacy_test-36",
270270
"@com_google_protobuf//:protobuf_javalite",
271271
"@maven//:junit_junit",
272272
"@maven//:org_hamcrest_hamcrest_core",
@@ -307,7 +307,7 @@ axt_android_library_test(
307307
"//ext/junit",
308308
"//opensource/proto:any_java_proto_lite",
309309
"//runner/android_junit_runner/java/androidx/test:runner",
310-
"@androidsdk//:legacy_test-35",
310+
"@androidsdk//:legacy_test-36",
311311
"@com_google_protobuf//:protobuf_javalite",
312312
"@maven//:junit_junit",
313313
"@maven//:org_hamcrest_hamcrest_core",
@@ -348,7 +348,7 @@ axt_android_library_test(
348348
"//ext/junit",
349349
"//opensource/proto:any_java_proto_lite",
350350
"//runner/android_junit_runner/java/androidx/test:runner",
351-
"@androidsdk//:legacy_test-35",
351+
"@androidsdk//:legacy_test-36",
352352
"@com_google_protobuf//:protobuf_javalite",
353353
"@maven//:junit_junit",
354354
"@maven//:org_hamcrest_hamcrest_core",
@@ -389,7 +389,7 @@ axt_android_library_test(
389389
"//ext/junit",
390390
"//opensource/proto:any_java_proto_lite",
391391
"//runner/android_junit_runner/java/androidx/test:runner",
392-
"@androidsdk//:legacy_test-35",
392+
"@androidsdk//:legacy_test-36",
393393
"@com_google_protobuf//:protobuf_javalite",
394394
"@maven//:junit_junit",
395395
"@maven//:org_hamcrest_hamcrest_core",
@@ -430,7 +430,7 @@ axt_android_library_test(
430430
"//ext/junit",
431431
"//opensource/proto:any_java_proto_lite",
432432
"//runner/android_junit_runner/java/androidx/test:runner",
433-
"@androidsdk//:legacy_test-35",
433+
"@androidsdk//:legacy_test-36",
434434
"@com_google_protobuf//:protobuf_javalite",
435435
"@maven//:junit_junit",
436436
"@maven//:org_hamcrest_hamcrest_core",

‎kokoro/build_artifacts.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ source kokoro/common.sh
1111
install_bazelisk
1212
# building :axt_m2_repository uses @androidsdk//:build-tools/33.0.2/aapt2
1313
/opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --sdk_root=/opt/android-sdk "build-tools;33.0.2"
14-
/opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --sdk_root=/opt/android-sdk "platforms;android-35" "build-tools;35.0.0"
14+
/opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --sdk_root=/opt/android-sdk "platforms;android-36" "build-tools;36.0.0"
1515

1616
bazelisk build :axt_m2repository
1717

‎runner/android_junit_runner/java/androidx/test/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android_library(
4343
"//runner/monitor",
4444
"//services/events/java/androidx/test/services/events",
4545
"//services/storage",
46-
"@androidsdk//:legacy_test-35",
46+
"@androidsdk//:legacy_test-36",
4747
"@maven//:androidx_tracing_tracing",
4848
"@maven//:junit_junit",
4949
],

‎runner/android_junit_runner/javatests/androidx/test/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ axt_android_library_test(
5555
"//ext/junit",
5656
"//runner/android_junit_runner",
5757
"//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
58-
"@androidsdk//:legacy_test-35",
58+
"@androidsdk//:legacy_test-36",
5959
],
6060
)
6161

@@ -68,7 +68,7 @@ axt_android_library_test(
6868
"//ext/junit",
6969
"//runner/android_junit_runner",
7070
"//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
71-
"@androidsdk//:legacy_test-35",
71+
"@androidsdk//:legacy_test-36",
7272
],
7373
)
7474

@@ -124,7 +124,7 @@ axt_android_library_test(
124124
"//runner/rules",
125125
"//services/events/java/androidx/test/services/events",
126126
"//services/storage",
127-
"@androidsdk//:legacy_test-35",
127+
"@androidsdk//:legacy_test-36",
128128
"@maven//:com_google_guava_guava",
129129
"@maven//:com_google_truth_truth",
130130
"@maven//:junit_junit",

‎runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ axt_android_library_test(
2323
"//runner/rules",
2424
"//services/events/java/androidx/test/services/events",
2525
"//services/storage",
26-
"@androidsdk//:legacy_test-35",
26+
"@androidsdk//:legacy_test-36",
2727
"@maven//:com_google_guava_guava",
2828
"@maven//:com_google_truth_truth",
2929
"@maven//:junit_junit",
@@ -45,7 +45,7 @@ axt_android_library_test(
4545
"//runner/rules",
4646
"//services/events/java/androidx/test/services/events",
4747
"//services/storage",
48-
"@androidsdk//:legacy_test-35",
48+
"@androidsdk//:legacy_test-36",
4949
"@maven//:com_google_guava_guava",
5050
"@maven//:com_google_truth_truth",
5151
"@maven//:junit_junit",
@@ -70,7 +70,7 @@ axt_android_library_test(
7070
"//runner/rules",
7171
"//services/events/java/androidx/test/services/events",
7272
"//services/storage",
73-
"@androidsdk//:legacy_test-35",
73+
"@androidsdk//:legacy_test-36",
7474
"@maven//:com_google_guava_guava",
7575
"@maven//:com_google_truth_truth",
7676
"@maven//:junit_junit",
@@ -92,7 +92,7 @@ axt_android_library_test(
9292
"//runner/rules",
9393
"//services/events/java/androidx/test/services/events",
9494
"//services/storage",
95-
"@androidsdk//:legacy_test-35",
95+
"@androidsdk//:legacy_test-36",
9696
"@maven//:com_google_guava_guava",
9797
"@maven//:com_google_truth_truth",
9898
"@maven//:junit_junit",
@@ -114,7 +114,7 @@ axt_android_library_test(
114114
"//runner/rules",
115115
"//services/events/java/androidx/test/services/events",
116116
"//services/storage",
117-
"@androidsdk//:legacy_test-35",
117+
"@androidsdk//:legacy_test-36",
118118
"@maven//:com_google_guava_guava",
119119
"@maven//:com_google_truth_truth",
120120
"@maven//:junit_junit",
@@ -136,7 +136,7 @@ axt_android_library_test(
136136
"//runner/rules",
137137
"//services/events/java/androidx/test/services/events",
138138
"//services/storage",
139-
"@androidsdk//:legacy_test-35",
139+
"@androidsdk//:legacy_test-36",
140140
"@maven//:com_google_guava_guava",
141141
"@maven//:com_google_truth_truth",
142142
"@maven//:junit_junit",
@@ -186,7 +186,7 @@ axt_android_library_test(
186186
"//runner/rules",
187187
"//services/events/java/androidx/test/services/events",
188188
"//services/storage",
189-
"@androidsdk//:legacy_test-35",
189+
"@androidsdk//:legacy_test-36",
190190
"@maven//:com_google_guava_guava",
191191
"@maven//:com_google_truth_truth",
192192
"@maven//:junit_junit",
@@ -217,7 +217,7 @@ axt_android_library_test(
217217
"//runner/rules",
218218
"//services/events/java/androidx/test/services/events",
219219
"//services/storage",
220-
"@androidsdk//:legacy_test-35",
220+
"@androidsdk//:legacy_test-36",
221221
"@maven//:com_google_guava_guava",
222222
"@maven//:com_google_truth_truth",
223223
"@maven//:junit_junit",
@@ -251,7 +251,7 @@ axt_android_library_test(
251251
"//runner/rules",
252252
"//services/events/java/androidx/test/services/events",
253253
"//services/storage",
254-
"@androidsdk//:legacy_test-35",
254+
"@androidsdk//:legacy_test-36",
255255
"@maven//:com_google_guava_guava",
256256
"@maven//:com_google_truth_truth",
257257
"@maven//:junit_junit",
@@ -271,7 +271,7 @@ axt_android_library_test(
271271
"//ext/junit",
272272
"//runner/android_junit_runner",
273273
"//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
274-
"@androidsdk//:legacy_test-35",
274+
"@androidsdk//:legacy_test-36",
275275
"@maven//:junit_junit",
276276
"@maven//:org_hamcrest_hamcrest_core",
277277
"@maven//:org_hamcrest_hamcrest_library",

0 commit comments

Comments
 (0)