@@ -35,14 +35,14 @@ import org.mockito.ArgumentMatchers.any
35
35
import org.mockito.ArgumentMatchers.anyInt
36
36
import org.mockito.ArgumentMatchers.eq
37
37
import org.mockito.MockedStatic
38
- import org.mockito.Mockito.atMost
39
- import org.mockito.Mockito.mock
40
38
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
46
46
import org.robolectric.RobolectricTestRunner
47
47
48
48
/* * Tests the animated nodes graph traversal algorithm from {@link NativeAnimatedNodesManager}. */
@@ -70,22 +70,22 @@ class NativeAnimatedNodeTraversalTest {
70
70
71
71
frameTimeNanos = INITIAL_FRAME_TIME_NANOS
72
72
73
- reactApplicationContextMock = mock( ReactApplicationContext :: class .java )
73
+ reactApplicationContextMock = mock< ReactApplicationContext >( )
74
74
whenever(reactApplicationContextMock.hasActiveReactInstance()).thenAnswer { true }
75
75
whenever(reactApplicationContextMock.hasCatalystInstance()).thenAnswer { true }
76
76
whenever(reactApplicationContextMock.catalystInstance).thenAnswer { catalystInstanceMock }
77
77
whenever(reactApplicationContextMock.getNativeModule(UIManagerModule ::class .java)).thenAnswer {
78
78
uiManagerMock
79
79
}
80
80
81
- catalystInstanceMock = mock( CatalystInstance :: class .java )
81
+ catalystInstanceMock = mock< CatalystInstance >( )
82
82
whenever(reactApplicationContextMock.getFabricUIManager()).thenAnswer { uiManagerMock }
83
83
whenever(catalystInstanceMock.getNativeModule(UIManagerModule ::class .java)).thenAnswer {
84
84
uiManagerMock
85
85
}
86
86
87
- uiManagerMock = mock( UIManagerModule :: class .java )
88
- eventDispatcherMock = mock( EventDispatcher :: class .java )
87
+ uiManagerMock = mock< UIManagerModule >( )
88
+ eventDispatcherMock = mock< EventDispatcher >( )
89
89
whenever(uiManagerMock.eventDispatcher).thenAnswer { eventDispatcherMock }
90
90
whenever(uiManagerMock.constants).thenAnswer {
91
91
mapOf (" customDirectEventTypes" to emptyMap<Any , Any >())
@@ -144,7 +144,7 @@ class NativeAnimatedNodeTraversalTest {
144
144
145
145
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 0.2 , 0.4 , 0.6 , 0.8 , 1.0 )
146
146
147
- val animationCallback: Callback = mock( Callback :: class .java )
147
+ val animationCallback: Callback = mock< Callback >( )
148
148
nativeAnimatedNodesManager.startAnimatingNode(
149
149
1 , 1 , JavaOnlyMap .of(" type" , " frames" , " frames" , frames, " toValue" , 1.0 ), animationCallback)
150
150
@@ -168,7 +168,7 @@ class NativeAnimatedNodeTraversalTest {
168
168
169
169
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 0.5 , 1.0 , 0.5 , 0.0 )
170
170
171
- val animationCallback: Callback = mock( Callback :: class .java )
171
+ val animationCallback: Callback = mock< Callback >( )
172
172
nativeAnimatedNodesManager.startAnimatingNode(
173
173
1 ,
174
174
1 ,
@@ -201,7 +201,7 @@ class NativeAnimatedNodeTraversalTest {
201
201
createSimpleAnimatedViewWithOpacity()
202
202
203
203
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 >( )
205
205
nativeAnimatedNodesManager.startAnimatingNode(
206
206
1 ,
207
207
1 ,
@@ -231,8 +231,8 @@ class NativeAnimatedNodeTraversalTest {
231
231
createSimpleAnimatedViewWithOpacity()
232
232
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 0.2 , 0.4 , 0.6 , 0.8 , 1.0 )
233
233
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 >( )
236
236
237
237
nativeAnimatedNodesManager.startListeningToAnimatedNodeValue(nodeId, valueListener)
238
238
nativeAnimatedNodesManager.startAnimatingNode(
@@ -258,8 +258,8 @@ class NativeAnimatedNodeTraversalTest {
258
258
createSimpleAnimatedViewWithOpacity()
259
259
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 0.2 , 0.4 , 0.6 , 0.8 , 1.0 )
260
260
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 >( )
263
263
264
264
nativeAnimatedNodesManager.startListeningToAnimatedNodeValue(nodeId, valueListener)
265
265
nativeAnimatedNodesManager.startAnimatingNode(
@@ -285,7 +285,7 @@ class NativeAnimatedNodeTraversalTest {
285
285
) {
286
286
createSimpleAnimatedViewWithOpacity()
287
287
288
- val animationCallback: Callback = mock( Callback :: class .java )
288
+ val animationCallback: Callback = mock< Callback >( )
289
289
290
290
nativeAnimatedNodesManager.startAnimatingNode(1 , 1 , config, animationCallback)
291
291
@@ -381,7 +381,7 @@ class NativeAnimatedNodeTraversalTest {
381
381
fun testSpringAnimationLoopsFiveTimes () {
382
382
createSimpleAnimatedViewWithOpacity()
383
383
384
- val animationCallback: Callback = mock( Callback :: class .java )
384
+ val animationCallback: Callback = mock< Callback >( )
385
385
nativeAnimatedNodesManager.startAnimatingNode(
386
386
1 ,
387
387
1 ,
@@ -460,7 +460,7 @@ class NativeAnimatedNodeTraversalTest {
460
460
fun testDecayAnimation () {
461
461
createSimpleAnimatedViewWithOpacity()
462
462
463
- val animationCallback: Callback = mock( Callback :: class .java )
463
+ val animationCallback: Callback = mock< Callback >( )
464
464
nativeAnimatedNodesManager.startAnimatingNode(
465
465
1 ,
466
466
1 ,
@@ -510,7 +510,7 @@ class NativeAnimatedNodeTraversalTest {
510
510
fun testDecayAnimationLoopsFiveTimes () {
511
511
createSimpleAnimatedViewWithOpacity()
512
512
513
- val animationCallback: Callback = mock( Callback :: class .java )
513
+ val animationCallback: Callback = mock< Callback >( )
514
514
nativeAnimatedNodesManager.startAnimatingNode(
515
515
1 ,
516
516
1 ,
@@ -563,7 +563,7 @@ class NativeAnimatedNodeTraversalTest {
563
563
createSimpleAnimatedViewWithOpacity()
564
564
565
565
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 1.0 )
566
- val animationCallback: Callback = mock( Callback :: class .java )
566
+ val animationCallback: Callback = mock< Callback >( )
567
567
nativeAnimatedNodesManager.startAnimatingNode(
568
568
1 , 1 , JavaOnlyMap .of(" type" , " frames" , " frames" , frames, " toValue" , 1.0 ), animationCallback)
569
569
@@ -620,7 +620,7 @@ class NativeAnimatedNodeTraversalTest {
620
620
fun testAdditionNode () {
621
621
createAnimatedGraphWithAdditionNode()
622
622
623
- val animationCallback: Callback = mock( Callback :: class .java )
623
+ val animationCallback: Callback = mock< Callback >( )
624
624
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 1.0 )
625
625
nativeAnimatedNodesManager.startAnimatingNode(
626
626
1 ,
@@ -663,7 +663,7 @@ class NativeAnimatedNodeTraversalTest {
663
663
createAnimatedGraphWithAdditionNode()
664
664
665
665
// Start animating only the first addition input node
666
- val animationCallback: Callback = mock( Callback :: class .java )
666
+ val animationCallback: Callback = mock< Callback >( )
667
667
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 1.0 )
668
668
nativeAnimatedNodesManager.startAnimatingNode(
669
669
1 ,
@@ -700,7 +700,7 @@ class NativeAnimatedNodeTraversalTest {
700
700
fun testViewReceiveUpdatesWhenOneOfAnimationHasFinished () {
701
701
createAnimatedGraphWithAdditionNode()
702
702
703
- val animationCallback: Callback = mock( Callback :: class .java )
703
+ val animationCallback: Callback = mock< Callback >( )
704
704
705
705
// Start animating for the first addition input node, will have 2 frames only
706
706
val firstFrames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 1.0 )
@@ -758,7 +758,7 @@ class NativeAnimatedNodeTraversalTest {
758
758
nativeAnimatedNodesManager.connectAnimatedNodes(4 , 5 )
759
759
nativeAnimatedNodesManager.connectAnimatedNodeToView(5 , 50 )
760
760
761
- val animationCallback: Callback = mock( Callback :: class .java )
761
+ val animationCallback: Callback = mock< Callback >( )
762
762
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 1.0 )
763
763
nativeAnimatedNodesManager.startAnimatingNode(
764
764
1 , 1 , JavaOnlyMap .of(" type" , " frames" , " frames" , frames, " toValue" , 2.0 ), animationCallback)
@@ -796,7 +796,7 @@ class NativeAnimatedNodeTraversalTest {
796
796
createSimpleAnimatedViewWithOpacity()
797
797
798
798
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 >( )
800
800
nativeAnimatedNodesManager.startAnimatingNode(
801
801
404 ,
802
802
1 ,
@@ -842,7 +842,7 @@ class NativeAnimatedNodeTraversalTest {
842
842
nativeAnimatedNodesManager.createAnimatedNode(
843
843
tag, JavaOnlyMap .of(" type" , " value" , " value" , 1.0 , " offset" , 0.0 ))
844
844
845
- val saveValueCallbackMock: Callback = mock( Callback :: class .java )
845
+ val saveValueCallbackMock: Callback = mock< Callback >( )
846
846
847
847
nativeAnimatedNodesManager.getValue(tag, saveValueCallbackMock)
848
848
@@ -877,7 +877,7 @@ class NativeAnimatedNodeTraversalTest {
877
877
nativeAnimatedNodesManager.connectAnimatedNodes(3 , 4 )
878
878
nativeAnimatedNodesManager.connectAnimatedNodeToView(4 , 50 )
879
879
880
- val animationCallback: Callback = mock( Callback :: class .java )
880
+ val animationCallback: Callback = mock< Callback >( )
881
881
val frames: JavaOnlyArray = JavaOnlyArray .of(0.0 , 0.2 , 0.4 , 0.6 , 0.8 , 1.0 )
882
882
nativeAnimatedNodesManager.startAnimatingNode(
883
883
1 ,
@@ -1011,7 +1011,7 @@ class NativeAnimatedNodeTraversalTest {
1011
1011
nativeAnimatedNodesManager.connectAnimatedNodeToView(propsNodeTag, viewTag)
1012
1012
1013
1013
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 >( )
1015
1015
nativeAnimatedNodesManager.startAnimatingNode(
1016
1016
1 , 1 , JavaOnlyMap .of(" type" , " frames" , " frames" , frames, " toValue" , 0.0 ), animationCallback)
1017
1017
0 commit comments