diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java index 30be6fca487..d93316e09e4 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java @@ -207,6 +207,10 @@ public class ReactAppTestActivity extends FragmentActivity if (spec.getJavaScriptExecutorFactory() != null) { builder.setJavaScriptExecutorFactory(spec.getJavaScriptExecutorFactory()); } + if (spec.getNativeModuleCallExceptionHandler() != null) { + builder.setNativeModuleCallExceptionHandler(spec.getNativeModuleCallExceptionHandler()); + } + if (!spec.getAlternativeReactPackagesForTest().isEmpty()) { builder.addPackages(spec.getAlternativeReactPackagesForTest()); } else { diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java index 149208b3a3e..915dc60b395 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java @@ -13,6 +13,7 @@ import com.facebook.react.ReactPackage; import com.facebook.react.bridge.JavaScriptExecutorFactory; import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.NativeModule; +import com.facebook.react.bridge.NativeModuleCallExceptionHandler; import com.facebook.react.uimanager.ViewManager; import java.util.ArrayList; import java.util.Arrays; @@ -31,6 +32,7 @@ public class ReactInstanceSpecForTest { private final List> mJSModuleSpecs = new ArrayList<>(); private final List mViewManagers = new ArrayList<>(); private final ArrayList mReactPackages = new ArrayList<>(); + @Nullable private NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler = null; @Nullable private FabricUIManagerFactory mFabricUIManagerFactory = null; @Nullable private JavaScriptExecutorFactory mJavaScriptExecutorFactory = null; @@ -39,6 +41,16 @@ public class ReactInstanceSpecForTest { return this; } + public ReactInstanceSpecForTest setNativeModuleCallExceptionHandler( + NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) { + mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler; + return this; + } + + public NativeModuleCallExceptionHandler getNativeModuleCallExceptionHandler() { + return mNativeModuleCallExceptionHandler; + } + public ReactInstanceSpecForTest setJavaScriptExecutorFactory( JavaScriptExecutorFactory javaScriptExecutorFactory) { mJavaScriptExecutorFactory = javaScriptExecutorFactory;