From 249839ad5020f82cb853cd63fd55c590de3c727a Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 01/22] Bridgeless-context ReactTextInputPropertyTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext` and pass the application directly as the themed base. Add the `ShadowSoLoader` Robolectric shadow the bridgeless helper needs. Changelog: [Internal] Differential Revision: D126543755 --- .../textinput/ReactTextInputPropertyTest.kt | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) 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 82ec014eb89e..078e16f5bb57 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 @@ -5,10 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") -// annotation -@file:Suppress("DEPRECATION") - package com.facebook.react.views.textinput import android.graphics.Color @@ -27,10 +23,9 @@ import android.view.inputmethod.EditorInfo import androidx.annotation.RequiresApi import androidx.autofill.HintConstants import androidx.core.content.res.ResourcesCompat.ID_NULL -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.BackgroundStyleApplicator import com.facebook.react.uimanager.DisplayMetricsHolder @@ -42,19 +37,21 @@ import com.facebook.react.uimanager.style.BorderRadiusProp import com.facebook.react.views.text.DefaultStyleValuesUtil.getDefaultTextColorHint import com.facebook.react.views.text.ReactTextUpdate import com.facebook.react.views.text.internal.span.CustomStyleSpan +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat 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 {@link EditText} view property being applied properly by {@link ReactTextInputManager} */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class ReactTextInputPropertyTest { - private lateinit var context: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var context: ReactApplicationContext private lateinit var themedContext: ThemedReactContext private lateinit var manager: ReactTextInputManager private lateinit var view: ReactEditText @@ -72,10 +69,9 @@ class ReactTextInputPropertyTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = BridgeReactContext(RuntimeEnvironment.getApplication()) - catalystInstanceMock = createMockCatalystInstance() - context.initializeWithInstance(catalystInstanceMock) - themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL) + val application = RuntimeEnvironment.getApplication() + context = createTestReactApplicationContext(application) + themedContext = ThemedReactContext(context, application, null, ID_NULL) manager = ReactTextInputManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) view = manager.createViewInstance(themedContext) From 811206b40a866bb9ee81f831d62ec6ab83fbbccb Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 02/22] Bridgeless-context ReactImagePropertyTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext`, stub feature flags before creating the context, and add the `ShadowSoLoader` Robolectric shadow. Changelog: [Internal] Differential Revision: D126543660 --- .../views/image/ReactImagePropertyTest.kt | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) 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 b69f015595e0..15913bccfb43 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 @@ -5,10 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") -// annotation -@file:Suppress("DEPRECATION") - package com.facebook.react.views.image import android.graphics.Color @@ -19,10 +15,9 @@ import com.facebook.drawee.backends.pipeline.PipelineDraweeControllerBuilder import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.react.bridge.Arguments -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.common.ReactConstants import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.modules.fresco.ReactNetworkImageRequest @@ -37,6 +32,7 @@ import com.facebook.react.util.RNLog import com.facebook.react.views.imagehelper.ImageSource import com.facebook.soloader.SoLoader import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before @@ -61,18 +57,18 @@ import org.robolectric.annotation.Config * Verify that [com.facebook.drawee.drawable.ScalingUtils] properties are being applied correctly by * [ReactImageManager]. */ -@Config(shadows = [ShadowArguments::class]) +@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @RunWith(RobolectricTestRunner::class) class ReactImagePropertyTest { - private lateinit var context: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var context: ReactApplicationContext private lateinit var themeContext: ThemedReactContext private lateinit var rnLog: MockedStatic private lateinit var flogMock: MockedStatic @Before fun setup() { + ReactNativeFeatureFlagsForTests.setUp() rnLog = mockStatic(RNLog::class.java) rnLog.`when` { RNLog.w(any(), anyString()) }.thenAnswer {} @@ -80,14 +76,10 @@ class ReactImagePropertyTest { flogMock = mockStatic(FLog::class.java) SoLoader.setInTestMode() - context = BridgeReactContext(RuntimeEnvironment.getApplication()) - catalystInstanceMock = createMockCatalystInstance() - context.initializeWithInstance(catalystInstanceMock) + context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themeContext = ThemedReactContext(context, context, null, -1) Fresco.initialize(context) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) - - ReactNativeFeatureFlagsForTests.setUp() } @After From dd16b2720f0c3ea4aaecedb0ed0514f42fced035 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 03/22] Bridgeless-context ReactTextViewPropertyTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext` and add the `ShadowSoLoader` Robolectric shadow the bridgeless helper needs. Changelog: [Internal] Differential Revision: D126543566 --- .../views/text/ReactTextViewPropertyTest.kt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 b0e5258e65a3..9dd0111b5498 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 @@ -5,17 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") -// annotation -@file:Suppress("DEPRECATION") - package com.facebook.react.views.text import android.util.DisplayMetrics -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsDefaults import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests @@ -27,6 +22,7 @@ import com.facebook.react.uimanager.LengthPercentageType import com.facebook.react.uimanager.ReactStylesDiffMap import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.style.BorderRadiusProp +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before @@ -34,13 +30,14 @@ 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] */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class ReactTextViewPropertyTest { - private lateinit var context: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var context: ReactApplicationContext private lateinit var themedContext: ThemedReactContext private lateinit var manager: ReactTextViewManager @@ -52,9 +49,7 @@ class ReactTextViewPropertyTest { override fun enableViewRecycling(): Boolean = true }, ) - context = BridgeReactContext(RuntimeEnvironment.getApplication()) - catalystInstanceMock = createMockCatalystInstance() - context.initializeWithInstance(catalystInstanceMock) + context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedContext = ThemedReactContext(context, context, null, -1) manager = ReactTextViewManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) From a9b4a18b974006b385e3bcb6efab34bb885c7a58 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 04/22] Bridgeless-context SimpleViewPropertyTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext` and add the `ShadowSoLoader` Robolectric shadow the bridgeless helper needs. Changelog: [Internal] Differential Revision: D126543381 --- .../react/uimanager/SimpleViewPropertyTest.kt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 c844c6824f49..4422391d00cf 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 @@ -5,30 +5,28 @@ * LICENSE file in the root directory of this source tree. */ -// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") -// annotation -@file:Suppress("DEPRECATION") - package com.facebook.react.uimanager import android.view.View -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.bridge.ReadableMap import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.touch.JSResponderHandler import com.facebook.react.uimanager.annotations.ReactProp +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions 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] */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class SimpleViewPropertyTest { private class ConcreteViewManager : SimpleViewManager() { @@ -49,17 +47,14 @@ class SimpleViewPropertyTest { } } - private lateinit var context: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var context: ReactApplicationContext private lateinit var themedContext: ThemedReactContext private lateinit var manager: ConcreteViewManager @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = BridgeReactContext(RuntimeEnvironment.getApplication()) - catalystInstanceMock = createMockCatalystInstance() - context.initializeWithInstance(catalystInstanceMock) + context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedContext = ThemedReactContext(context, context, null, surfaceId) manager = ConcreteViewManager() } From 0d90c06326b781fbb43acac73e6b1ec4a8aa48e3 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 05/22] Bridgeless-context ReactAccessibilityDelegateTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with a spied `createTestReactApplicationContext`, stub `hasActiveReactInstance` for the dispatch test, and add the `ShadowSoLoader` Robolectric shadow. Keep the file-level deprecation suppression: the file still exercises other deprecated test APIs (`RCTEventEmitter`), and the open-source build treats warnings as errors. Changelog: [Internal] Differential Revision: D126570685 --- .../uimanager/ReactAccessibilityDelegateTest.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 bb87fb9e0812..63680191f85b 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 @@ -13,10 +13,10 @@ import android.os.Bundle import android.view.accessibility.AccessibilityNodeInfo import androidx.core.view.accessibility.AccessibilityNodeInfoCompat import com.facebook.react.R -import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.bridge.UIManager import com.facebook.react.bridge.WritableMap import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests @@ -26,33 +26,35 @@ import com.facebook.react.uimanager.events.EventDispatcher import com.facebook.react.uimanager.events.RCTEventEmitter import com.facebook.react.views.view.ReactViewGroup import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.mockStatic import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doReturn import org.mockito.kotlin.eq import org.mockito.kotlin.mock +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]) +@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @RunWith(RobolectricTestRunner::class) class ReactAccessibilityDelegateTest { private lateinit var view: ReactViewGroup - private lateinit var reactContext: BridgeReactContext + private lateinit var reactContext: ReactApplicationContext private lateinit var themedReactContext: ThemedReactContext private lateinit var accessibilityDelegate: ReactAccessibilityDelegate @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) - reactContext.initializeWithInstance(createMockCatalystInstance()) + reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) view = ReactViewGroup(themedReactContext).apply { id = 100 } accessibilityDelegate = ReactAccessibilityDelegate(view, false, 0) @@ -266,6 +268,7 @@ class ReactAccessibilityDelegateTest { whenever(uiManager.eventDispatcher).thenReturn(eventDispatcher) val uiManagerHelper = mockStatic(UIManagerHelper::class.java) try { + doReturn(true).whenever(reactContext).hasActiveReactInstance() uiManagerHelper .`when` { UIManagerHelper.getUIManager(themedReactContext, UIManagerType.FABRIC) From 490b175f43fdb3b6fc012efee4938c3b3bf43564 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 06/22] Bridgeless-context ReactScrollViewPropertyTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext` and add the `ShadowSoLoader` Robolectric shadow the bridgeless helper needs. Changelog: [Internal] Differential Revision: D126570686 --- .../views/scroll/ReactScrollViewPropertyTest.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 78fd8948678b..4f9c3454bfae 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 @@ -13,10 +13,9 @@ package com.facebook.react.views.scroll import android.annotation.SuppressLint import android.util.DisplayMetrics import android.view.View -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.BackgroundStyleApplicator import com.facebook.react.uimanager.DisplayMetricsHolder @@ -25,6 +24,7 @@ import com.facebook.react.uimanager.LengthPercentageType import com.facebook.react.uimanager.ReactStylesDiffMap import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.style.BorderRadiusProp +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before @@ -32,22 +32,21 @@ 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. */ @SuppressLint("DeprecatedClass", "DeprecatedMethod") @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class ReactScrollViewPropertyTest { - private lateinit var context: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var context: ReactApplicationContext private lateinit var themedContext: ThemedReactContext @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = BridgeReactContext(RuntimeEnvironment.getApplication()) - catalystInstanceMock = createMockCatalystInstance() - context.initializeWithInstance(catalystInstanceMock) + context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) } From e70df93ee01bba4194f115c15a9bb2842f1a6b1b Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 07/22] Bridgeless-context ReactScrollViewInvertedScrollTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext` and add the `ShadowSoLoader` Robolectric shadow the bridgeless helper needs. Changelog: [Internal] Differential Revision: D126570688 --- .../views/scroll/ReactScrollViewInvertedScrollTest.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 32fcb811a2a3..67cd1770ecc5 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 @@ -16,10 +16,9 @@ import android.view.InputDevice import android.view.MotionEvent import android.view.View import android.widget.FrameLayout -import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.DisplayMetricsHolder import com.facebook.react.uimanager.ReactStylesDiffMap @@ -27,6 +26,7 @@ import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.UIManagerHelper import com.facebook.react.uimanager.events.EventDispatcher import com.facebook.soloader.SoLoader +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before @@ -38,10 +38,12 @@ 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. */ @SuppressLint("DeprecatedClass", "DeprecatedMethod") @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class ReactScrollViewInvertedScrollTest { private lateinit var themedContext: ThemedReactContext @@ -51,8 +53,7 @@ class ReactScrollViewInvertedScrollTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() SoLoader.setInTestMode() - val context = BridgeReactContext(RuntimeEnvironment.getApplication()) - context.initializeWithInstance(createMockCatalystInstance()) + val context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) uiManagerHelperMock = mockStatic(UIManagerHelper::class.java) From 4ce21e28aa227262cd2fe17b51e01da61e602c00 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 08/22] Bridgeless-context MountingManagerTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with `createTestReactApplicationContext` and add the `ShadowSoLoader` Robolectric shadow the bridgeless helper needs. Changelog: [Internal] Differential Revision: D126570689 --- .../com/facebook/react/fabric/MountingManagerTest.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 473e2eb4c0ba..0b023ad697d7 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 @@ -5,13 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -@file:Suppress("DEPRECATION") - package com.facebook.react.fabric import com.facebook.react.ReactRootView -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.fabric.mounting.MountingManager import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests @@ -19,15 +16,18 @@ import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.ViewManager import com.facebook.react.uimanager.ViewManagerRegistry import com.facebook.react.views.view.ReactViewManager +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat 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] */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class MountingManagerTest { private lateinit var mountingManager: MountingManager private lateinit var mountItemExecutor: MountItemExecutor @@ -37,8 +37,7 @@ class MountingManagerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) - reactContext.initializeWithInstance(createMockCatalystInstance()) + val reactContext = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) val viewManagers = listOf>(ReactViewManager()) mountItemExecutor = MountItemExecutor { From 89dd8a9020f121c1f852836b89e9780db3c736c9 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 09/22] Bridgeless-context DeviceInfoModuleTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with a spied `createTestReactApplicationContext`, stubbing `hasActiveReactInstance` and no-opping `emitDeviceEvent` to preserve emission verification. Changelog: [Internal] Differential Revision: D126570690 --- .../modules/deviceinfo/DeviceInfoModuleTest.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 a609d5b5d368..a4d55874fcc5 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 @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -@file:Suppress("DEPRECATION") - package com.facebook.react.modules.deviceinfo import android.app.Activity @@ -20,10 +18,10 @@ import androidx.core.view.WindowInsetsCompat import androidx.window.layout.WindowMetrics import androidx.window.layout.WindowMetricsCalculator import androidx.window.layout.WindowMetricsCalculatorDecorator -import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyMap +import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactContext -import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.bridge.WritableMap import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.DisplayMetricsHolder @@ -43,6 +41,7 @@ import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers import org.mockito.MockedStatic import org.mockito.Mockito.mockStatic +import org.mockito.kotlin.doNothing import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock import org.mockito.kotlin.spy @@ -69,7 +68,7 @@ class DeviceInfoModuleTest : TestCase() { private lateinit var deviceInfoModule: DeviceInfoModule private lateinit var fakePortraitDisplayMetrics: WritableMap private lateinit var fakeLandscapeDisplayMetrics: WritableMap - private lateinit var reactContext: BridgeReactContext + private lateinit var reactContext: ReactApplicationContext private lateinit var displayMetricsHolder: MockedStatic @Before @@ -83,9 +82,11 @@ class DeviceInfoModuleTest : TestCase() { fakeLandscapeDisplayMetrics.putInt("height", 100) displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java) - reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) - val catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() - reactContext.initializeWithInstance(catalystInstanceMock) + reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + doReturn(true).whenever(reactContext).hasActiveReactInstance() + doNothing() + .whenever(reactContext) + .emitDeviceEvent(ArgumentMatchers.anyString(), ArgumentMatchers.any()) deviceInfoModule = spy(DeviceInfoModule(reactContext)) } From d8a385b902b8db1f9c4e1e1d392b71c965d57d7b Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 10/22] Bridgeless-context RootViewTest Summary: Replace the deprecated `BridgeReactContext` + mock `CatalystInstance` setup with a spied `createTestReactApplicationContext`, moving the `UIManagerModule` stub onto the context spy and no-opping `emitDeviceEvent`. Changelog: [Internal] Differential Revision: D126570692 --- .../java/com/facebook/react/RootViewTest.kt | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 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 75099fe23416..277b3754e26d 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 @@ -17,17 +17,20 @@ import android.view.ViewGroup import android.view.WindowInsets import android.view.WindowManager import com.facebook.react.bridge.Arguments -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance -import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.DisplayMetricsHolder import com.facebook.react.uimanager.UIManagerModule import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock import org.mockito.kotlin.spy import org.mockito.kotlin.times @@ -38,25 +41,24 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config -@Config(shadows = [ShadowArguments::class]) +@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @RunWith(RobolectricTestRunner::class) class RootViewTest { - private lateinit var reactContext: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var reactContext: ReactApplicationContext @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() - reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) - reactContext.initializeWithInstance(catalystInstanceMock) + reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + doNothing().whenever(reactContext).emitDeviceEvent(any(), any()) DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext) val uiManagerModuleMock: UIManagerModule = mock() - whenever(catalystInstanceMock.getNativeModule(UIManagerModule::class.java)) - .thenReturn(uiManagerModuleMock) + doReturn(uiManagerModuleMock) + .whenever(reactContext) + .getNativeModule(UIManagerModule::class.java) } @Test From 985a81d0a0945e11ba833328bc1c62eadd95fb95 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 11/22] Bridgeless-context FabricUIManagerPullModelTest Summary: Migrate `FabricUIManagerPullModelTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Changelog: [Internal] Differential Revision: D126574347 --- .../com/facebook/react/fabric/FabricUIManagerPullModelTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 e0796289dfc3..ee4ae40079e6 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,6 +39,7 @@ 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 @@ -76,7 +77,8 @@ class FabricUIManagerPullModelTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() overrideFeatureFlags() - reactContext = ReactTestHelper.createCatalystContextForTest() + reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) underTest = FabricUIManager( reactContext, From 99deee361e9b85a7df6c05783ae42015435e384e Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 12/22] Bridgeless-context MountingManagerAnimatedPropsTest Summary: Migrate `MountingManagerAnimatedPropsTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Changelog: [Internal] Differential Revision: D126574351 --- .../facebook/react/fabric/MountingManagerAnimatedPropsTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f9f4f59e5795..4a3f6f936d3c 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,6 +31,7 @@ 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) @@ -54,7 +55,8 @@ class MountingManagerAnimatedPropsTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager(ViewManagerRegistry(listOf>(ReactViewManager())), {}) From 4318a0170020f1a5978c7495a3669ac7d42079f4 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 13/22] Bridgeless-context SurfaceMountingManagerSynchronousMountPropsTest Summary: Migrate `SurfaceMountingManagerSynchronousMountPropsTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Changelog: [Internal] Differential Revision: D126574353 --- .../fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 884078cdc72c..1e7e51deb722 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,6 +34,7 @@ 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 /** @@ -65,7 +66,8 @@ class SurfaceMountingManagerSynchronousMountPropsTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( From 4eb092e446836e66d0f53fc85feeebc5ad9c5377 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 14/22] Bridgeless-context SurfaceMountingManagerTest Summary: Migrate `SurfaceMountingManagerTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Add the `ShadowSoLoader` Robolectric shadow, which the new helper needs to mock the component factory. Changelog: [Internal] Differential Revision: D126574354 --- .../facebook/react/fabric/SurfaceMountingManagerTest.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 f7372288b68f..a1282668eb23 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 @@ -20,11 +20,14 @@ import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.ViewManager import com.facebook.react.uimanager.ViewManagerRegistry import com.facebook.react.views.view.ReactViewManager +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat 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 for [SurfaceMountingManager] view lifecycle around preallocateView, deleteView, and @@ -42,6 +45,7 @@ import org.robolectric.RobolectricTestRunner * See T223288217. */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class SurfaceMountingManagerTest { private lateinit var mountingManager: MountingManager private lateinit var themedReactContext: ThemedReactContext @@ -50,7 +54,8 @@ class SurfaceMountingManagerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( From 3fbac3087316fb4824c7f2c17cf7c38ef0eb4233 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 15/22] Bridgeless-context BaseViewManagerDelegateTest Summary: Migrate `BaseViewManagerDelegateTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Add the `ShadowSoLoader` Robolectric shadow, which the new helper needs to mock the component factory. Changelog: [Internal] Differential Revision: D126574355 --- .../react/uimanager/BaseViewManagerDelegateTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 13ad5c6a95c3..329f88e2fee8 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 @@ -16,13 +16,17 @@ import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests; import com.facebook.react.views.view.ReactViewGroup; import com.facebook.react.views.view.ReactViewManager; +import com.facebook.testutils.shadows.ShadowSoLoader; import org.junit.After; 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) +@Config(shadows = ShadowSoLoader.class) public class BaseViewManagerDelegateTest { private ReactViewManager viewManager; private ReactViewGroup view; @@ -34,7 +38,9 @@ public void setUp() { // (non-JNI) accessor so Robolectric doesn't try to load react_featureflagsjni. ReactNativeFeatureFlagsForTests.INSTANCE.setUp(); viewManager = mock(ReactViewManager.class); - ReactApplicationContext context = ReactTestHelper.createCatalystContextForTest(); + ReactApplicationContext context = + ReactTestHelper.INSTANCE.createTestReactApplicationContext( + RuntimeEnvironment.getApplication()); ThemedReactContext themedReactContext = new ThemedReactContext(context, context, null, -1); view = new ReactViewGroup(themedReactContext); delegate = new BaseViewManagerDelegate<>(viewManager) {}; From 331d8b6bc78e7f1199b80f6459088cf8168c49bd Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 16/22] Bridgeless-context ImageLoaderModuleTest Summary: Migrate `ImageLoaderModuleTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Stub the feature flags before context creation, since the bridgeless context reads them during init. Changelog: [Internal] Differential Revision: D126574356 --- .../facebook/react/modules/image/ImageLoaderModuleTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 45f1f7f59b69..f12159fe9e57 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 @@ -25,6 +25,7 @@ import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.ReadableMap import com.facebook.react.bridge.WritableMap +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.views.image.ReactCallerContextFactory import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper import com.facebook.testutils.shadows.ShadowArguments @@ -45,6 +46,7 @@ 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. */ @@ -60,7 +62,9 @@ class ImageLoaderModuleTest { @Before fun setUp() { - reactContext = ReactTestHelper.createCatalystContextForTest() + ReactNativeFeatureFlagsForTests.setUp() + reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) imageLoaderModule = ImageLoaderModule(reactContext) mockedHelper = mockStatic(ResourceDrawableIdHelper::class.java) From 236a682d395bbfaa5eaa4a1e4ad9c0898a050621 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 17/22] Bridgeless-context ShareModuleTest Summary: Migrate `ShareModuleTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Add the `ShadowSoLoader` Robolectric shadow and stub the feature flags before context creation, since the bridgeless context reads them during init. Changelog: [Internal] Differential Revision: D126574357 --- .../com/facebook/react/modules/share/ShareModuleTest.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 95db0bd69577..72f7292aac17 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 @@ -13,7 +13,9 @@ import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.WritableMap +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test @@ -25,7 +27,7 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.android.controller.ActivityController import org.robolectric.annotation.Config -@Config(shadows = [ShadowArguments::class]) +@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @RunWith(RobolectricTestRunner::class) class ShareModuleTest { @@ -34,9 +36,11 @@ class ShareModuleTest { @Before fun prepareModules() { + ReactNativeFeatureFlagsForTests.setUp() activityController = Robolectric.buildActivity(FragmentActivity::class.java) val activity = activityController.create().start().resume().get() - val applicationContext = ReactTestHelper.createCatalystContextForTest() + val applicationContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) applicationContext.onNewIntent(activity, Intent()) shareModule = ShareModule(applicationContext) } From 381be37cc02836fef66291afc8d8ac35b398bafb Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 18/22] Bridgeless-context ReactScrollViewHelperFlingAnimatorTest Summary: Migrate `ReactScrollViewHelperFlingAnimatorTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Stub the feature flags before context creation, since the bridgeless context reads them during init. Changelog: [Internal] Differential Revision: D126574358 --- .../views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 f8fe3b37b616..f02176b93a03 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 @@ -13,6 +13,7 @@ import android.view.View import android.view.ViewGroup import com.facebook.react.bridge.ReactContext import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.StateWrapper import com.facebook.react.uimanager.UIManagerHelper import com.facebook.react.uimanager.events.Event @@ -63,10 +64,12 @@ class ReactScrollViewHelperFlingAnimatorTest { @Before @Suppress("UNCHECKED_CAST") fun setUp() { + ReactNativeFeatureFlagsForTests.setUp() mockChild = mock() mockAnimator = ValueAnimator() mockEventDispatcher = mock() - mockContext = ReactTestHelper.createCatalystContextForTest() + mockContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) mockScrollView = mock() From 2e163b4ac2f1ad51fff5f1a08a96377c112d4f11 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 19/22] Bridgeless-context SurfaceMountingManagerEventOrderingTest Summary: Migrate `SurfaceMountingManagerEventOrderingTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Changelog: [Internal] Differential Revision: D126574360 --- .../react/fabric/SurfaceMountingManagerEventOrderingTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 af0e1893d3f9..f38ef84da6cf 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,6 +34,7 @@ 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 @@ -59,7 +60,8 @@ class SurfaceMountingManagerEventOrderingTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( From 256caf3cf6a4b8a0b895f0a34c0865ebc4915d39 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 20/22] Bridgeless-context ThemedReactContextTest Summary: Migrate `ThemedReactContextTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Stub the feature flags before context creation, since the bridgeless context reads them during init. Changelog: [Internal] Differential Revision: D126574361 --- .../com/facebook/react/uimanager/ThemedReactContextTest.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 b0e05900d1ba..45661c6d0f76 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 @@ -11,6 +11,7 @@ import android.view.Window import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.interfaces.ExtraWindowEventListener +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.testutils.shadows.ShadowSoLoader import org.junit.Before import org.junit.Test @@ -31,7 +32,9 @@ class ThemedReactContextTest { @Before fun setUp() { - reactApplicationContext = ReactTestHelper.createCatalystContextForTest() + ReactNativeFeatureFlagsForTests.setUp() + reactApplicationContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) themedReactContext = ThemedReactContext(reactApplicationContext, RuntimeEnvironment.getApplication(), null, -1) window = mock() From 1078265f53810fb63bef5185a4b5d129c7a5162e Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 14:58:32 -0700 Subject: [PATCH 21/22] Bridgeless-context BlobModuleTest Summary: Migrate `BlobModuleTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Add the `ShadowSoLoader` Robolectric shadow and stub the feature flags before context creation, since the bridgeless context reads them during init. Changelog: [Internal] Differential Revision: D126574362 --- .../com/facebook/react/modules/blob/BlobModuleTest.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 b64f1595c5be..ba826cb7aa63 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 @@ -12,8 +12,10 @@ import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.soloader.SoLoader import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import java.io.ByteArrayInputStream import java.nio.ByteBuffer import java.util.UUID @@ -26,11 +28,12 @@ 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 @RunWith(RobolectricTestRunner::class) -@Config(manifest = Config.NONE, shadows = [ShadowArguments::class]) +@Config(manifest = Config.NONE, shadows = [ShadowArguments::class, ShadowSoLoader::class]) class BlobModuleTest { private lateinit var bytes: ByteArray private lateinit var blobId: String @@ -40,6 +43,7 @@ class BlobModuleTest { @Before fun prepareModules() { + ReactNativeFeatureFlagsForTests.setUp() mockedStaticSoLoader = mockStatic(SoLoader::class.java) mockedStaticSoLoader .`when` { SoLoader.loadLibrary("reactnativeblob") } @@ -48,7 +52,7 @@ class BlobModuleTest { bytes = ByteArray(120) Random.Default.nextBytes(bytes) - context = ReactTestHelper.createCatalystContextForTest() + context = ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) blobModule = BlobModule(context) blobId = blobModule.store(bytes) } From 5d85e9232f3d1522445d9b075a94b1ae61eaca3f Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 21 Oct 2026 15:36:43 -0700 Subject: [PATCH 22/22] Bridgeless-context TouchEventDispatchTest (#59280) Summary: Pull Request resolved: https://github.com/react/react-native/pull/59280 Migrate `TouchEventDispatchTest` from the deprecated `createCatalystContextForTest` helper to `createTestReactApplicationContext`, so the test builds a bridgeless context directly. Install a mocked `ReactQueueConfiguration` via `initializeMessageQueueThreads` to satisfy the UI-thread check in `FabricEventDispatcher`, which the mock catalyst previously provided. Changelog: [Internal] Differential Revision: D126574364 --- .../react/fabric/events/TouchEventDispatchTest.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 ebecb3a9ef97..5e7516b42a5e 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 @@ -16,6 +16,8 @@ import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.ReadableMap import com.facebook.react.bridge.WritableMap +import com.facebook.react.bridge.queue.MessageQueueThread +import com.facebook.react.bridge.queue.ReactQueueConfiguration import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.modules.core.ReactChoreographer import com.facebook.react.uimanager.DisplayMetricsHolder @@ -36,7 +38,9 @@ import org.mockito.ArgumentMatchers.* import org.mockito.kotlin.mock 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) @@ -516,7 +520,15 @@ class TouchEventDispatchTest { metrics.density = 1f DisplayMetricsHolder.setScreenDisplayMetrics(metrics) - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = + ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val uiQueueThread: MessageQueueThread = mock() + whenever(uiQueueThread.isOnThread()).thenReturn(true) + val queueConfig: ReactQueueConfiguration = mock() + whenever(queueConfig.getUIQueueThread()).thenReturn(uiQueueThread) + whenever(queueConfig.getNativeModulesQueueThread()).thenReturn(uiQueueThread) + whenever(queueConfig.getJSQueueThread()).thenReturn(uiQueueThread) + reactContext.initializeMessageQueueThreads(queueConfig) eventEmitter = mock() eventDispatcher = FabricEventDispatcher(reactContext, eventEmitter)