Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not directly access RuntimeEnvironment.application in tests (#38159)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/38159

Accessing `RuntimeEnvironment.application` is deprecated and we should instead use `RuntimeEnvironment.getApplication()`

Changelog:
[Internal] [Changed] - Do not directly access RuntimeEnvironment.application in tests

Reviewed By: rshest

Differential Revision: D47186902

fbshipit-source-id: dc28930570e2991da0ad91311f0402fd73af8214
This commit is contained in:
Nicola Corti
2023-07-04 03:19:43 -07:00
committed by Facebook GitHub Bot
parent ebc1fe6d53
commit f92ed27fa4
15 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt
+1 -1
View File
@@ -64,7 +64,7 @@ class RootViewTest {
whenever(SystemClock.uptimeMillis()).thenAnswer { ts }
catalystInstanceMock = ReactTestHelper.createMockCatalystInstance()
reactContext = spy(ReactApplicationContext(RuntimeEnvironment.application))
reactContext = spy(ReactApplicationContext(RuntimeEnvironment.getApplication()))
reactContext.initializeWithInstance(catalystInstanceMock)
DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext)
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt
+1 -1
View File
@@ -24,7 +24,7 @@ object ReactTestHelper {
*/
@JvmStatic
fun createCatalystContextForTest(): ReactApplicationContext =
ReactApplicationContext(RuntimeEnvironment.application).apply {
ReactApplicationContext(RuntimeEnvironment.getApplication()).apply {
initializeWithInstance(createMockCatalystInstance())
}
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/interop/InteropEventEmitterTest.kt
+1 -1
View File
@@ -25,7 +25,7 @@ class InteropEventEmitterTest {
@Before
fun setup() {
reactContext = ReactApplicationContext(RuntimeEnvironment.application)
reactContext = ReactApplicationContext(RuntimeEnvironment.getApplication())
eventDispatcher = FakeEventDispatcher()
}
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.kt
+2 -2
View File
@@ -28,9 +28,9 @@ class ClipboardModuleTest {
@Before
fun setUp() {
clipboardModule = ClipboardModule(ReactApplicationContext(RuntimeEnvironment.application))
clipboardModule = ClipboardModule(ReactApplicationContext(RuntimeEnvironment.getApplication()))
clipboardManager =
RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE)
RuntimeEnvironment.getApplication().getSystemService(Context.CLIPBOARD_SERVICE)
as ClipboardManager
}
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class DeviceInfoModuleTest : TestCase() {
public override fun setUp() {
initTestData()
PowerMockito.mockStatic(DisplayMetricsHolder::class.java)
reactContext = spy(ReactApplicationContext(RuntimeEnvironment.application))
reactContext = spy(ReactApplicationContext(RuntimeEnvironment.getApplication()))
val catalystInstanceMock = ReactTestHelper.createMockCatalystInstance()
reactContext.initializeWithInstance(catalystInstanceMock)
deviceInfoModule = DeviceInfoModule(reactContext)
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt
+1 -1
View File
@@ -55,7 +55,7 @@ class ShareModuleTest {
shareModule.share(content, dialogTitle, promise)
val chooserIntent = shadowOf(RuntimeEnvironment.application).nextStartedActivity
val chooserIntent = shadowOf(RuntimeEnvironment.getApplication()).nextStartedActivity
assertNotNull("Dialog was not displayed", chooserIntent)
assertEquals(Intent.ACTION_CHOOSER, chooserIntent.action)
assertEquals(dialogTitle, chooserIntent.extras?.getString(Intent.EXTRA_TITLE))
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class BaseViewManagerTest {
@Before
public void setUp() {
mViewManager = new ReactViewManager();
mView = new ReactViewGroup(RuntimeEnvironment.application);
mView = new ReactViewGroup(RuntimeEnvironment.getApplication());
PowerMockito.mockStatic(Arguments.class);
PowerMockito.when(Arguments.createMap())
.thenAnswer(
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class ReactPropConstantsTest {
public void testNativePropsIncludeCorrectTypes() {
List<ViewManager> viewManagers = Arrays.<ViewManager>asList(new ViewManagerUnderTest());
ReactApplicationContext reactContext =
new ReactApplicationContext(RuntimeEnvironment.application);
new ReactApplicationContext(RuntimeEnvironment.getApplication());
UIManagerModule uiManagerModule = new UIManagerModule(reactContext, viewManagers, 0);
Map<String, String> constants =
(Map) valueAtPath(uiManagerModule.getConstants(), "SomeView", "NativeProps");
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class SimpleViewPropertyTest {
@Before
public void setup() {
mContext = new ReactApplicationContext(RuntimeEnvironment.application);
mContext = new ReactApplicationContext(RuntimeEnvironment.getApplication());
mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
mContext.initializeWithInstance(mCatalystInstanceMock);
mThemedContext = new ThemedReactContext(mContext, mContext);
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class UIManagerModuleConstantsTest {
@Before
public void setUp() {
mReactContext = new ReactApplicationContext(RuntimeEnvironment.application);
mReactContext = new ReactApplicationContext(RuntimeEnvironment.getApplication());
}
@Test
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
+4 -4
View File
@@ -100,7 +100,7 @@ public class UIManagerModuleTest {
any(ChoreographerCompat.FrameCallback.class));
mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
mReactContext = new ReactApplicationContext(RuntimeEnvironment.application);
mReactContext = new ReactApplicationContext(RuntimeEnvironment.getApplication());
mReactContext.initializeWithInstance(mCatalystInstanceMock);
UIManagerModule uiManagerModuleMock = mock(UIManagerModule.class);
@@ -145,7 +145,7 @@ public class UIManagerModuleTest {
UIManagerModule uiManager = getUIManagerModule();
ReactRootView rootView =
new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
new ReactRootView(RuntimeEnvironment.getApplication().getApplicationContext());
int rootTag = uiManager.addRootView(rootView);
int viewTag = rootTag + 1;
int subViewTag = viewTag + 1;
@@ -491,7 +491,7 @@ public class UIManagerModuleTest {
public void testRemoveSubviewsFromContainerWithID() {
UIManagerModule uiManager = getUIManagerModule();
ReactRootView rootView =
new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
new ReactRootView(RuntimeEnvironment.getApplication().getApplicationContext());
int rootTag = uiManager.addRootView(rootView);
final int containerTag = rootTag + 1;
@@ -541,7 +541,7 @@ public class UIManagerModuleTest {
*/
private ViewGroup createSimpleTextHierarchy(UIManagerModule uiManager, String text) {
ReactRootView rootView =
new ReactRootView(RuntimeEnvironment.application.getApplicationContext());
new ReactRootView(RuntimeEnvironment.getApplication().getApplicationContext());
int rootTag = uiManager.addRootView(rootView);
int textTag = rootTag + 1;
int rawTextTag = textTag + 1;
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class ReactImagePropertyTest {
RNLog.w(null, "");
SoLoader.setInTestMode();
mContext = new ReactApplicationContext(RuntimeEnvironment.application);
mContext = new ReactApplicationContext(RuntimeEnvironment.getApplication());
mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
mContext.initializeWithInstance(mCatalystInstanceMock);
mThemeContext = new ThemedReactContext(mContext, mContext);
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
+1 -1
View File
@@ -476,7 +476,7 @@ public class ReactTextTest {
private ReactRootView createText(
UIManagerModule uiManager, JavaOnlyMap textProps, JavaOnlyMap rawTextProps) {
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application);
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.getApplication());
int rootTag = uiManager.addRootView(rootView);
int textTag = rootTag + 1;
int rawTextTag = textTag + 1;
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ReactTextInputPropertyTest {
@Before
public void setup() {
mContext = new ReactApplicationContext(RuntimeEnvironment.application);
mContext = new ReactApplicationContext(RuntimeEnvironment.getApplication());
mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
mContext.initializeWithInstance(mCatalystInstanceMock);
mThemedContext = new ThemedReactContext(mContext, mContext);
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
+2 -2
View File
@@ -87,7 +87,7 @@ public class TextInputTest {
public void testPropsApplied() {
UIManagerModule uiManager = getUIManagerModule();
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application);
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.getApplication());
rootView.setLayoutParams(new ReactRootView.LayoutParams(100, 100));
int rootTag = uiManager.addRootView(rootView);
int textInputTag = rootTag + 1;
@@ -115,7 +115,7 @@ public class TextInputTest {
public void testPropsUpdate() {
UIManagerModule uiManager = getUIManagerModule();
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application);
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.getApplication());
rootView.setLayoutParams(new ReactRootView.LayoutParams(100, 100));
int rootTag = uiManager.addRootView(rootView);
int textInputTag = rootTag + 1;