@@ -13,10 +13,9 @@ package com.facebook.react.views.scroll
1313import android.annotation.SuppressLint
1414import android.util.DisplayMetrics
1515import android.view.View
16- import com.facebook.react.bridge.BridgeReactContext
17- import com.facebook.react.bridge.CatalystInstance
1816import com.facebook.react.bridge.JavaOnlyMap
19- import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
17+ import com.facebook.react.bridge.ReactApplicationContext
18+ import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext
2019import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
2120import com.facebook.react.uimanager.BackgroundStyleApplicator
2221import com.facebook.react.uimanager.DisplayMetricsHolder
@@ -25,29 +24,29 @@ import com.facebook.react.uimanager.LengthPercentageType
2524import com.facebook.react.uimanager.ReactStylesDiffMap
2625import com.facebook.react.uimanager.ThemedReactContext
2726import com.facebook.react.uimanager.style.BorderRadiusProp
27+ import com.facebook.testutils.shadows.ShadowSoLoader
2828import org.assertj.core.api.Assertions.assertThat
2929import org.junit.After
3030import org.junit.Before
3131import org.junit.Test
3232import org.junit.runner.RunWith
3333import org.robolectric.RobolectricTestRunner
3434import org.robolectric.RuntimeEnvironment
35+ import org.robolectric.annotation.Config
3536
3637/* * Verifies border radius properties applied by the vertical and horizontal ScrollView managers. */
3738@SuppressLint(" DeprecatedClass" , " DeprecatedMethod" )
3839@RunWith(RobolectricTestRunner ::class )
40+ @Config(shadows = [ShadowSoLoader ::class ])
3941class ReactScrollViewPropertyTest {
4042
41- private lateinit var context: BridgeReactContext
42- private lateinit var catalystInstanceMock: CatalystInstance
43+ private lateinit var context: ReactApplicationContext
4344 private lateinit var themedContext: ThemedReactContext
4445
4546 @Before
4647 fun setup () {
4748 ReactNativeFeatureFlagsForTests .setUp()
48- context = BridgeReactContext (RuntimeEnvironment .getApplication())
49- catalystInstanceMock = createMockCatalystInstance()
50- context.initializeWithInstance(catalystInstanceMock)
49+ context = createTestReactApplicationContext(RuntimeEnvironment .getApplication())
5150 themedContext = ThemedReactContext (context, context, null , - 1 )
5251 DisplayMetricsHolder .setScreenDisplayMetrics(DisplayMetrics ())
5352 }
0 commit comments