From 8eb1bd11708978e8e8a3e83f69a4af47575f02dc Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 26 Mar 2024 07:15:29 -0700 Subject: [PATCH] Scripted: Codemod ReactApplicationContext creators to BridgeReactContext (#43626) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43626 The things that create ReactApplicationContext should instead create BridgeReactContext. Long-term, ReactApplicationContext will be abstract. This diff pulls noise out from that eventual diff. Changelog: [Internal] Reviewed By: arushikesarwani94 Differential Revision: D55218591 fbshipit-source-id: d359c794f3da4a1ecb2fa8edbed5eeeb620b137b --- .../test/java/com/facebook/react/CompositeReactPackageTest.kt | 3 ++- .../test/java/com/facebook/react/bridge/ReactTestHelper.kt | 2 +- .../java/com/facebook/react/fabric/FabricUIManagerTest.kt | 3 ++- .../react/internal/interop/InteropEventEmitterTest.kt | 4 ++-- .../facebook/react/modules/clipboard/ClipboardModuleTest.kt | 4 ++-- .../com/facebook/react/uimanager/ReactPropConstantsTest.kt | 4 ++-- .../react/uimanager/ReactPropForShadowNodeSetterTest.kt | 4 ++-- .../facebook/react/uimanager/UIManagerModuleConstantsTest.kt | 3 ++- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt index c20a7c4d5ac..7305f808f40 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.kt @@ -7,6 +7,7 @@ package com.facebook.react +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.NativeModule import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManager @@ -33,7 +34,7 @@ class CompositeReactPackageTest { packageNo1 = mock(ReactPackage::class.java) packageNo2 = mock(ReactPackage::class.java) packageNo3 = mock(ReactPackage::class.java) - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) } @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 ac4353df2c4..69d96486b6d 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 @@ -24,7 +24,7 @@ object ReactTestHelper { */ @JvmStatic fun createCatalystContextForTest(): ReactApplicationContext = - ReactApplicationContext(RuntimeEnvironment.getApplication()).apply { + BridgeReactContext(RuntimeEnvironment.getApplication()).apply { initializeWithInstance(createMockCatalystInstance()) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt index f8827eb7225..c80567f4de4 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt @@ -7,6 +7,7 @@ package com.facebook.react.fabric +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManagerRegistry import com.facebook.react.uimanager.events.BatchEventDispatchedListener @@ -31,7 +32,7 @@ class FabricUIManagerTest { @Before fun setup() { - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) viewManagerRegistry = ViewManagerRegistry(emptyList()) batchEventDispatchedListener = FakeBatchEventDispatchedListener() underTest = FabricUIManager(reactContext, viewManagerRegistry, batchEventDispatchedListener) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt index 10a71829e6f..265cb3031b1 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/internal/interop/InteropEventEmitterTest.kt @@ -9,9 +9,9 @@ package com.facebook.react.internal.interop +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactContext import com.facebook.testutils.fakes.FakeEventDispatcher import org.junit.Assert.assertEquals @@ -29,7 +29,7 @@ class InteropEventEmitterTest { @Before fun setup() { - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) eventDispatcher = FakeEventDispatcher() } 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 3f58b66aff0..95fa44245e5 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 @@ -10,7 +10,7 @@ package com.facebook.react.modules.clipboard import android.annotation.SuppressLint import android.content.ClipboardManager import android.content.Context -import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.BridgeReactContext import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before @@ -28,7 +28,7 @@ class ClipboardModuleTest { @Before fun setUp() { - clipboardModule = ClipboardModule(ReactApplicationContext(RuntimeEnvironment.getApplication())) + clipboardModule = ClipboardModule(BridgeReactContext(RuntimeEnvironment.getApplication())) clipboardManager = RuntimeEnvironment.getApplication().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt index 61bf145ca5c..37a700aa3bb 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt @@ -8,7 +8,7 @@ package com.facebook.react.uimanager import android.view.View -import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap import com.facebook.react.common.MapBuilder @@ -84,7 +84,7 @@ class ReactPropConstantsTest { @Test fun testNativePropsIncludeCorrectTypes() { val viewManagers = listOf>(ViewManagerUnderTest()) - val reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + val reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) val uiManagerModule = UIManagerModule(reactContext, viewManagers, 0) val constants: Map<*, *> = valueAtPath(uiManagerModule.constants as Map<*, *>, "SomeView", "NativeProps") diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt index 4e53fd209ff..d54462018ff 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt @@ -7,8 +7,8 @@ package com.facebook.react.uimanager +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap import com.facebook.react.uimanager.annotations.ReactProp @@ -65,7 +65,7 @@ class ReactPropForShadowNodeSetterTest { init { setViewClassName("ShadowViewUnderTest") - val context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + val context = BridgeReactContext(RuntimeEnvironment.getApplication()) setThemedContext(ThemedReactContext(context, context, null, -1)) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt index 5ae599e77b7..8405ca12ea0 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt @@ -8,6 +8,7 @@ package com.facebook.react.uimanager import android.view.View +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.common.MapBuilder import org.assertj.core.api.Assertions @@ -49,7 +50,7 @@ class UIManagerModuleConstantsTest { @Before fun setUp() { - reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication()) + reactContext = BridgeReactContext(RuntimeEnvironment.getApplication()) } @Suppress("UNCHECKED_CAST")