Skip to content

Commit d7d1f9c

Browse files
Delete legacy catalyst test helpers (#59283)
Summary: Delete the deprecated `createCatalystContextForTest` and `createMockCatalystInstance` helpers from `ReactTestHelper`, now that every caller has migrated to `createTestReactApplicationContext`. Drop the file-level deprecation suppression and its TODO, which only existed for the removed helpers. Changelog: [Internal] Reviewed By: javache Differential Revision: D126576088
1 parent e25385a commit d7d1f9c

1 file changed

Lines changed: 4 additions & 38 deletions

File tree

  • packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt‎

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,25 @@
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.bridge
139

1410
import android.app.Application
15-
import com.facebook.react.bridge.queue.MessageQueueThreadSpec
16-
import com.facebook.react.bridge.queue.ReactQueueConfiguration
17-
import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl
18-
import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec
1911
import com.facebook.react.common.annotations.UnstableReactNativeAPI
2012
import com.facebook.react.runtime.BridgelessReactContext
2113
import com.facebook.react.runtime.ReactHostImpl
2214
import com.facebook.react.runtime.internal.bolts.Task
23-
import com.facebook.react.uimanager.UIManagerModule
2415
import org.mockito.kotlin.mock
2516
import org.mockito.kotlin.spy
26-
import org.mockito.kotlin.whenever
2717
import org.robolectric.RuntimeEnvironment
2818

2919
/** Utility for creating pre-configured instances of core react components for tests. */
3020
object ReactTestHelper {
31-
/**
32-
* @return a ReactApplicationContext that has a CatalystInstance mock returned by
33-
* [createMockCatalystInstance]
34-
*/
35-
@JvmStatic
36-
fun createCatalystContextForTest(): ReactApplicationContext =
37-
BridgeReactContext(RuntimeEnvironment.getApplication()).apply {
38-
initializeWithInstance(createMockCatalystInstance())
39-
}
40-
41-
/** @return a CatalystInstance mock that has a default working ReactQueueConfiguration. */
42-
@JvmStatic
43-
fun createMockCatalystInstance(): CatalystInstance {
44-
val spec: ReactQueueConfigurationSpec =
45-
ReactQueueConfigurationSpec.builder()
46-
.setJSQueueThreadSpec(MessageQueueThreadSpec.mainThreadSpec())
47-
.setNativeModulesQueueThreadSpec(MessageQueueThreadSpec.mainThreadSpec())
48-
.build()
49-
val reactQueueConfiguration: ReactQueueConfiguration =
50-
ReactQueueConfigurationImpl.create(spec) { e -> throw RuntimeException(e) }
51-
val reactInstance: CatalystInstance = mock<CatalystInstance>()
52-
whenever(reactInstance.reactQueueConfiguration).thenReturn(reactQueueConfiguration)
53-
whenever(reactInstance.getNativeModule(UIManagerModule::class.java))
54-
.thenReturn(mock<UIManagerModule>())
55-
whenever(reactInstance.isDestroyed).thenReturn(false)
56-
return reactInstance
57-
}
5821

5922
@OptIn(UnstableReactNativeAPI::class)
60-
fun createTestReactApplicationContext(application: Application): ReactApplicationContext {
23+
@JvmOverloads
24+
fun createTestReactApplicationContext(
25+
application: Application = RuntimeEnvironment.getApplication()
26+
): ReactApplicationContext {
6127
val reactHost =
6228
spy(
6329
ReactHostImpl(

0 commit comments

Comments
 (0)