From ddb8aeadbb0a5f6856abd9c04eb730fb2bb13332 Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Wed, 31 May 2023 23:23:17 -0700
Subject: [PATCH] Enable mock-maker-inline for Android JVM tests (#37646)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/37646

I'm re-enabling a test that got disabled due to us not using mock-maker-inline in OSS. I'm also adding `mock-maker-inline` for OSS so it will be easier to convert tests to Kotlin as classes in Kotlin are final by default.

Changelog:
[Internal] [Changed] - Enable mock-maker-inline for Android JVM tests

Reviewed By: NickGerleman

Differential Revision: D46222913

fbshipit-source-id: b7da0616994888c2800c193a1bb8e233d2c18288
---
 .../com/facebook/react/bridgeless/ReactHostDelegateTest.kt     | 2 --
 .../react/modules/deviceinfo/DeviceInfoModuleTest.java         | 3 ++-
 .../resources/mockito-extensions/org.mockito.plugins.MockMaker | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 packages/react-native/ReactAndroid/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt
index a65823b4165..4bc2ed9c6b2 100644
--- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt
+++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt
@@ -14,7 +14,6 @@ import com.facebook.react.defaults.DefaultReactHostDelegate
 import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate
 import com.facebook.testutils.shadows.ShadowSoLoader
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito
@@ -31,7 +30,6 @@ class ReactHostDelegateTest {
    * API
    */
   @Test
-  @Ignore
   fun testDefaultReactHostDelegateCreation() {
     val jsBundleLoader: JSBundleLoader = Mockito.mock(JSBundleLoader::class.java)
     val turboModuleManagerDelegateMock: TurboModuleManagerDelegate =
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 d80a8187203..62890cbfe8d 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
@@ -126,7 +126,8 @@ public class DeviceInfoModuleTest extends TestCase {
   }
 
   private static void givenDisplayMetricsHolderContains(final WritableMap fakeDisplayMetrics) {
-    when(DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)).thenReturn(fakeDisplayMetrics);
+    when(DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0))
+        .thenAnswer(invocation -> fakeDisplayMetrics);
   }
 
   private static void verifyUpdateDimensionsEventsEmitted(
diff --git a/packages/react-native/ReactAndroid/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/packages/react-native/ReactAndroid/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..1f0955d450f
--- /dev/null
+++ b/packages/react-native/ReactAndroid/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline