From b0c30ada216213da993b64e7e2a7cd861bb5d284 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Fri, 17 Mar 2023 10:26:34 -0700 Subject: [PATCH] Fix test_buck by using RuntimeEnvironment.application (#36515) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/36515 Buck is using a older version of Robolectric which doens't have `RuntimeEnvironment.getApplication()`. Reverting to the older accessor. Changelog: [Internal] [Changed] - Fix test_buck by using RuntimeEnvironment.application Reviewed By: cipolleschi Differential Revision: D44171240 fbshipit-source-id: d2b49e3b08ffd737bc70ea3e0cb6b291cc36425f --- .../src/test/java/com/facebook/react/RootViewTest.java | 2 +- .../java/com/facebook/react/bridge/ReactTestHelper.java | 3 +-- .../react/modules/clipboard/ClipboardModuleTest.java | 4 ++-- .../react/modules/deviceinfo/DeviceInfoModuleTest.java | 2 +- .../com/facebook/react/modules/share/ShareModuleTest.java | 3 +-- .../com/facebook/react/uimanager/BaseViewManagerTest.java | 2 +- .../facebook/react/uimanager/ReactPropConstantsTest.java | 2 +- .../facebook/react/uimanager/SimpleViewPropertyTest.java | 2 +- .../react/uimanager/UIManagerModuleConstantsTest.java | 2 +- .../com/facebook/react/uimanager/UIManagerModuleTest.java | 8 ++++---- .../react/views/image/ReactImagePropertyTest.java | 2 +- .../java/com/facebook/react/views/text/ReactTextTest.java | 2 +- .../react/views/textinput/ReactTextInputPropertyTest.java | 2 +- .../com/facebook/react/views/textinput/TextInputTest.java | 4 ++-- 14 files changed, 19 insertions(+), 21 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java index f36b7a294fd..3346b520552 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java @@ -91,7 +91,7 @@ public class RootViewTest { }); mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); - mReactContext = spy(new ReactApplicationContext(RuntimeEnvironment.getApplication())); + mReactContext = spy(new ReactApplicationContext(RuntimeEnvironment.application)); mReactContext.initializeWithInstance(mCatalystInstanceMock); DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(mReactContext); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java index 9b0f082ca91..717b689a2b0 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java @@ -26,8 +26,7 @@ public class ReactTestHelper { * #createMockCatalystInstance} */ public static ReactApplicationContext createCatalystContextForTest() { - ReactApplicationContext context = - new ReactApplicationContext(RuntimeEnvironment.getApplication()); + ReactApplicationContext context = new ReactApplicationContext(RuntimeEnvironment.application); context.initializeWithInstance(createMockCatalystInstance()); return context; } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java index b8158a2e7db..4f5e3223f0b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java @@ -34,10 +34,10 @@ public class ClipboardModuleTest { @Before public void setUp() { mClipboardModule = - new ClipboardModule(new ReactApplicationContext(RuntimeEnvironment.getApplication())); + new ClipboardModule(new ReactApplicationContext(RuntimeEnvironment.application)); mClipboardManager = (ClipboardManager) - RuntimeEnvironment.getApplication().getSystemService(Context.CLIPBOARD_SERVICE); + RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE); } @Test diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java index 413a81729a8..d80a8187203 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java @@ -60,7 +60,7 @@ public class DeviceInfoModuleTest extends TestCase { initTestData(); mockStatic(DisplayMetricsHolder.class); - mContext = spy(new ReactApplicationContext(RuntimeEnvironment.getApplication())); + mContext = spy(new ReactApplicationContext(RuntimeEnvironment.application)); CatalystInstance catalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); mContext.initializeWithInstance(catalystInstanceMock); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java index 788b92b0fb7..1e245d7789a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java @@ -98,8 +98,7 @@ public class ShareModuleTest { mShareModule.share(content, dialogTitle, promise); - final Intent chooserIntent = - shadowOf(RuntimeEnvironment.getApplication()).getNextStartedActivity(); + final Intent chooserIntent = shadowOf(RuntimeEnvironment.application).getNextStartedActivity(); assertNotNull("Dialog was not displayed", chooserIntent); assertEquals(Intent.ACTION_CHOOSER, chooserIntent.getAction()); assertEquals(dialogTitle, chooserIntent.getExtras().get(Intent.EXTRA_TITLE)); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java index 9d138144c3f..95642f5edd9 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java @@ -45,7 +45,7 @@ public class BaseViewManagerTest { @Before public void setUp() { mViewManager = new ReactViewManager(); - mView = new ReactViewGroup(RuntimeEnvironment.getApplication()); + mView = new ReactViewGroup(RuntimeEnvironment.application); PowerMockito.mockStatic(Arguments.class); PowerMockito.when(Arguments.createMap()) .thenAnswer( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java index 121af024f02..505127b691a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java @@ -123,7 +123,7 @@ public class ReactPropConstantsTest { public void testNativePropsIncludeCorrectTypes() { List viewManagers = Arrays.asList(new ViewManagerUnderTest()); ReactApplicationContext reactContext = - new ReactApplicationContext(RuntimeEnvironment.getApplication()); + new ReactApplicationContext(RuntimeEnvironment.application); UIManagerModule uiManagerModule = new UIManagerModule(reactContext, viewManagers, 0); Map constants = (Map) valueAtPath(uiManagerModule.getConstants(), "SomeView", "NativeProps"); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java index 69badeea839..c1ccc3c2330 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java @@ -66,7 +66,7 @@ public class SimpleViewPropertyTest { @Before public void setup() { - mContext = new ReactApplicationContext(RuntimeEnvironment.getApplication()); + mContext = new ReactApplicationContext(RuntimeEnvironment.application); mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); mContext.initializeWithInstance(mCatalystInstanceMock); mThemedContext = new ThemedReactContext(mContext, mContext); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java index 07e788bb38d..0aa3e1c90cd 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java @@ -47,7 +47,7 @@ public class UIManagerModuleConstantsTest { @Before public void setUp() { - mReactContext = new ReactApplicationContext(RuntimeEnvironment.getApplication()); + mReactContext = new ReactApplicationContext(RuntimeEnvironment.application); } @Test diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java index 349cff3df87..2408455eff1 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java @@ -100,7 +100,7 @@ public class UIManagerModuleTest { any(ChoreographerCompat.FrameCallback.class)); mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); - mReactContext = new ReactApplicationContext(RuntimeEnvironment.getApplication()); + mReactContext = new ReactApplicationContext(RuntimeEnvironment.application); mReactContext.initializeWithInstance(mCatalystInstanceMock); UIManagerModule uiManagerModuleMock = mock(UIManagerModule.class); @@ -145,7 +145,7 @@ public class UIManagerModuleTest { UIManagerModule uiManager = getUIManagerModule(); ReactRootView rootView = - new ReactRootView(RuntimeEnvironment.getApplication().getApplicationContext()); + new ReactRootView(RuntimeEnvironment.application.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.getApplication().getApplicationContext()); + new ReactRootView(RuntimeEnvironment.application.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.getApplication().getApplicationContext()); + new ReactRootView(RuntimeEnvironment.application.getApplicationContext()); int rootTag = uiManager.addRootView(rootView); int textTag = rootTag + 1; int rawTextTag = textTag + 1; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java index 107c1d0d453..66a127c802c 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java @@ -85,7 +85,7 @@ public class ReactImagePropertyTest { RNLog.w(null, ""); SoLoader.setInTestMode(); - mContext = new ReactApplicationContext(RuntimeEnvironment.getApplication()); + mContext = new ReactApplicationContext(RuntimeEnvironment.application); mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); mContext.initializeWithInstance(mCatalystInstanceMock); mThemeContext = new ThemedReactContext(mContext, mContext); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java index 9dc586f5c15..5048afaefa8 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java @@ -476,7 +476,7 @@ public class ReactTextTest { private ReactRootView createText( UIManagerModule uiManager, JavaOnlyMap textProps, JavaOnlyMap rawTextProps) { - ReactRootView rootView = new ReactRootView(RuntimeEnvironment.getApplication()); + ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application); int rootTag = uiManager.addRootView(rootView); int textTag = rootTag + 1; int rawTextTag = textTag + 1; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java index 171d4f3532a..0d191fdef74 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java @@ -52,7 +52,7 @@ public class ReactTextInputPropertyTest { @Before public void setup() { - mContext = new ReactApplicationContext(RuntimeEnvironment.getApplication()); + mContext = new ReactApplicationContext(RuntimeEnvironment.application); mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); mContext.initializeWithInstance(mCatalystInstanceMock); mThemedContext = new ThemedReactContext(mContext, mContext); diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java index 77a3f44669a..7df47a12f69 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java @@ -87,7 +87,7 @@ public class TextInputTest { public void testPropsApplied() { UIManagerModule uiManager = getUIManagerModule(); - ReactRootView rootView = new ReactRootView(RuntimeEnvironment.getApplication()); + ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application); 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.getApplication()); + ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application); rootView.setLayoutParams(new ReactRootView.LayoutParams(100, 100)); int rootTag = uiManager.addRootView(rootView); int textInputTag = rootTag + 1;