Simplify createTestReactApplicationContext calls

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt

@@ -17,46 +17,47 @@ 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
 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

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<CatalystInstance>()
-    whenever(reactInstance.reactQueueConfiguration).thenReturn(reactQueueConfiguration)
-    whenever(reactInstance.getNativeModule(UIManagerModule::class.java))
-        .thenReturn(mock<UIManagerModule>())
-    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(

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,

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<ViewManager<*, *>>(ReactViewManager())), {})

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/MountingManagerTest.kt

@@ -5,29 +5,28 @@
  * 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
 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<ViewManager<*, *>>(ReactViewManager())
     mountItemExecutor = MountItemExecutor {

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(

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(

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(

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)

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()
   }
 

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`<Boolean> { 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)
   }

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

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,14 +40,14 @@ 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
 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<DisplayMetricsHolder>
 
   @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))
   }