@@ -16,17 +16,17 @@ import android.view.InputDevice
1616import android.view.MotionEvent
1717import android.view.View
1818import android.widget.FrameLayout
19- import com.facebook.react.bridge.BridgeReactContext
2019import com.facebook.react.bridge.JavaOnlyArray
2120import com.facebook.react.bridge.JavaOnlyMap
22- import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
21+ import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext
2322import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
2423import com.facebook.react.uimanager.DisplayMetricsHolder
2524import com.facebook.react.uimanager.ReactStylesDiffMap
2625import com.facebook.react.uimanager.ThemedReactContext
2726import com.facebook.react.uimanager.UIManagerHelper
2827import com.facebook.react.uimanager.events.EventDispatcher
2928import com.facebook.soloader.SoLoader
29+ import com.facebook.testutils.shadows.ShadowSoLoader
3030import org.assertj.core.api.Assertions.assertThat
3131import org.junit.After
3232import org.junit.Before
@@ -38,10 +38,12 @@ import org.mockito.kotlin.any
3838import org.mockito.kotlin.mock
3939import org.robolectric.RobolectricTestRunner
4040import org.robolectric.RuntimeEnvironment
41+ import org.robolectric.annotation.Config
4142
4243/* * Verifies the direction of wheel and joystick scrolling in regular and inverted ScrollViews. */
4344@SuppressLint(" DeprecatedClass" , " DeprecatedMethod" )
4445@RunWith(RobolectricTestRunner ::class )
46+ @Config(shadows = [ShadowSoLoader ::class ])
4547class ReactScrollViewInvertedScrollTest {
4648
4749 private lateinit var themedContext: ThemedReactContext
@@ -51,8 +53,7 @@ class ReactScrollViewInvertedScrollTest {
5153 fun setup () {
5254 ReactNativeFeatureFlagsForTests .setUp()
5355 SoLoader .setInTestMode()
54- val context = BridgeReactContext (RuntimeEnvironment .getApplication())
55- context.initializeWithInstance(createMockCatalystInstance())
56+ val context = createTestReactApplicationContext(RuntimeEnvironment .getApplication())
5657 themedContext = ThemedReactContext (context, context, null , - 1 )
5758 DisplayMetricsHolder .setScreenDisplayMetrics(DisplayMetrics ())
5859 uiManagerHelperMock = mockStatic(UIManagerHelper ::class .java)
0 commit comments