From 7aff712957204820c6737fb8fbda9fa940f1a48a Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Tue, 27 Oct 2026 07:22:58 -0700 Subject: [PATCH] Simplify createTestReactApplicationContext calls (#59508) Summary: Pull Request resolved: https://github.com/react/react-native/pull/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 --- .../src/test/java/com/facebook/react/RootViewTest.kt | 3 +-- .../test/java/com/facebook/react/bridge/ReactTestHelper.kt | 1 + .../facebook/react/fabric/FabricUIManagerPullModelTest.kt | 4 +--- .../react/fabric/MountingManagerAnimatedPropsTest.kt | 4 +--- .../java/com/facebook/react/fabric/MountingManagerTest.kt | 3 +-- .../react/fabric/SurfaceMountingManagerEventOrderingTest.kt | 4 +--- .../SurfaceMountingManagerSynchronousMountPropsTest.kt | 4 +--- .../com/facebook/react/fabric/SurfaceMountingManagerTest.kt | 4 +--- .../facebook/react/fabric/events/TouchEventDispatchTest.kt | 4 +--- .../react/interfaces/ExtraWindowEventListenerTest.kt | 4 +--- .../java/com/facebook/react/modules/blob/BlobModuleTest.kt | 3 +-- .../facebook/react/modules/clipboard/ClipboardModuleTest.kt | 3 +-- .../react/modules/deviceinfo/DeviceInfoModuleTest.kt | 3 +-- .../facebook/react/modules/image/ImageLoaderModuleTest.kt | 4 +--- .../java/com/facebook/react/modules/share/ShareModuleTest.kt | 3 +-- .../react/uimanager/BaseViewManagerDelegateTest.java | 5 +---- .../react/uimanager/ReactAccessibilityDelegateTest.kt | 3 +-- .../com/facebook/react/uimanager/SimpleViewPropertyTest.kt | 3 +-- .../com/facebook/react/uimanager/ThemedReactContextTest.kt | 3 +-- .../com/facebook/react/views/image/ReactImagePropertyTest.kt | 3 +-- .../views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt | 3 +-- .../react/views/scroll/ReactScrollViewInvertedScrollTest.kt | 3 +-- .../react/views/scroll/ReactScrollViewPropertyTest.kt | 3 +-- .../react/views/scroll/ReactScrollViewTouchCancelTest.kt | 3 +-- .../facebook/react/views/text/ReactTextViewPropertyTest.kt | 3 +-- .../react/views/textinput/ReactEditTextKeyEventTest.kt | 3 +-- .../react/views/textinput/ReactEditTextOutlineTest.kt | 2 +- .../react/views/textinput/ReactTextInputPropertyTest.kt | 2 +- 28 files changed, 28 insertions(+), 62 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt index 277b3754e26..29f17a0fe3b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt @@ -38,7 +38,6 @@ import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @@ -51,7 +50,7 @@ class RootViewTest { fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(createTestReactApplicationContext()) doNothing().whenever(reactContext).emitDeviceEvent(any(), any()) DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt index e5874060417..c797c73c01e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt @@ -21,6 +21,7 @@ object ReactTestHelper { @OptIn(UnstableReactNativeAPI::class) @JvmOverloads + @JvmStatic fun createTestReactApplicationContext( application: Application = RuntimeEnvironment.getApplication() ): ReactApplicationContext { diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt index ee4ae40079e..f1b4656a4cc 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt @@ -39,7 +39,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.mock import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.shadow.api.Shadow @@ -77,8 +76,7 @@ class FabricUIManagerPullModelTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() overrideFeatureFlags() - reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = ReactTestHelper.createTestReactApplicationContext() underTest = FabricUIManager( reactContext, diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt index 4a3f6f936d3..6d189b5e49e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt @@ -31,7 +31,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -55,8 +54,7 @@ class MountingManagerAnimatedPropsTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager(ViewManagerRegistry(listOf>(ReactViewManager())), {}) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt index 0b023ad697d..8054f0a6bfd 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt @@ -22,7 +22,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Tests [FabricUIManager] */ @@ -37,7 +36,7 @@ class MountingManagerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) val viewManagers = listOf>(ReactViewManager()) mountItemExecutor = MountItemExecutor { diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt index f38ef84da6c..4db64d8cde6 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt @@ -34,7 +34,6 @@ import org.mockito.kotlin.any import org.mockito.kotlin.mock import org.mockito.kotlin.never import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode @@ -60,8 +59,7 @@ class SurfaceMountingManagerEventOrderingTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt index 1e7e51deb72..49d7940429e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt @@ -34,7 +34,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** @@ -66,8 +65,7 @@ class SurfaceMountingManagerSynchronousMountPropsTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt index a1282668eb2..06aed3ab2c6 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt @@ -26,7 +26,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** @@ -54,8 +53,7 @@ class SurfaceMountingManagerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt index 5e7516b42a5..00fc7e3489d 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt @@ -40,7 +40,6 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -520,8 +519,7 @@ class TouchEventDispatchTest { metrics.density = 1f DisplayMetricsHolder.setScreenDisplayMetrics(metrics) - val reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = ReactTestHelper.createTestReactApplicationContext() val uiQueueThread: MessageQueueThread = mock() whenever(uiQueueThread.isOnThread()).thenReturn(true) val queueConfig: ReactQueueConfiguration = mock() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt index fe8a98c955a..2f7702f4cce 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt @@ -20,7 +20,6 @@ import org.mockito.kotlin.never import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -32,8 +31,7 @@ class ExtraWindowEventListenerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = ReactTestHelper.createTestReactApplicationContext() window = mock() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt index ba826cb7aa6..2e19c4e86ae 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt @@ -28,7 +28,6 @@ import org.junit.runner.RunWith import org.mockito.MockedStatic import org.mockito.Mockito.mockStatic import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -52,7 +51,7 @@ class BlobModuleTest { bytes = ByteArray(120) Random.Default.nextBytes(bytes) - context = ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = ReactTestHelper.createTestReactApplicationContext() blobModule = BlobModule(context) blobId = blobModule.store(bytes) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt index 360c0c406dc..f180026f4a2 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt @@ -31,8 +31,7 @@ class ClipboardModuleTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - clipboardModule = - ClipboardModule(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + clipboardModule = ClipboardModule(createTestReactApplicationContext()) clipboardManager = RuntimeEnvironment.getApplication().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt index cb18b25f8ee..f4fecc7ad8a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt @@ -48,7 +48,6 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -81,7 +80,7 @@ class DeviceInfoModuleTest { fakeLandscapeDisplayMetrics.putInt("height", 100) displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java) - reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(createTestReactApplicationContext()) doReturn(true).whenever(reactContext).hasActiveReactInstance() doNothing() .whenever(reactContext) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt index f12159fe9e5..783febaf8d3 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt @@ -46,7 +46,6 @@ import org.mockito.kotlin.never import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** The payload is never decoded — every test here mocks the image pipeline. */ @@ -63,8 +62,7 @@ class ImageLoaderModuleTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = ReactTestHelper.createTestReactApplicationContext() imageLoaderModule = ImageLoaderModule(reactContext) mockedHelper = mockStatic(ResourceDrawableIdHelper::class.java) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt index 72f7292aac1..9a0b385b58d 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt @@ -39,8 +39,7 @@ class ShareModuleTest { ReactNativeFeatureFlagsForTests.setUp() activityController = Robolectric.buildActivity(FragmentActivity::class.java) val activity = activityController.create().start().resume().get() - val applicationContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val applicationContext = ReactTestHelper.createTestReactApplicationContext() applicationContext.onNewIntent(activity, Intent()) shareModule = ShareModule(applicationContext) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java index 329f88e2fee..baa5e5883ed 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java @@ -22,7 +22,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) @@ -38,9 +37,7 @@ public class BaseViewManagerDelegateTest { // (non-JNI) accessor so Robolectric doesn't try to load react_featureflagsjni. ReactNativeFeatureFlagsForTests.INSTANCE.setUp(); viewManager = mock(ReactViewManager.class); - ReactApplicationContext context = - ReactTestHelper.INSTANCE.createTestReactApplicationContext( - RuntimeEnvironment.getApplication()); + ReactApplicationContext context = ReactTestHelper.createTestReactApplicationContext(); ThemedReactContext themedReactContext = new ThemedReactContext(context, context, null, -1); view = new ReactViewGroup(themedReactContext); delegate = new BaseViewManagerDelegate<>(viewManager) {}; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt index 63680191f85..44eb6784c2f 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt @@ -40,7 +40,6 @@ import org.mockito.kotlin.spy import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @@ -54,7 +53,7 @@ class ReactAccessibilityDelegateTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(createTestReactApplicationContext()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) view = ReactViewGroup(themedReactContext).apply { id = 100 } accessibilityDelegate = ReactAccessibilityDelegate(view, false, 0) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt index 4422391d00c..2741eed2a05 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt @@ -21,7 +21,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verify [View] view property being applied properly by [SimpleViewManager] */ @@ -54,7 +53,7 @@ class SimpleViewPropertyTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, surfaceId) manager = ConcreteViewManager() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt index 45661c6d0f7..7e58276ce6f 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt @@ -33,8 +33,7 @@ class ThemedReactContextTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactApplicationContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + reactApplicationContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactApplicationContext, RuntimeEnvironment.getApplication(), null, -1) window = mock() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt index 15913bccfb4..920973e13c0 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt @@ -50,7 +50,6 @@ import org.mockito.kotlin.reset import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** @@ -76,7 +75,7 @@ class ReactImagePropertyTest { flogMock = mockStatic(FLog::class.java) SoLoader.setInTestMode() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themeContext = ThemedReactContext(context, context, null, -1) Fresco.initialize(context) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt index f02176b93a0..677d4d09cc1 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt @@ -68,8 +68,7 @@ class ReactScrollViewHelperFlingAnimatorTest { mockChild = mock() mockAnimator = ValueAnimator() mockEventDispatcher = mock() - mockContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + mockContext = ReactTestHelper.createTestReactApplicationContext() mockScrollView = mock() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewInvertedScrollTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewInvertedScrollTest.kt index 67cd1770ecc..2ebd4831d38 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewInvertedScrollTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewInvertedScrollTest.kt @@ -37,7 +37,6 @@ import org.mockito.Mockito.mockStatic import org.mockito.kotlin.any import org.mockito.kotlin.mock import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verifies the direction of wheel and joystick scrolling in regular and inverted ScrollViews. */ @@ -53,7 +52,7 @@ class ReactScrollViewInvertedScrollTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() SoLoader.setInTestMode() - val context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) uiManagerHelperMock = mockStatic(UIManagerHelper::class.java) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt index 4f9c3454bfa..c89635e67aa 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt @@ -31,7 +31,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verifies border radius properties applied by the vertical and horizontal ScrollView managers. */ @@ -46,7 +45,7 @@ class ReactScrollViewPropertyTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt index 140ce583a08..6c09b93be47 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt @@ -41,7 +41,6 @@ import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.robolectric.ParameterizedRobolectricTestRunner import org.robolectric.Robolectric -import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.android.controller.ActivityController import org.robolectric.annotation.Config @@ -81,7 +80,7 @@ class ReactScrollViewTouchCancelTest(private val kind: String) { fun setup() { ReactNativeFeatureFlagsForTests.setUp() SoLoader.setInTestMode() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() context.scrollEndedListeners.addListener(scrollEndedListener) themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt index 9dd0111b549..68907f1dc50 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt @@ -29,7 +29,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verify view properties are being applied correctly by [ReactTextViewManager] */ @@ -49,7 +48,7 @@ class ReactTextViewPropertyTest { override fun enableViewRecycling(): Boolean = true }, ) - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, -1) manager = ReactTextViewManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt index 5f7458d1f73..42ae5e3f5f8 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt @@ -26,7 +26,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -39,7 +38,7 @@ class ReactEditTextKeyEventTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - val context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val context = createTestReactApplicationContext() val themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL) manager = ReactTextInputManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt index 5a9dc1926a3..4309930e2b8 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt @@ -50,7 +50,7 @@ class ReactEditTextOutlineTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - val context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val context = createTestReactApplicationContext() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) view = ReactTextInputManager().createViewInstance(ThemedReactContext(context, context, null, -1)) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt index 078e16f5bb5..dac9993d5ec 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt @@ -70,7 +70,7 @@ class ReactTextInputPropertyTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() val application = RuntimeEnvironment.getApplication() - context = createTestReactApplicationContext(application) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, application, null, ID_NULL) manager = ReactTextInputManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics())