From a984169c7d85a9aa7ada3d149c1a708d0d68f75e Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 26 Mar 2024 07:15:29 -0700 Subject: [PATCH] Manual: Codemod initializeWithInstance() callers to BridgeReactContext (#43627) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43627 Eventaully, ReactApplicationContext.initailizeWithInstance() will be moved to BridgeReactContext. Doing the migration up-front to remove noise from the eventual diff. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D55218593 fbshipit-source-id: c542c44cf8b36b9dc2a01db2bf6173639fb8698a --- .../main/java/com/facebook/react/ReactInstanceManager.java | 3 ++- .../src/test/java/com/facebook/react/RootViewTest.kt | 7 +++---- .../react/modules/deviceinfo/DeviceInfoModuleTest.kt | 6 +++--- .../com/facebook/react/modules/timing/TimingModuleTest.kt | 6 +++--- .../com/facebook/react/uimanager/SimpleViewPropertyTest.kt | 6 +++--- .../facebook/react/views/image/ReactImagePropertyTest.kt | 6 +++--- .../react/views/textinput/ReactTextInputPropertyTest.kt | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 09814872fbc..a1b218dda4d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -51,6 +51,7 @@ import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.ThreadConfined; import com.facebook.infer.annotation.ThreadSafe; import com.facebook.react.bridge.Arguments; +import com.facebook.react.bridge.BridgeReactContext; import com.facebook.react.bridge.CatalystInstance; import com.facebook.react.bridge.CatalystInstanceImpl; import com.facebook.react.bridge.JSBundleLoader; @@ -1351,7 +1352,7 @@ public class ReactInstanceManager { JavaScriptExecutor jsExecutor, JSBundleLoader jsBundleLoader) { FLog.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()"); ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName()); - final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext); + final BridgeReactContext reactContext = new BridgeReactContext(mApplicationContext); JSExceptionHandler exceptionHandler = mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager; 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 9085150a201..31855f2dba8 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 @@ -16,11 +16,10 @@ import android.view.MotionEvent 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.JavaOnlyArray 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.WritableArray import com.facebook.react.bridge.WritableMap @@ -49,7 +48,7 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class RootViewTest { - private lateinit var reactContext: ReactContext + private lateinit var reactContext: BridgeReactContext private lateinit var catalystInstanceMock: CatalystInstance private lateinit var arguments: MockedStatic @@ -66,7 +65,7 @@ class RootViewTest { systemClock.`when` { SystemClock.uptimeMillis() }.thenReturn(ts) catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() - reactContext = spy(ReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) reactContext.initializeWithInstance(catalystInstanceMock) DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext) 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 2c0bcb288ef..dafaf8b1761 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 @@ -7,8 +7,8 @@ package com.facebook.react.modules.deviceinfo +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.WritableMap @@ -32,7 +32,7 @@ class DeviceInfoModuleTest : TestCase() { private lateinit var deviceInfoModule: DeviceInfoModule private lateinit var fakePortraitDisplayMetrics: WritableMap private lateinit var fakeLandscapeDisplayMetrics: WritableMap - private lateinit var reactContext: ReactApplicationContext + private lateinit var reactContext: BridgeReactContext private lateinit var displayMetricsHolder: MockedStatic @Before @@ -45,7 +45,7 @@ class DeviceInfoModuleTest : TestCase() { fakeLandscapeDisplayMetrics.putInt("height", 100) displayMetricsHolder = mockStatic(DisplayMetricsHolder::class.java) - reactContext = spy(ReactApplicationContext(RuntimeEnvironment.getApplication())) + reactContext = spy(BridgeReactContext(RuntimeEnvironment.getApplication())) val catalystInstanceMock = ReactTestHelper.createMockCatalystInstance() reactContext.initializeWithInstance(catalystInstanceMock) deviceInfoModule = DeviceInfoModule(reactContext) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt index 10cf42fde9b..96437acf867 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt @@ -11,10 +11,10 @@ import android.content.Context import android.os.Looper import android.view.Choreographer.FrameCallback import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.WritableArray import com.facebook.react.common.SystemClock import com.facebook.react.devsupport.interfaces.DevSupportManager @@ -53,7 +53,7 @@ class TimingModuleTest { const val FRAME_TIME_NS = 17 * 1000 * 1000 } - private lateinit var reactContext: ReactApplicationContext + private lateinit var reactContext: BridgeReactContext private lateinit var headlessContext: HeadlessJsTaskContext private lateinit var timingModule: TimingModule private lateinit var reactChoreographerMock: ReactChoreographer @@ -94,7 +94,7 @@ class TimingModuleTest { .thenAnswer { reactChoreographerMock } val reactInstance = mock(CatalystInstance::class.java) - reactContext = spy(ReactApplicationContext(mock(Context::class.java))) + reactContext = spy(BridgeReactContext(mock(Context::class.java))) doReturn(reactInstance).`when`(reactContext).catalystInstance doReturn(true).`when`(reactContext).hasActiveReactInstance() 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 24557e0cd20..1c1e4025119 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 @@ -9,9 +9,9 @@ package com.facebook.react.uimanager import android.graphics.drawable.ColorDrawable import android.view.View +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance import com.facebook.react.bridge.ReadableMap import com.facebook.react.touch.JSResponderHandler @@ -45,14 +45,14 @@ class SimpleViewPropertyTest { } } - private lateinit var context: ReactApplicationContext + private lateinit var context: BridgeReactContext private lateinit var catalystInstanceMock: CatalystInstance private lateinit var themedContext: ThemedReactContext private lateinit var manager: ConcreteViewManager @Before fun setup() { - context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + context = BridgeReactContext(RuntimeEnvironment.getApplication()) catalystInstanceMock = createMockCatalystInstance() context.initializeWithInstance(catalystInstanceMock) themedContext = ThemedReactContext(context, context, null, surfaceId) 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 889e38adb26..b6bfc31b8f2 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 @@ -12,10 +12,10 @@ import android.util.DisplayMetrics import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.drawable.ScalingUtils import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyArray import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance import com.facebook.react.bridge.WritableArray import com.facebook.react.bridge.WritableMap @@ -41,7 +41,7 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class ReactImagePropertyTest { - private var context: ReactApplicationContext? = null + private var context: BridgeReactContext? = null private var catalystInstanceMock: CatalystInstance? = null private var themeContext: ThemedReactContext? = null private lateinit var arguments: MockedStatic @@ -57,7 +57,7 @@ class ReactImagePropertyTest { rnLog.`when` { RNLog.w(any(), anyString()) }.thenAnswer {} SoLoader.setInTestMode() - context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + context = BridgeReactContext(RuntimeEnvironment.getApplication()) catalystInstanceMock = createMockCatalystInstance() context!!.initializeWithInstance(catalystInstanceMock) themeContext = 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 50074941bc6..109bcd6d91f 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 @@ -17,9 +17,9 @@ import android.util.DisplayMetrics import android.view.Gravity import android.view.inputmethod.EditorInfo import androidx.core.content.res.ResourcesCompat.ID_NULL +import com.facebook.react.bridge.BridgeReactContext import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaOnlyMap -import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance import com.facebook.react.uimanager.DisplayMetricsHolder import com.facebook.react.uimanager.ReactStylesDiffMap @@ -36,7 +36,7 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class ReactTextInputPropertyTest { - private lateinit var context: ReactApplicationContext + private lateinit var context: BridgeReactContext private lateinit var catalystInstanceMock: CatalystInstance private lateinit var themedContext: ThemedReactContext private lateinit var manager: ReactTextInputManager @@ -54,7 +54,7 @@ class ReactTextInputPropertyTest { @Before fun setup() { - context = ReactApplicationContext(RuntimeEnvironment.getApplication()) + context = BridgeReactContext(RuntimeEnvironment.getApplication()) catalystInstanceMock = createMockCatalystInstance() context.initializeWithInstance(catalystInstanceMock) themedContext = ThemedReactContext(context, context.baseContext, null, ID_NULL)