Skip to content

Commit 7dcecb2

Browse files
fkgozalifacebook-github-bot
authored andcommitted
Android Test: target SDK 21 instead of 16 (#30280)
Summary: Pull Request resolved: #30280 Now that React Native targets minimum SDK of 21, use that SDK level to run test. For some reason the default was previously 16 (I couldn't figure out where this was configured). This fixes the following test failure: https://app.circleci.com/pipelines/github/facebook/react-native/6937/workflows/d2d365f8-3f5d-453d-af28-68a040fb4188/jobs/174719/parallel-runs/0 To test, using local Docker image: ``` root@d5618d33a37b:/app# buck test ReactAndroid/src/test/... Not using buckd because watchman isn't installed. Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 Parsing buck files: finished in 2.4 sec Creating action graph: finished in 0.6 sec Building: finished in 36.8 sec (100%) 577/577 jobs, 241 updated Total time: 39.9 sec Testing: finished in 02:19.7 min (167 PASS/0 FAIL) RESULTS FOR //ReactAndroid/src/test/java/com/facebook/react/animated:animated //ReactAndroid/src/test/java/com/facebook/react/bridge:bridge //ReactAndroid/src/test/java/com/facebook/react/devsupport:devsupport //ReactAndroid/src/test/java/com/facebook/react/modules:modules //ReactAndroid/src/test/java/com/facebook/react/packagerconnection:packagerconnection //ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation:layoutanimation //ReactAndroid/src/test/java/com/facebook/react/uimanager:uimanager //ReactAndroid/src/test/java/com/facebook/react/util:util //ReactAndroid/src/test/java/com/facebook/react/views:views //ReactAndroid/src/test/java/com/facebook/react:react PASS 18.3s 7 Passed 0 Skipped 0 Failed com.facebook.react.animated.NativeAnimatedInterpolationTest PASS 32.4s 24 Passed 0 Skipped 0 Failed com.facebook.react.animated.NativeAnimatedNodeTraversalTest PASS 25.2s 4 Passed 0 Skipped 0 Failed com.facebook.react.bridge.BaseJavaModuleTest PASS 1.8s 4 Passed 0 Skipped 0 Failed com.facebook.react.bridge.FallbackJSBundleLoaderTest PASS <100ms 1 Passed 0 Skipped 0 Failed com.facebook.react.bridge.JavaOnlyArrayTest PASS <100ms 2 Passed 0 Skipped 0 Failed com.facebook.react.bridge.JavaScriptModuleRegistryTest PASS 24.7s 10 Passed 0 Skipped 0 Failed com.facebook.react.devsupport.JSDebuggerWebSocketClientTest PASS 16.6s 4 Passed 0 Skipped 0 Failed com.facebook.react.devsupport.MultipartStreamReaderTest PASS 15.4s 5 Passed 0 Skipped 0 Failed com.facebook.react.devsupport.StackTraceHelperTest PASS 26.0s 6 Passed 0 Skipped 0 Failed com.facebook.react.modules.blob.BlobModuleTest PASS 21.6s 5 Passed 0 Skipped 0 Failed com.facebook.react.modules.camera.ImageStoreManagerTest PASS 15.1s 1 Passed 0 Skipped 0 Failed com.facebook.react.modules.clipboard.ClipboardModuleTest PASS 14.4s 5 Passed 0 Skipped 0 Failed com.facebook.react.modules.dialog.DialogModuleTest PASS <100ms 10 Passed 0 Skipped 0 Failed com.facebook.react.modules.network.HeaderUtilTest PASS 7.9s 14 Passed 0 Skipped 0 Failed com.facebook.react.modules.network.NetworkingModuleTest PASS 4.3s 9 Passed 0 Skipped 0 Failed com.facebook.react.modules.network.ProgressiveStringDecoderTest PASS 5.2s 4 Passed 0 Skipped 0 Failed com.facebook.react.modules.network.ReactCookieJarContainerTest PASS 9.0s 2 Passed 0 Skipped 0 Failed com.facebook.react.modules.share.ShareModuleTest PASS 9.3s 6 Passed 0 Skipped 0 Failed com.facebook.react.modules.storage.AsyncStorageModuleTest PASS 6.7s 10 Passed 0 Skipped 0 Failed com.facebook.react.modules.timing.TimingModuleTest PASS 22.2s 9 Passed 0 Skipped 0 Failed com.facebook.react.packagerconnection.JSPackagerClientTest PASS 18.3s 4 Passed 0 Skipped 0 Failed com.facebook.react.uimanager.layoutanimation.InterpolatorTypeTest PASS 16.9s 2 Passed 0 Skipped 0 Failed com.facebook.react.uimanager.BaseViewManagerTest PASS 15.9s 4 Passed 0 Skipped 0 Failed com.facebook.react.uimanager.MatrixMathHelperTest PASS 16.8s 3 Passed 0 Skipped 0 Failed com.facebook.react.uimanager.SimpleViewPropertyTest PASS <100ms 1 Passed 0 Skipped 0 Failed com.facebook.react.util.JSStackTraceTest PASS 19.9s 1 Passed 0 Skipped 0 Failed com.facebook.react.views.image.ImageResizeModeTest PASS 21.5s 4 Passed 0 Skipped 0 Failed com.facebook.react.views.image.ReactImagePropertyTest PASS 22.9s 4 Passed 0 Skipped 0 Failed com.facebook.react.CompositeReactPackageTest PASS 15.9s 2 Passed 0 Skipped 0 Failed com.facebook.react.RootViewTest Updated test logs: buck-out/log/test.log TESTS PASSED ``` Changelog: [Android][Deprecated] Deprecate support of Android API levels 19 and 20. Reviewed By: JoshuaGross Differential Revision: D24643610 fbshipit-source-id: 0b9536076d08019ef154b338acd136a82cc5a166
1 parent 49d41c9 commit 7dcecb2

File tree

4 files changed

+27
-6
lines changed

4 files changed

+27
-6
lines changed

ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rn_android_library(
55
name = "robolectric",
66
visibility = ["PUBLIC"],
77
exported_deps = [
8-
":android-all-4.1.2_r1-robolectric-r1",
8+
":android-all-5.0.2_r3-robolectric-r0",
99
":bouncycastle",
1010
":guava",
1111
":javax-annotation-api",
@@ -28,8 +28,9 @@ rn_android_library(
2828
],
2929
)
3030

31+
# This is based on the minimum SDK version for tests: 21.
3132
rn_prebuilt_jar(
32-
name = "android-all-4.1.2_r1-robolectric-r1", # name defines filename used by robolectric in runtime
33+
name = "android-all-5.0.2_r3-robolectric-r0", # name defines filename used by robolectric in runtime
3334
binary_jar = ":robolectric-android-all-binary.jar",
3435
visibility = ["//ReactAndroid/..."],
3536
)
@@ -39,13 +40,13 @@ rn_prebuilt_jar(
3940
fb_native.export_file(
4041
name = "robolectric-android-all-binary.jar",
4142
src = ":robolectric-android-all-binary-remote.jar",
42-
out = "../android-all-4.1.2_r1-robolectric-r1.jar", # name defines filename used by robolectric in runtime
43+
out = "../android-all-5.0.2_r3-robolectric-r0.jar", # name defines filename used by robolectric in runtime
4344
)
4445

4546
fb_native.remote_file(
4647
name = "robolectric-android-all-binary-remote.jar",
47-
sha1 = "8355a2da59fe0233ca45070ca32f08da98d0b806",
48-
url = "mvn:org.robolectric:android-all:jar:4.1.2_r1-robolectric-r1",
48+
sha1 = "ae6e8f47f73ffe34054852d9c7f4f4ec489254f1",
49+
url = "mvn:org.robolectric:android-all:jar:5.0.2_r3-robolectric-r0",
4950
)
5051

5152
rn_prebuilt_jar(

ReactAndroid/src/test/resources/BUCK

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright (c) Facebook, Inc. and its affiliates.
2+
#
3+
# This source code is licensed under the MIT license found in the
4+
# LICENSE file in the root directory of this source tree.
5+
6+
java_library(
7+
name = "robolectric",
8+
srcs = [],
9+
labels = [
10+
"supermodule:xplat/default/public.react_native.infra",
11+
],
12+
resources = [
13+
"robolectric.properties",
14+
],
15+
resources_root = ".",
16+
visibility = ["PUBLIC"],
17+
)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Set this to minimum supported API level for React Native.
2+
sdk=21

tools/build_defs/oss/rn_defs.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,9 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
217217

218218
kwargs["deps"] = kwargs.pop("deps", []) + [
219219
react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
220-
react_native_xplat_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock2"),
221220
react_native_dep("third-party/java/robolectric/4.4:robolectric"),
221+
react_native_tests_target("resources:robolectric"),
222+
react_native_xplat_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock2"),
222223
]
223224

224225
extra_vm_args = [

0 commit comments

Comments
 (0)