Skip to content

Commit 138588f

Browse files
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
1 parent 9a335f8 commit 138588f

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION")
9-
// annotation
10-
@file:Suppress("DEPRECATION")
11-
128
package com.facebook.react.views.text
139

1410
import android.util.DisplayMetrics
15-
import com.facebook.react.bridge.BridgeReactContext
16-
import com.facebook.react.bridge.CatalystInstance
1711
import com.facebook.react.bridge.JavaOnlyMap
18-
import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
12+
import com.facebook.react.bridge.ReactApplicationContext
13+
import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext
1914
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
2015
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsDefaults
2116
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
@@ -27,20 +22,22 @@ import com.facebook.react.uimanager.LengthPercentageType
2722
import com.facebook.react.uimanager.ReactStylesDiffMap
2823
import com.facebook.react.uimanager.ThemedReactContext
2924
import com.facebook.react.uimanager.style.BorderRadiusProp
25+
import com.facebook.testutils.shadows.ShadowSoLoader
3026
import org.assertj.core.api.Assertions.assertThat
3127
import org.junit.After
3228
import org.junit.Before
3329
import org.junit.Test
3430
import org.junit.runner.RunWith
3531
import org.robolectric.RobolectricTestRunner
3632
import org.robolectric.RuntimeEnvironment
33+
import org.robolectric.annotation.Config
3734

3835
/** Verify view properties are being applied correctly by [ReactTextViewManager] */
3936
@RunWith(RobolectricTestRunner::class)
37+
@Config(shadows = [ShadowSoLoader::class])
4038
class ReactTextViewPropertyTest {
4139

42-
private lateinit var context: BridgeReactContext
43-
private lateinit var catalystInstanceMock: CatalystInstance
40+
private lateinit var context: ReactApplicationContext
4441
private lateinit var themedContext: ThemedReactContext
4542
private lateinit var manager: ReactTextViewManager
4643

@@ -52,9 +49,7 @@ class ReactTextViewPropertyTest {
5249
override fun enableViewRecycling(): Boolean = true
5350
},
5451
)
55-
context = BridgeReactContext(RuntimeEnvironment.getApplication())
56-
catalystInstanceMock = createMockCatalystInstance()
57-
context.initializeWithInstance(catalystInstanceMock)
52+
context = createTestReactApplicationContext(RuntimeEnvironment.getApplication())
5853
themedContext = ThemedReactContext(context, context, null, -1)
5954
manager = ReactTextViewManager()
6055
DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics())

0 commit comments

Comments
 (0)