Skip to content

Commit 94fed5f

Browse files
mateoguzmanafacebook-github-bot
authored andcommitted
Flip mockito usages to mockito-kotlin (#50878)
Summary: As the repository is moving towards Kotlin and the tests have also been moving towards mockito-kotlin, I'm doing another round here. ## Changelog: [INTERNAL] - Flip mockito usages to mockito-kotlin Pull Request resolved: #50878 Test Plan: ```sh yarn test-android ``` Reviewed By: javache Differential Revision: D73569293 Pulled By: rshest fbshipit-source-id: 9bfe7d3f69480367384eafdde429db15eb81d11c
1 parent 79d3eea commit 94fed5f

File tree

13 files changed

+96
-99
lines changed

13 files changed

+96
-99
lines changed

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.kt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ import org.mockito.ArgumentMatchers.any
3535
import org.mockito.ArgumentMatchers.anyInt
3636
import org.mockito.ArgumentMatchers.eq
3737
import org.mockito.MockedStatic
38-
import org.mockito.Mockito.atMost
39-
import org.mockito.Mockito.mock
4038
import org.mockito.Mockito.mockStatic
41-
import org.mockito.Mockito.reset
42-
import org.mockito.Mockito.times
43-
import org.mockito.Mockito.verify
44-
import org.mockito.Mockito.verifyNoMoreInteractions
45-
import org.mockito.Mockito.`when` as whenever
39+
import org.mockito.kotlin.atMost
40+
import org.mockito.kotlin.mock
41+
import org.mockito.kotlin.reset
42+
import org.mockito.kotlin.times
43+
import org.mockito.kotlin.verify
44+
import org.mockito.kotlin.verifyNoMoreInteractions
45+
import org.mockito.kotlin.whenever
4646
import org.robolectric.RobolectricTestRunner
4747

4848
/** Tests the animated nodes graph traversal algorithm from {@link NativeAnimatedNodesManager}. */
@@ -70,22 +70,22 @@ class NativeAnimatedNodeTraversalTest {
7070

7171
frameTimeNanos = INITIAL_FRAME_TIME_NANOS
7272

73-
reactApplicationContextMock = mock(ReactApplicationContext::class.java)
73+
reactApplicationContextMock = mock<ReactApplicationContext>()
7474
whenever(reactApplicationContextMock.hasActiveReactInstance()).thenAnswer { true }
7575
whenever(reactApplicationContextMock.hasCatalystInstance()).thenAnswer { true }
7676
whenever(reactApplicationContextMock.catalystInstance).thenAnswer { catalystInstanceMock }
7777
whenever(reactApplicationContextMock.getNativeModule(UIManagerModule::class.java)).thenAnswer {
7878
uiManagerMock
7979
}
8080

81-
catalystInstanceMock = mock(CatalystInstance::class.java)
81+
catalystInstanceMock = mock<CatalystInstance>()
8282
whenever(reactApplicationContextMock.getFabricUIManager()).thenAnswer { uiManagerMock }
8383
whenever(catalystInstanceMock.getNativeModule(UIManagerModule::class.java)).thenAnswer {
8484
uiManagerMock
8585
}
8686

87-
uiManagerMock = mock(UIManagerModule::class.java)
88-
eventDispatcherMock = mock(EventDispatcher::class.java)
87+
uiManagerMock = mock<UIManagerModule>()
88+
eventDispatcherMock = mock<EventDispatcher>()
8989
whenever(uiManagerMock.eventDispatcher).thenAnswer { eventDispatcherMock }
9090
whenever(uiManagerMock.constants).thenAnswer {
9191
mapOf("customDirectEventTypes" to emptyMap<Any, Any>())
@@ -144,7 +144,7 @@ class NativeAnimatedNodeTraversalTest {
144144

145145
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0)
146146

147-
val animationCallback: Callback = mock(Callback::class.java)
147+
val animationCallback: Callback = mock<Callback>()
148148
nativeAnimatedNodesManager.startAnimatingNode(
149149
1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), animationCallback)
150150

@@ -168,7 +168,7 @@ class NativeAnimatedNodeTraversalTest {
168168

169169
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.5, 1.0, 0.5, 0.0)
170170

171-
val animationCallback: Callback = mock(Callback::class.java)
171+
val animationCallback: Callback = mock<Callback>()
172172
nativeAnimatedNodesManager.startAnimatingNode(
173173
1,
174174
1,
@@ -201,7 +201,7 @@ class NativeAnimatedNodeTraversalTest {
201201
createSimpleAnimatedViewWithOpacity()
202202

203203
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0)
204-
val animationCallback: Callback = mock(Callback::class.java)
204+
val animationCallback: Callback = mock<Callback>()
205205
nativeAnimatedNodesManager.startAnimatingNode(
206206
1,
207207
1,
@@ -231,8 +231,8 @@ class NativeAnimatedNodeTraversalTest {
231231
createSimpleAnimatedViewWithOpacity()
232232
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0)
233233

234-
val animationCallback: Callback = mock(Callback::class.java)
235-
val valueListener: AnimatedNodeValueListener = mock(AnimatedNodeValueListener::class.java)
234+
val animationCallback: Callback = mock<Callback>()
235+
val valueListener: AnimatedNodeValueListener = mock<AnimatedNodeValueListener>()
236236

237237
nativeAnimatedNodesManager.startListeningToAnimatedNodeValue(nodeId, valueListener)
238238
nativeAnimatedNodesManager.startAnimatingNode(
@@ -258,8 +258,8 @@ class NativeAnimatedNodeTraversalTest {
258258
createSimpleAnimatedViewWithOpacity()
259259
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0)
260260

261-
val animationCallback: Callback = mock(Callback::class.java)
262-
val valueListener: AnimatedNodeValueListener = mock(AnimatedNodeValueListener::class.java)
261+
val animationCallback: Callback = mock<Callback>()
262+
val valueListener: AnimatedNodeValueListener = mock<AnimatedNodeValueListener>()
263263

264264
nativeAnimatedNodesManager.startListeningToAnimatedNodeValue(nodeId, valueListener)
265265
nativeAnimatedNodesManager.startAnimatingNode(
@@ -285,7 +285,7 @@ class NativeAnimatedNodeTraversalTest {
285285
) {
286286
createSimpleAnimatedViewWithOpacity()
287287

288-
val animationCallback: Callback = mock(Callback::class.java)
288+
val animationCallback: Callback = mock<Callback>()
289289

290290
nativeAnimatedNodesManager.startAnimatingNode(1, 1, config, animationCallback)
291291

@@ -381,7 +381,7 @@ class NativeAnimatedNodeTraversalTest {
381381
fun testSpringAnimationLoopsFiveTimes() {
382382
createSimpleAnimatedViewWithOpacity()
383383

384-
val animationCallback: Callback = mock(Callback::class.java)
384+
val animationCallback: Callback = mock<Callback>()
385385
nativeAnimatedNodesManager.startAnimatingNode(
386386
1,
387387
1,
@@ -460,7 +460,7 @@ class NativeAnimatedNodeTraversalTest {
460460
fun testDecayAnimation() {
461461
createSimpleAnimatedViewWithOpacity()
462462

463-
val animationCallback: Callback = mock(Callback::class.java)
463+
val animationCallback: Callback = mock<Callback>()
464464
nativeAnimatedNodesManager.startAnimatingNode(
465465
1,
466466
1,
@@ -510,7 +510,7 @@ class NativeAnimatedNodeTraversalTest {
510510
fun testDecayAnimationLoopsFiveTimes() {
511511
createSimpleAnimatedViewWithOpacity()
512512

513-
val animationCallback: Callback = mock(Callback::class.java)
513+
val animationCallback: Callback = mock<Callback>()
514514
nativeAnimatedNodesManager.startAnimatingNode(
515515
1,
516516
1,
@@ -563,7 +563,7 @@ class NativeAnimatedNodeTraversalTest {
563563
createSimpleAnimatedViewWithOpacity()
564564

565565
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0)
566-
val animationCallback: Callback = mock(Callback::class.java)
566+
val animationCallback: Callback = mock<Callback>()
567567
nativeAnimatedNodesManager.startAnimatingNode(
568568
1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), animationCallback)
569569

@@ -620,7 +620,7 @@ class NativeAnimatedNodeTraversalTest {
620620
fun testAdditionNode() {
621621
createAnimatedGraphWithAdditionNode()
622622

623-
val animationCallback: Callback = mock(Callback::class.java)
623+
val animationCallback: Callback = mock<Callback>()
624624
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0)
625625
nativeAnimatedNodesManager.startAnimatingNode(
626626
1,
@@ -663,7 +663,7 @@ class NativeAnimatedNodeTraversalTest {
663663
createAnimatedGraphWithAdditionNode()
664664

665665
// Start animating only the first addition input node
666-
val animationCallback: Callback = mock(Callback::class.java)
666+
val animationCallback: Callback = mock<Callback>()
667667
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0)
668668
nativeAnimatedNodesManager.startAnimatingNode(
669669
1,
@@ -700,7 +700,7 @@ class NativeAnimatedNodeTraversalTest {
700700
fun testViewReceiveUpdatesWhenOneOfAnimationHasFinished() {
701701
createAnimatedGraphWithAdditionNode()
702702

703-
val animationCallback: Callback = mock(Callback::class.java)
703+
val animationCallback: Callback = mock<Callback>()
704704

705705
// Start animating for the first addition input node, will have 2 frames only
706706
val firstFrames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0)
@@ -758,7 +758,7 @@ class NativeAnimatedNodeTraversalTest {
758758
nativeAnimatedNodesManager.connectAnimatedNodes(4, 5)
759759
nativeAnimatedNodesManager.connectAnimatedNodeToView(5, 50)
760760

761-
val animationCallback: Callback = mock(Callback::class.java)
761+
val animationCallback: Callback = mock<Callback>()
762762
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0)
763763
nativeAnimatedNodesManager.startAnimatingNode(
764764
1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 2.0), animationCallback)
@@ -796,7 +796,7 @@ class NativeAnimatedNodeTraversalTest {
796796
createSimpleAnimatedViewWithOpacity()
797797

798798
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0)
799-
val animationCallback: Callback = mock(Callback::class.java)
799+
val animationCallback: Callback = mock<Callback>()
800800
nativeAnimatedNodesManager.startAnimatingNode(
801801
404,
802802
1,
@@ -842,7 +842,7 @@ class NativeAnimatedNodeTraversalTest {
842842
nativeAnimatedNodesManager.createAnimatedNode(
843843
tag, JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0))
844844

845-
val saveValueCallbackMock: Callback = mock(Callback::class.java)
845+
val saveValueCallbackMock: Callback = mock<Callback>()
846846

847847
nativeAnimatedNodesManager.getValue(tag, saveValueCallbackMock)
848848

@@ -877,7 +877,7 @@ class NativeAnimatedNodeTraversalTest {
877877
nativeAnimatedNodesManager.connectAnimatedNodes(3, 4)
878878
nativeAnimatedNodesManager.connectAnimatedNodeToView(4, 50)
879879

880-
val animationCallback: Callback = mock(Callback::class.java)
880+
val animationCallback: Callback = mock<Callback>()
881881
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0)
882882
nativeAnimatedNodesManager.startAnimatingNode(
883883
1,
@@ -1011,7 +1011,7 @@ class NativeAnimatedNodeTraversalTest {
10111011
nativeAnimatedNodesManager.connectAnimatedNodeToView(propsNodeTag, viewTag)
10121012

10131013
val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.5, 1.0)
1014-
val animationCallback: Callback = mock(Callback::class.java)
1014+
val animationCallback: Callback = mock<Callback>()
10151015
nativeAnimatedNodesManager.startAnimatingNode(
10161016
1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 0.0), animationCallback)
10171017

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import com.facebook.testutils.shadows.ShadowSoLoader
1313
import org.junit.Before
1414
import org.junit.Test
1515
import org.junit.runner.RunWith
16-
import org.mockito.Mockito.mock
17-
import org.mockito.Mockito.`when` as whenever
16+
import org.mockito.kotlin.mock
17+
import org.mockito.kotlin.whenever
1818
import org.robolectric.RobolectricTestRunner
1919
import org.robolectric.annotation.Config
2020

@@ -30,14 +30,14 @@ class BaseJavaModuleTest {
3030

3131
@Before
3232
fun setup() {
33-
val jsInstance = mock(JSInstance::class.java)
33+
val jsInstance = mock<JSInstance>()
3434
val moduleHolder = ModuleHolder(MethodsModule())
3535
moduleWrapper = JavaModuleWrapper(jsInstance, moduleHolder)
3636
methods = moduleWrapper.methodDescriptors
3737
val generatedModuleHolder = ModuleHolder(GeneratedMethodsModule())
3838
generatedModuleWrapper = JavaModuleWrapper(jsInstance, generatedModuleHolder)
3939
generatedMethods = generatedModuleWrapper.methodDescriptors
40-
arguments = mock(ReadableNativeArray::class.java)
40+
arguments = mock<ReadableNativeArray>()
4141
}
4242

4343
private fun findMethod(mname: String, methods: List<JavaModuleWrapper.MethodDescriptor>): Int =

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import com.facebook.react.bridge.queue.ReactQueueConfiguration
1616
import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl
1717
import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec
1818
import com.facebook.react.uimanager.UIManagerModule
19-
import org.mockito.Mockito.mock
20-
import org.mockito.Mockito.`when` as whenever
19+
import org.mockito.kotlin.mock
20+
import org.mockito.kotlin.whenever
2121
import org.robolectric.RuntimeEnvironment
2222

2323
/** Utility for creating pre-configured instances of core react components for tests. */
@@ -42,10 +42,10 @@ object ReactTestHelper {
4242
.build()
4343
val reactQueueConfiguration: ReactQueueConfiguration =
4444
ReactQueueConfigurationImpl.create(spec) { e -> throw RuntimeException(e) }
45-
val reactInstance: CatalystInstance = mock(CatalystInstance::class.java)
45+
val reactInstance: CatalystInstance = mock<CatalystInstance>()
4646
whenever(reactInstance.reactQueueConfiguration).thenReturn(reactQueueConfiguration)
4747
whenever(reactInstance.getNativeModule(UIManagerModule::class.java))
48-
.thenReturn(mock(UIManagerModule::class.java))
48+
.thenReturn(mock<UIManagerModule>())
4949
whenever(reactInstance.isDestroyed).thenReturn(false)
5050
return reactInstance
5151
}

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.junit.Before
2020
import org.junit.Test
2121
import org.junit.runner.RunWith
2222
import org.mockito.MockedStatic
23-
import org.mockito.Mockito
23+
import org.mockito.Mockito.mockStatic
2424
import org.robolectric.RobolectricTestRunner
2525
import org.robolectric.RuntimeEnvironment
2626
import org.robolectric.annotation.Config
@@ -37,7 +37,7 @@ class FabricUIManagerTest {
3737

3838
@Before
3939
fun setup() {
40-
featureFlags = Mockito.mockStatic(ReactNativeFeatureFlags::class.java)
40+
featureFlags = mockStatic(ReactNativeFeatureFlags::class.java)
4141
featureFlags.`when`<Boolean> { ReactNativeFeatureFlags.enableFabricLogs() }.thenAnswer { false }
4242
reactContext = BridgeReactContext(RuntimeEnvironment.getApplication())
4343
viewManagerRegistry = ViewManagerRegistry(emptyList())

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import org.mockito.ArgumentCaptor
3636
import org.mockito.ArgumentMatchers.*
3737
import org.mockito.MockedStatic
3838
import org.mockito.Mockito.mockStatic
39-
import org.mockito.Mockito.times
40-
import org.mockito.Mockito.verify
4139
import org.mockito.kotlin.mock
40+
import org.mockito.kotlin.times
41+
import org.mockito.kotlin.verify
4242
import org.robolectric.RobolectricTestRunner
4343
import org.robolectric.annotation.Config
4444

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import org.assertj.core.api.Assertions.assertThat
1717
import org.junit.Before
1818
import org.junit.Test
1919
import org.junit.runner.RunWith
20-
import org.mockito.Mockito.*
20+
import org.mockito.kotlin.mock
2121
import org.robolectric.RobolectricTestRunner
2222

2323
@RunWith(RobolectricTestRunner::class)
@@ -28,7 +28,7 @@ class ImageStoreManagerTest {
2828

2929
@Before
3030
fun setUp() {
31-
reactApplicationContext = mock(ReactApplicationContext::class.java)
31+
reactApplicationContext = mock<ReactApplicationContext>()
3232
imageStoreManager = ImageStoreManager(reactApplicationContext)
3333
}
3434

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ import org.junit.runner.RunWith
2323
import org.mockito.ArgumentCaptor
2424
import org.mockito.ArgumentMatchers
2525
import org.mockito.MockedStatic
26-
import org.mockito.Mockito.*
26+
import org.mockito.Mockito.mockStatic
27+
import org.mockito.kotlin.spy
28+
import org.mockito.kotlin.times
29+
import org.mockito.kotlin.verify
2730
import org.robolectric.RobolectricTestRunner
2831
import org.robolectric.RuntimeEnvironment
2932

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import com.facebook.react.bridge.ReactApplicationContext
1818
import org.assertj.core.api.Assertions.assertThat
1919
import org.junit.*
2020
import org.junit.runner.RunWith
21-
import org.mockito.Mockito.mock
22-
import org.mockito.Mockito.`when` as whenever
21+
import org.mockito.kotlin.mock
22+
import org.mockito.kotlin.whenever
2323
import org.robolectric.Robolectric
2424
import org.robolectric.RobolectricTestRunner
2525
import org.robolectric.Shadows.shadowOf
@@ -182,7 +182,7 @@ class DialogModuleTest {
182182
// raising an exception
183183
activity.setTheme(theme)
184184

185-
val context: ReactApplicationContext = mock(ReactApplicationContext::class.java)
185+
val context: ReactApplicationContext = mock<ReactApplicationContext>()
186186
whenever(context.hasActiveReactInstance()).thenReturn(true)
187187
whenever(context.currentActivity).thenReturn(activity)
188188

0 commit comments

Comments
 (0)