Skip to content

Commit f341fa3

Browse files
Bridgeless-context ReactImagePropertyTest (#59253)
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
1 parent 1a73bbb commit f341fa3

1 file changed

Lines changed: 7 additions & 15 deletions

File tree

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
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.image
139

1410
import android.graphics.Color
@@ -17,10 +13,9 @@ import com.facebook.common.logging.FLog
1713
import com.facebook.drawee.backends.pipeline.Fresco
1814
import com.facebook.drawee.drawable.ScalingUtils
1915
import com.facebook.react.bridge.Arguments
20-
import com.facebook.react.bridge.BridgeReactContext
21-
import com.facebook.react.bridge.CatalystInstance
2216
import com.facebook.react.bridge.JavaOnlyMap
23-
import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
17+
import com.facebook.react.bridge.ReactApplicationContext
18+
import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext
2419
import com.facebook.react.common.ReactConstants
2520
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
2621
import com.facebook.react.uimanager.BackgroundStyleApplicator
@@ -34,6 +29,7 @@ import com.facebook.react.util.RNLog
3429
import com.facebook.react.views.imagehelper.ImageSource
3530
import com.facebook.soloader.SoLoader
3631
import com.facebook.testutils.shadows.ShadowArguments
32+
import com.facebook.testutils.shadows.ShadowSoLoader
3733
import org.assertj.core.api.Assertions.assertThat
3834
import org.junit.After
3935
import org.junit.Before
@@ -55,33 +51,29 @@ import org.robolectric.annotation.Config
5551
* Verify that [com.facebook.drawee.drawable.ScalingUtils] properties are being applied correctly by
5652
* [ReactImageManager].
5753
*/
58-
@Config(shadows = [ShadowArguments::class])
54+
@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class])
5955
@RunWith(RobolectricTestRunner::class)
6056
class ReactImagePropertyTest {
6157

62-
private lateinit var context: BridgeReactContext
63-
private lateinit var catalystInstanceMock: CatalystInstance
58+
private lateinit var context: ReactApplicationContext
6459
private lateinit var themeContext: ThemedReactContext
6560
private lateinit var rnLog: MockedStatic<RNLog>
6661
private lateinit var flogMock: MockedStatic<FLog>
6762

6863
@Before
6964
fun setup() {
65+
ReactNativeFeatureFlagsForTests.setUp()
7066

7167
rnLog = mockStatic(RNLog::class.java)
7268
rnLog.`when`<Boolean> { RNLog.w(any(), anyString()) }.thenAnswer {}
7369

7470
flogMock = mockStatic(FLog::class.java)
7571

7672
SoLoader.setInTestMode()
77-
context = BridgeReactContext(RuntimeEnvironment.getApplication())
78-
catalystInstanceMock = createMockCatalystInstance()
79-
context.initializeWithInstance(catalystInstanceMock)
73+
context = createTestReactApplicationContext(RuntimeEnvironment.getApplication())
8074
themeContext = ThemedReactContext(context, context, null, -1)
8175
Fresco.initialize(context)
8276
DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics())
83-
84-
ReactNativeFeatureFlagsForTests.setUp()
8577
}
8678

8779
@After

0 commit comments

Comments
 (0)