diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt index 75099fe23416..29f17a0fe3b4 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt @@ -17,17 +17,20 @@ import android.view.ViewGroup import android.view.WindowInsets import android.view.WindowManager import com.facebook.react.bridge.Arguments -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.CatalystInstance -import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.bridge.ReactApplicationContext +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.UIManagerModule import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.doNothing +import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock import org.mockito.kotlin.spy import org.mockito.kotlin.times @@ -35,28 +38,26 @@ import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config -@Config(shadows = [ShadowArguments::class]) +@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @RunWith(RobolectricTestRunner::class) class RootViewTest { - private lateinit var reactContext: BridgeReactContext - private lateinit var catalystInstanceMock: CatalystInstance + private lateinit var reactContext: ReactApplicationContext @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() - reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) - reactContext.initializeWithInstance(catalystInstanceMock) + reactContext = spy(createTestReactApplicationContext()) + doNothing().whenever(reactContext).emitDeviceEvent(any(), any()) DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext) val uiManagerModuleMock: UIManagerModule = mock() - whenever(catalystInstanceMock.getNativeModule(UIManagerModule::class.java)) - .thenReturn(uiManagerModuleMock) + doReturn(uiManagerModuleMock) + .whenever(reactContext) + .getNativeModule(UIManagerModule::class.java) } @Test diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt index 53c328427a61..c797c73c01ea 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt @@ -5,59 +5,26 @@ * LICENSE file in the root directory of this source tree. */ -// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") -// annotation -@file:Suppress("DEPRECATION") - package com.facebook.react.bridge import android.app.Application -import com.facebook.react.bridge.queue.MessageQueueThreadSpec -import com.facebook.react.bridge.queue.ReactQueueConfiguration -import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl -import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec import com.facebook.react.common.annotations.UnstableReactNativeAPI import com.facebook.react.runtime.BridgelessReactContext import com.facebook.react.runtime.ReactHostImpl import com.facebook.react.runtime.internal.bolts.Task -import com.facebook.react.uimanager.UIManagerModule import org.mockito.kotlin.mock import org.mockito.kotlin.spy -import org.mockito.kotlin.whenever import org.robolectric.RuntimeEnvironment /** Utility for creating pre-configured instances of core react components for tests. */ object ReactTestHelper { - /** - * @return a ReactApplicationContext that has a CatalystInstance mock returned by - * [createMockCatalystInstance] - */ - @JvmStatic - fun createCatalystContextForTest(): ReactApplicationContext = - BridgeReactContext(RuntimeEnvironment.getApplication()).apply { - initializeWithInstance(createMockCatalystInstance()) - } - - /** @return a CatalystInstance mock that has a default working ReactQueueConfiguration. */ - @JvmStatic - fun createMockCatalystInstance(): CatalystInstance { - val spec: ReactQueueConfigurationSpec = - ReactQueueConfigurationSpec.builder() - .setJSQueueThreadSpec(MessageQueueThreadSpec.mainThreadSpec()) - .setNativeModulesQueueThreadSpec(MessageQueueThreadSpec.mainThreadSpec()) - .build() - val reactQueueConfiguration: ReactQueueConfiguration = - ReactQueueConfigurationImpl.create(spec) { e -> throw RuntimeException(e) } - val reactInstance: CatalystInstance = mock() - whenever(reactInstance.reactQueueConfiguration).thenReturn(reactQueueConfiguration) - whenever(reactInstance.getNativeModule(UIManagerModule::class.java)) - .thenReturn(mock()) - whenever(reactInstance.isDestroyed).thenReturn(false) - return reactInstance - } @OptIn(UnstableReactNativeAPI::class) - fun createTestReactApplicationContext(application: Application): ReactApplicationContext { + @JvmOverloads + @JvmStatic + fun createTestReactApplicationContext( + application: Application = RuntimeEnvironment.getApplication() + ): ReactApplicationContext { val reactHost = spy( ReactHostImpl( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt index e0796289dfc3..f1b4656a4cc5 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerPullModelTest.kt @@ -76,7 +76,7 @@ class FabricUIManagerPullModelTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() overrideFeatureFlags() - reactContext = ReactTestHelper.createCatalystContextForTest() + reactContext = ReactTestHelper.createTestReactApplicationContext() underTest = FabricUIManager( reactContext, diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt index f9f4f59e5795..6d189b5e49e7 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerAnimatedPropsTest.kt @@ -54,7 +54,7 @@ class MountingManagerAnimatedPropsTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager(ViewManagerRegistry(listOf>(ReactViewManager())), {}) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt index 473e2eb4c0ba..8054f0a6bfd0 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt @@ -5,13 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -@file:Suppress("DEPRECATION") - package com.facebook.react.fabric import com.facebook.react.ReactRootView -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.fabric.mounting.MountingManager import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests @@ -19,15 +16,17 @@ import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.ViewManager import com.facebook.react.uimanager.ViewManagerRegistry import com.facebook.react.views.view.ReactViewManager +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config /** Tests [FabricUIManager] */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class MountingManagerTest { private lateinit var mountingManager: MountingManager private lateinit var mountItemExecutor: MountItemExecutor @@ -37,8 +36,7 @@ class MountingManagerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) - reactContext.initializeWithInstance(createMockCatalystInstance()) + val reactContext = createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) val viewManagers = listOf>(ReactViewManager()) mountItemExecutor = MountItemExecutor { diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt index af0e1893d3f9..4db64d8cde6a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerEventOrderingTest.kt @@ -59,7 +59,7 @@ class SurfaceMountingManagerEventOrderingTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt index 884078cdc72c..49d7940429e4 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerSynchronousMountPropsTest.kt @@ -65,7 +65,7 @@ class SurfaceMountingManagerSynchronousMountPropsTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt index f7372288b68f..06aed3ab2c69 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/SurfaceMountingManagerTest.kt @@ -20,11 +20,13 @@ import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.ViewManager import com.facebook.react.uimanager.ViewManagerRegistry import com.facebook.react.views.view.ReactViewManager +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config /** * Tests for [SurfaceMountingManager] view lifecycle around preallocateView, deleteView, and @@ -42,6 +44,7 @@ import org.robolectric.RobolectricTestRunner * See T223288217. */ @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) class SurfaceMountingManagerTest { private lateinit var mountingManager: MountingManager private lateinit var themedReactContext: ThemedReactContext @@ -50,7 +53,7 @@ class SurfaceMountingManagerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) mountingManager = MountingManager( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt index ebecb3a9ef97..00fc7e3489db 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt @@ -16,6 +16,8 @@ import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.ReadableMap import com.facebook.react.bridge.WritableMap +import com.facebook.react.bridge.queue.MessageQueueThread +import com.facebook.react.bridge.queue.ReactQueueConfiguration import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.modules.core.ReactChoreographer import com.facebook.react.uimanager.DisplayMetricsHolder @@ -36,6 +38,7 @@ import org.mockito.ArgumentMatchers.* import org.mockito.kotlin.mock import org.mockito.kotlin.times import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @@ -516,7 +519,14 @@ class TouchEventDispatchTest { metrics.density = 1f DisplayMetricsHolder.setScreenDisplayMetrics(metrics) - val reactContext = ReactTestHelper.createCatalystContextForTest() + val reactContext = ReactTestHelper.createTestReactApplicationContext() + val uiQueueThread: MessageQueueThread = mock() + whenever(uiQueueThread.isOnThread()).thenReturn(true) + val queueConfig: ReactQueueConfiguration = mock() + whenever(queueConfig.getUIQueueThread()).thenReturn(uiQueueThread) + whenever(queueConfig.getNativeModulesQueueThread()).thenReturn(uiQueueThread) + whenever(queueConfig.getJSQueueThread()).thenReturn(uiQueueThread) + reactContext.initializeMessageQueueThreads(queueConfig) eventEmitter = mock() eventDispatcher = FabricEventDispatcher(reactContext, eventEmitter) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt index fe8a98c955a4..2f7702f4cce7 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/interfaces/ExtraWindowEventListenerTest.kt @@ -20,7 +20,6 @@ import org.mockito.kotlin.never import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -32,8 +31,7 @@ class ExtraWindowEventListenerTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = - ReactTestHelper.createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = ReactTestHelper.createTestReactApplicationContext() window = mock() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt index b64f1595c5be..2e19c4e86ae7 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.kt @@ -12,8 +12,10 @@ import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.soloader.SoLoader import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import java.io.ByteArrayInputStream import java.nio.ByteBuffer import java.util.UUID @@ -30,7 +32,7 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) -@Config(manifest = Config.NONE, shadows = [ShadowArguments::class]) +@Config(manifest = Config.NONE, shadows = [ShadowArguments::class, ShadowSoLoader::class]) class BlobModuleTest { private lateinit var bytes: ByteArray private lateinit var blobId: String @@ -40,6 +42,7 @@ class BlobModuleTest { @Before fun prepareModules() { + ReactNativeFeatureFlagsForTests.setUp() mockedStaticSoLoader = mockStatic(SoLoader::class.java) mockedStaticSoLoader .`when` { SoLoader.loadLibrary("reactnativeblob") } @@ -48,7 +51,7 @@ class BlobModuleTest { bytes = ByteArray(120) Random.Default.nextBytes(bytes) - context = ReactTestHelper.createCatalystContextForTest() + context = ReactTestHelper.createTestReactApplicationContext() blobModule = BlobModule(context) blobId = blobModule.store(bytes) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt index 360c0c406dc0..f180026f4a23 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt @@ -31,8 +31,7 @@ class ClipboardModuleTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - clipboardModule = - ClipboardModule(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + clipboardModule = ClipboardModule(createTestReactApplicationContext()) clipboardManager = RuntimeEnvironment.getApplication().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt index 2341e17b738f..f4fecc7ad8a7 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -@file:Suppress("DEPRECATION") - package com.facebook.react.modules.deviceinfo import android.app.Activity @@ -20,10 +18,10 @@ import androidx.core.view.WindowInsetsCompat import androidx.window.layout.WindowMetrics import androidx.window.layout.WindowMetricsCalculator import androidx.window.layout.WindowMetricsCalculatorDecorator -import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyMap +import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactContext -import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.bridge.WritableMap import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.DisplayMetricsHolder @@ -42,6 +40,7 @@ import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers import org.mockito.MockedStatic import org.mockito.Mockito.mockStatic +import org.mockito.kotlin.doNothing import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock import org.mockito.kotlin.spy @@ -49,7 +48,6 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -68,7 +66,7 @@ class DeviceInfoModuleTest { private lateinit var deviceInfoModule: DeviceInfoModule private lateinit var fakePortraitDisplayMetrics: WritableMap private lateinit var fakeLandscapeDisplayMetrics: WritableMap - private lateinit var reactContext: BridgeReactContext + private lateinit var reactContext: ReactApplicationContext private lateinit var displayMetricsHolder: MockedStatic @Before @@ -82,9 +80,11 @@ class DeviceInfoModuleTest { fakeLandscapeDisplayMetrics.putInt("height", 100) displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java) - reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) - val catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() - reactContext.initializeWithInstance(catalystInstanceMock) + reactContext = spy(createTestReactApplicationContext()) + doReturn(true).whenever(reactContext).hasActiveReactInstance() + doNothing() + .whenever(reactContext) + .emitDeviceEvent(ArgumentMatchers.anyString(), ArgumentMatchers.any()) deviceInfoModule = spy(DeviceInfoModule(reactContext)) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt index 45f1f7f59b69..783febaf8d3c 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/image/ImageLoaderModuleTest.kt @@ -25,6 +25,7 @@ import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.ReadableMap import com.facebook.react.bridge.WritableMap +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.views.image.ReactCallerContextFactory import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper import com.facebook.testutils.shadows.ShadowArguments @@ -60,7 +61,8 @@ class ImageLoaderModuleTest { @Before fun setUp() { - reactContext = ReactTestHelper.createCatalystContextForTest() + ReactNativeFeatureFlagsForTests.setUp() + reactContext = ReactTestHelper.createTestReactApplicationContext() imageLoaderModule = ImageLoaderModule(reactContext) mockedHelper = mockStatic(ResourceDrawableIdHelper::class.java) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt index 95db0bd69577..9a0b385b58d3 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt @@ -13,7 +13,9 @@ import com.facebook.react.bridge.JavaOnlyMap import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.bridge.WritableMap +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.testutils.shadows.ShadowArguments +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test @@ -25,7 +27,7 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.android.controller.ActivityController import org.robolectric.annotation.Config -@Config(shadows = [ShadowArguments::class]) +@Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @RunWith(RobolectricTestRunner::class) class ShareModuleTest { @@ -34,9 +36,10 @@ class ShareModuleTest { @Before fun prepareModules() { + ReactNativeFeatureFlagsForTests.setUp() activityController = Robolectric.buildActivity(FragmentActivity::class.java) val activity = activityController.create().start().resume().get() - val applicationContext = ReactTestHelper.createCatalystContextForTest() + val applicationContext = ReactTestHelper.createTestReactApplicationContext() applicationContext.onNewIntent(activity, Intent()) shareModule = ShareModule(applicationContext) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java index 13ad5c6a95c3..baa5e5883ed5 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java @@ -16,13 +16,16 @@ import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests; import com.facebook.react.views.view.ReactViewGroup; import com.facebook.react.views.view.ReactViewManager; +import com.facebook.testutils.shadows.ShadowSoLoader; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowSoLoader.class) public class BaseViewManagerDelegateTest { private ReactViewManager viewManager; private ReactViewGroup view; @@ -34,7 +37,7 @@ public void setUp() { // (non-JNI) accessor so Robolectric doesn't try to load react_featureflagsjni. ReactNativeFeatureFlagsForTests.INSTANCE.setUp(); viewManager = mock(ReactViewManager.class); - ReactApplicationContext context = ReactTestHelper.createCatalystContextForTest(); + ReactApplicationContext context = ReactTestHelper.createTestReactApplicationContext(); ThemedReactContext themedReactContext = new ThemedReactContext(context, context, null, -1); view = new ReactViewGroup(themedReactContext); delegate = new BaseViewManagerDelegate<>(viewManager) {}; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt index 63680191f85b..44eb6784c2f9 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt @@ -40,7 +40,6 @@ import org.mockito.kotlin.spy import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @Config(shadows = [ShadowArguments::class, ShadowSoLoader::class]) @@ -54,7 +53,7 @@ class ReactAccessibilityDelegateTest { @Before fun setUp() { ReactNativeFeatureFlagsForTests.setUp() - reactContext = spy(createTestReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(createTestReactApplicationContext()) themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1) view = ReactViewGroup(themedReactContext).apply { id = 100 } accessibilityDelegate = ReactAccessibilityDelegate(view, false, 0) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt index 4422391d00cf..2741eed2a051 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt @@ -21,7 +21,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verify [View] view property being applied properly by [SimpleViewManager] */ @@ -54,7 +53,7 @@ class SimpleViewPropertyTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, surfaceId) manager = ConcreteViewManager() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt index b0e05900d1ba..7e58276ce6fb 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ThemedReactContextTest.kt @@ -11,6 +11,7 @@ import android.view.Window import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper import com.facebook.react.interfaces.ExtraWindowEventListener +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.testutils.shadows.ShadowSoLoader import org.junit.Before import org.junit.Test @@ -31,7 +32,8 @@ class ThemedReactContextTest { @Before fun setUp() { - reactApplicationContext = ReactTestHelper.createCatalystContextForTest() + ReactNativeFeatureFlagsForTests.setUp() + reactApplicationContext = ReactTestHelper.createTestReactApplicationContext() themedReactContext = ThemedReactContext(reactApplicationContext, RuntimeEnvironment.getApplication(), null, -1) window = mock() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt index 15913bccfb43..920973e13c04 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt @@ -50,7 +50,6 @@ import org.mockito.kotlin.reset import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** @@ -76,7 +75,7 @@ class ReactImagePropertyTest { flogMock = mockStatic(FLog::class.java) SoLoader.setInTestMode() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themeContext = ThemedReactContext(context, context, null, -1) Fresco.initialize(context) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt index f8fe3b37b616..677d4d09cc18 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewHelperFlingAnimatorTest.kt @@ -13,6 +13,7 @@ import android.view.View import android.view.ViewGroup import com.facebook.react.bridge.ReactContext import com.facebook.react.bridge.ReactTestHelper +import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.StateWrapper import com.facebook.react.uimanager.UIManagerHelper import com.facebook.react.uimanager.events.Event @@ -63,10 +64,11 @@ class ReactScrollViewHelperFlingAnimatorTest { @Before @Suppress("UNCHECKED_CAST") fun setUp() { + ReactNativeFeatureFlagsForTests.setUp() mockChild = mock() mockAnimator = ValueAnimator() mockEventDispatcher = mock() - mockContext = ReactTestHelper.createCatalystContextForTest() + mockContext = ReactTestHelper.createTestReactApplicationContext() mockScrollView = mock() 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..2ebd4831d38d 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 @@ -37,11 +37,12 @@ import org.mockito.Mockito.mockStatic 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 +52,7 @@ class ReactScrollViewInvertedScrollTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() SoLoader.setInTestMode() - val context = BridgeReactContext(RuntimeEnvironment.getApplication()) - context.initializeWithInstance(createMockCatalystInstance()) + val context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) uiManagerHelperMock = mockStatic(UIManagerHelper::class.java) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt index 4f9c3454bfae..c89635e67aae 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewPropertyTest.kt @@ -31,7 +31,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verifies border radius properties applied by the vertical and horizontal ScrollView managers. */ @@ -46,7 +45,7 @@ class ReactScrollViewPropertyTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt index 82965533b0b4..6c09b93be47e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/scroll/ReactScrollViewTouchCancelTest.kt @@ -17,8 +17,8 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.widget.FrameLayout -import com.facebook.react.bridge.BridgeReactContext -import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactTestHelper.createTestReactApplicationContext import com.facebook.react.bridge.ScrollEndedListener import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests import com.facebook.react.uimanager.DisplayMetricsHolder @@ -27,6 +27,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 java.time.Duration import org.assertj.core.api.Assertions.assertThat import org.junit.After @@ -40,17 +41,18 @@ import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.robolectric.ParameterizedRobolectricTestRunner import org.robolectric.Robolectric -import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.android.controller.ActivityController +import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode /** Cancelled drags must emit END_DRAG once and complete native scrolling cleanup. */ @SuppressLint("DeprecatedClass", "DeprecatedMethod") +@Config(shadows = [ShadowSoLoader::class]) @RunWith(ParameterizedRobolectricTestRunner::class) @LooperMode(LooperMode.Mode.PAUSED) class ReactScrollViewTouchCancelTest(private val kind: String) { - private lateinit var context: BridgeReactContext + private lateinit var context: ReactApplicationContext private lateinit var themedContext: ThemedReactContext private lateinit var uiManagerHelperMock: MockedStatic private lateinit var root: TestRoot @@ -78,8 +80,7 @@ class ReactScrollViewTouchCancelTest(private val kind: String) { fun setup() { ReactNativeFeatureFlagsForTests.setUp() SoLoader.setInTestMode() - context = BridgeReactContext(RuntimeEnvironment.getApplication()) - context.initializeWithInstance(createMockCatalystInstance()) + context = createTestReactApplicationContext() context.scrollEndedListeners.addListener(scrollEndedListener) themedContext = ThemedReactContext(context, context, null, -1) DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt index 9dd0111b5498..68907f1dc500 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewPropertyTest.kt @@ -29,7 +29,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config /** Verify view properties are being applied correctly by [ReactTextViewManager] */ @@ -49,7 +48,7 @@ class ReactTextViewPropertyTest { override fun enableViewRecycling(): Boolean = true }, ) - context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, context, null, -1) manager = ReactTextViewManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt index 5f7458d1f73a..42ae5e3f5f8a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextKeyEventTest.kt @@ -26,7 +26,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -39,7 +38,7 @@ class ReactEditTextKeyEventTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - val context = createTestReactApplicationContext(RuntimeEnvironment.getApplication()) + val context = createTestReactApplicationContext() val themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL) manager = ReactTextInputManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt index fceb7ddfc492..4309930e2b82 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactEditTextOutlineTest.kt @@ -25,10 +25,11 @@ import android.view.ViewGroup import android.view.ViewOutlineProvider import androidx.annotation.RequiresApi import androidx.core.graphics.drawable.toDrawable -import com.facebook.react.bridge.ReactTestHelper.createCatalystContextForTest +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.ThemedReactContext +import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test @@ -37,8 +38,10 @@ import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) +@Config(shadows = [ShadowSoLoader::class]) @RequiresApi(Build.VERSION_CODES.N) class ReactEditTextOutlineTest { @@ -47,7 +50,7 @@ class ReactEditTextOutlineTest { @Before fun setup() { ReactNativeFeatureFlagsForTests.setUp() - val context = createCatalystContextForTest() + val context = createTestReactApplicationContext() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics()) view = ReactTextInputManager().createViewInstance(ThemedReactContext(context, context, null, -1)) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt index 078e16f5bb57..dac9993d5ecc 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt @@ -70,7 +70,7 @@ class ReactTextInputPropertyTest { fun setup() { ReactNativeFeatureFlagsForTests.setUp() val application = RuntimeEnvironment.getApplication() - context = createTestReactApplicationContext(application) + context = createTestReactApplicationContext() themedContext = ThemedReactContext(context, application, null, ID_NULL) manager = ReactTextInputManager() DisplayMetricsHolder.setScreenDisplayMetrics(DisplayMetrics())