From b40ed6890dc2c8ff1d88a2db71bd4bca58ffdd5a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Fri, 13 Dec 2019 12:13:56 -0800
Subject: [PATCH] Adjust TMMDelegate tests to account for all registered
 packages

Summary:
`Fb4a` and `Workplace` use only one product-specific `ReactPackage`, but `ReactInstanceManager` also installs `CoreModulesPackage` and `DebugCorePackage`. These two packages have NativeModules that got converted to the TurboModule system. So, I've added them to the `Fb4aReactPackagesTest` and `WorkReactPackageTest` to ensure that NativeModule conversions in framework-provided packages are also tested.

Changelog:
[Internal]

Reviewed By: PeteTheHeat

Differential Revision: D18974083

fbshipit-source-id: a98ec28a882ce51597a068ddecf43f5fbb6bfdc6
---
 ReactAndroid/src/main/java/com/facebook/react/BUCK            | 4 ++--
 .../src/main/java/com/facebook/react/CoreModulesPackage.java  | 4 ++--
 .../src/main/java/com/facebook/react/DebugCorePackage.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index 476cc659145..52fc61f187f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -34,7 +34,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
         react_native_target("java/com/facebook/react/modules/appearance:appearance"),
-        react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
         react_native_target("java/com/facebook/react/modules/fabric:fabric"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
@@ -42,13 +41,14 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/modules/toast:toast"),
         react_native_target("java/com/facebook/react/surface:surface"),
-        react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
     ],
     exported_deps = [
+        react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/packagerconnection:packagerconnection"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 43ef61b0935..754d86ec08d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -57,14 +57,14 @@ import java.util.Map;
       TimingModule.class,
       UIManagerModule.class,
     })
-/* package */ class CoreModulesPackage extends TurboReactPackage implements ReactPackageLogger {
+public class CoreModulesPackage extends TurboReactPackage implements ReactPackageLogger {
 
   private final ReactInstanceManager mReactInstanceManager;
   private final DefaultHardwareBackBtnHandler mHardwareBackBtnHandler;
   private final boolean mLazyViewManagersEnabled;
   private final int mMinTimeLeftInFrameForNonBatchedOperationMs;
 
-  CoreModulesPackage(
+  public CoreModulesPackage(
       ReactInstanceManager reactInstanceManager,
       DefaultHardwareBackBtnHandler hardwareBackBtnHandler,
       @Nullable UIImplementationProvider uiImplementationProvider,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
index e9599bacc5a..b289585f6f8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
@@ -30,7 +30,7 @@ import java.util.Map;
       JSDevSupport.class,
     })
 public class DebugCorePackage extends TurboReactPackage {
-  DebugCorePackage() {}
+  public DebugCorePackage() {}
 
   @Override
   public NativeModule getModule(String name, ReactApplicationContext reactContext) {