Skip to content

Commit 7aff712

Browse files
christophpurrermeta-codesync[bot]
authored andcommitted
Simplify createTestReactApplicationContext calls (#59508)
Summary: Pull Request resolved: #59508 Use the default `application` argument of `createTestReactApplicationContext` at every call site instead of passing `RuntimeEnvironment.getApplication()` explicitly, and expose the helper as `JvmStatic` so the remaining Java test no longer needs `INSTANCE`. Migrating that test to Kotlin is blocked by inherited JVM signature clashes when subclassing `BaseViewManagerDelegate` from Kotlin. Changelog: [Internal] Reviewed By: javache Differential Revision: D127584468 fbshipit-source-id: aad8d61bf0553945c217e5db8fb9eda6128440c3
1 parent 98291bc commit 7aff712

28 files changed

Lines changed: 28 additions & 62 deletions

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import org.mockito.kotlin.verify
3838
import org.mockito.kotlin.whenever
3939
import org.robolectric.Robolectric
4040
import org.robolectric.RobolectricTestRunner
41-
import org.robolectric.RuntimeEnvironment
4241
import org.robolectric.annotation.Config
4342

4443
@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class])
@@ -51,7 +50,7 @@ class RootViewTest {
5150
fun setUp() {
5251
ReactNativeFeatureFlagsForTests.setUp()
5352

54-
reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication()))
53+
reactContext = spy(createTestReactApplicationContext())
5554
doNothing().whenever(reactContext).emitDeviceEvent(any(), any())
5655

5756
DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext)

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ object ReactTestHelper {
2121

2222
@OptIn(UnstableReactNativeAPI::class)
2323
@JvmOverloads
24+
@JvmStatic
2425
fun createTestReactApplicationContext(
2526
application: Application = RuntimeEnvironment.getApplication()
2627
): ReactApplicationContext {

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import org.junit.Test
3939
import org.junit.runner.RunWith
4040
import org.mockito.kotlin.mock
4141
import org.robolectric.RobolectricTestRunner
42-
import org.robolectric.RuntimeEnvironment
4342
import org.robolectric.Shadows.shadowOf
4443
import org.robolectric.annotation.Config
4544
import org.robolectric.shadow.api.Shadow
@@ -77,8 +76,7 @@ class FabricUIManagerPullModelTest {
7776
fun setup() {
7877
ReactNativeFeatureFlagsForTests.setUp()
7978
overrideFeatureFlags()
80-
reactContext =
81-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
79+
reactContext = ReactTestHelper.createTestReactApplicationContext()
8280
underTest =
8381
FabricUIManager(
8482
reactContext,

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import org.junit.Before
3131
import org.junit.Test
3232
import org.junit.runner.RunWith
3333
import org.robolectric.RobolectricTestRunner
34-
import org.robolectric.RuntimeEnvironment
3534
import org.robolectric.annotation.Config
3635

3736
@RunWith(RobolectricTestRunner::class)
@@ -55,8 +54,7 @@ class MountingManagerAnimatedPropsTest {
5554
@Before
5655
fun setUp() {
5756
ReactNativeFeatureFlagsForTests.setUp()
58-
val reactContext =
59-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
57+
val reactContext = ReactTestHelper.createTestReactApplicationContext()
6058
themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1)
6159
mountingManager =
6260
MountingManager(ViewManagerRegistry(listOf<ViewManager<*, *>>(ReactViewManager())), {})

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import org.junit.Before
2222
import org.junit.Test
2323
import org.junit.runner.RunWith
2424
import org.robolectric.RobolectricTestRunner
25-
import org.robolectric.RuntimeEnvironment
2625
import org.robolectric.annotation.Config
2726

2827
/** Tests [FabricUIManager] */
@@ -37,7 +36,7 @@ class MountingManagerTest {
3736
@Before
3837
fun setUp() {
3938
ReactNativeFeatureFlagsForTests.setUp()
40-
val reactContext = createTestReactApplicationContext(RuntimeEnvironment.getApplication())
39+
val reactContext = createTestReactApplicationContext()
4140
themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1)
4241
val viewManagers = listOf<ViewManager<*, *>>(ReactViewManager())
4342
mountItemExecutor = MountItemExecutor {

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import org.mockito.kotlin.any
3434
import org.mockito.kotlin.mock
3535
import org.mockito.kotlin.never
3636
import org.robolectric.RobolectricTestRunner
37-
import org.robolectric.RuntimeEnvironment
3837
import org.robolectric.annotation.Config
3938
import org.robolectric.annotation.LooperMode
4039

@@ -60,8 +59,7 @@ class SurfaceMountingManagerEventOrderingTest {
6059
@Before
6160
fun setUp() {
6261
ReactNativeFeatureFlagsForTests.setUp()
63-
val reactContext =
64-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
62+
val reactContext = ReactTestHelper.createTestReactApplicationContext()
6563
themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1)
6664
mountingManager =
6765
MountingManager(

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import org.junit.Before
3434
import org.junit.Test
3535
import org.junit.runner.RunWith
3636
import org.robolectric.RobolectricTestRunner
37-
import org.robolectric.RuntimeEnvironment
3837
import org.robolectric.annotation.Config
3938

4039
/**
@@ -66,8 +65,7 @@ class SurfaceMountingManagerSynchronousMountPropsTest {
6665
@Before
6766
fun setUp() {
6867
ReactNativeFeatureFlagsForTests.setUp()
69-
val reactContext =
70-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
68+
val reactContext = ReactTestHelper.createTestReactApplicationContext()
7169
themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1)
7270
mountingManager =
7371
MountingManager(

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import org.junit.Before
2626
import org.junit.Test
2727
import org.junit.runner.RunWith
2828
import org.robolectric.RobolectricTestRunner
29-
import org.robolectric.RuntimeEnvironment
3029
import org.robolectric.annotation.Config
3130

3231
/**
@@ -54,8 +53,7 @@ class SurfaceMountingManagerTest {
5453
@Before
5554
fun setUp() {
5655
ReactNativeFeatureFlagsForTests.setUp()
57-
val reactContext =
58-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
56+
val reactContext = ReactTestHelper.createTestReactApplicationContext()
5957
themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1)
6058
mountingManager =
6159
MountingManager(

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import org.mockito.kotlin.times
4040
import org.mockito.kotlin.verify
4141
import org.mockito.kotlin.whenever
4242
import org.robolectric.RobolectricTestRunner
43-
import org.robolectric.RuntimeEnvironment
4443
import org.robolectric.annotation.Config
4544

4645
@RunWith(RobolectricTestRunner::class)
@@ -520,8 +519,7 @@ class TouchEventDispatchTest {
520519
metrics.density = 1f
521520
DisplayMetricsHolder.setScreenDisplayMetrics(metrics)
522521

523-
val reactContext =
524-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
522+
val reactContext = ReactTestHelper.createTestReactApplicationContext()
525523
val uiQueueThread: MessageQueueThread = mock()
526524
whenever(uiQueueThread.isOnThread()).thenReturn(true)
527525
val queueConfig: ReactQueueConfiguration = mock()

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import org.mockito.kotlin.never
2020
import org.mockito.kotlin.times
2121
import org.mockito.kotlin.verify
2222
import org.robolectric.RobolectricTestRunner
23-
import org.robolectric.RuntimeEnvironment
2423
import org.robolectric.annotation.Config
2524

2625
@RunWith(RobolectricTestRunner::class)
@@ -32,8 +31,7 @@ class ExtraWindowEventListenerTest {
3231
@Before
3332
fun setUp() {
3433
ReactNativeFeatureFlagsForTests.setUp()
35-
reactContext =
36-
ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication())
34+
reactContext = ReactTestHelper.createTestReactApplicationContext()
3735
window = mock()
3836
}
3937

0 commit comments

Comments
 (0)