From aa15fd44a6fe6fc40c7a6c8f8ff33db4389bedad Mon Sep 17 00:00:00 2001 From: Phillip Pan Date: Tue, 4 Apr 2023 13:49:37 -0700 Subject: [PATCH] decouple DialogModuleTest from PowerMock (#36778) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/36778 Changelog: [Internal] we can just use mockito for this suite Reviewed By: mdvacca Differential Revision: D44603023 fbshipit-source-id: b8f6f37fccba38990fe498d8f5e479f174ff93af --- .../react/modules/dialog/DialogModuleTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java index 4d0614f3d85..d93357166e4 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java @@ -11,6 +11,7 @@ import static android.os.Looper.getMainLooper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; import android.app.AlertDialog; @@ -21,18 +22,14 @@ import com.facebook.react.bridge.JavaOnlyMap; import com.facebook.react.bridge.ReactApplicationContext; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; +import org.mockito.Mockito; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; @RunWith(RobolectricTestRunner.class) -@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"}) -@Ignore("Ignored due to unsupported mocking mechanism with JDK 18") public class DialogModuleTest { private ActivityController mActivityController; @@ -63,9 +60,9 @@ public class DialogModuleTest { mActivityController = Robolectric.buildActivity(FragmentActivity.class); mActivity = mActivityController.create().start().resume().get(); - final ReactApplicationContext context = PowerMockito.mock(ReactApplicationContext.class); - PowerMockito.when(context.hasActiveReactInstance()).thenReturn(true); - PowerMockito.when(context, "getCurrentActivity").thenReturn(mActivity); + final ReactApplicationContext context = Mockito.mock(ReactApplicationContext.class); + when(context.hasActiveReactInstance()).thenReturn(true); + when(context.getCurrentActivity()).thenReturn(mActivity); mDialogModule = new DialogModule(context); mDialogModule.onHostResume();