From 384904726594d2d0de2d1c35b1a4b34442fe2d85 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Fri, 23 Oct 2026 17:26:25 -0700 Subject: [PATCH] Bridgeless-context ReactScrollViewInvertedScrollTest (#59267) 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)