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

Fix test_buck by using RuntimeEnvironment.application (#36515)

Browse Source 
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
This commit is contained in:
Nicola Corti
2023-03-17 10:26:34 -07:00
committed by Facebook GitHub Bot
parent d904164434
commit b0c30ada21
14 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
+1 -1
View File
@@ -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);
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
+1 -2
View File
@@ -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;
}
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
+2 -2
View File
@@ -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
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java
+1 -1
View File
@@ -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);
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
+1 -2
View File
@@ -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));
packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
+1 -1
View File
@@ -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(
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.getApplication());
new ReactApplicationContext(RuntimeEnvironment.application);
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.getApplication());
mContext = new ReactApplicationContext(RuntimeEnvironment.application);
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.getApplication());
mReactContext = new ReactApplicationContext(RuntimeEnvironment.application);
}
@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.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;
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.getApplication());
mContext = new ReactApplicationContext(RuntimeEnvironment.application);
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.getApplication());
ReactRootView rootView = new ReactRootView(RuntimeEnvironment.application);
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.getApplication());
mContext = new ReactApplicationContext(RuntimeEnvironment.application);
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.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;