tmp

lib/android/app/build.gradle

@@ -190,12 +190,11 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
 
     // tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:4.4"
-    testImplementation 'org.assertj:assertj-core:3.8.0'
-    testImplementation 'com.squareup.assertj:assertj-android:1.1.1'
-    testImplementation 'org.mockito:mockito-core:3.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.robolectric:robolectric:4.7.2"
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:4.0.0'
     testImplementation 'org.mockito:mockito-inline:3.4.0'
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
 }

lib/android/app/src/test/java/com/reactnativenavigation/TestActivity.java

@@ -15,4 +15,9 @@ public ReactGateway getReactGateway() {
     public void setNavigator(Navigator navigator) {
         this.navigator = navigator;
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/mocks/ImageLoaderMock.kt

@@ -3,12 +3,13 @@ package com.reactnativenavigation.mocks
 import android.graphics.Canvas
 import android.graphics.ColorFilter
 import android.graphics.drawable.Drawable
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.doAnswer
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+
 import com.reactnativenavigation.utils.ImageLoader
 import com.reactnativenavigation.utils.ImageLoader.ImagesLoadingListener
+import org.mockito.Mockito.doAnswer
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 import java.util.*
 
 object ImageLoaderMock {

lib/android/app/src/test/java/com/reactnativenavigation/mocks/Mocks.kt

@@ -1,10 +1,11 @@
 package com.reactnativenavigation.mocks
 
 import android.view.ViewGroup
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+
 import com.reactnativenavigation.options.Options
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 object Mocks {
     fun viewController(): ViewController<*> {

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TypefaceLoaderMock.kt

@@ -1,8 +1,8 @@
 package com.reactnativenavigation.mocks
 
 import android.graphics.Typeface
-import com.nhaarman.mockitokotlin2.mock
 import com.reactnativenavigation.options.parsers.TypefaceLoader
+import org.mockito.kotlin.mock
 
 class TypefaceLoaderMock() : TypefaceLoader(mock()) {
     private var mockTypefaces: Map<String, Typeface>? = null

lib/android/app/src/test/java/com/reactnativenavigation/options/TransitionAnimationOptionsTest.kt

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.options
-
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Assertions.assertThat
 import org.json.JSONArray

lib/android/app/src/test/java/com/reactnativenavigation/utils/MotionEventTest.kt

@@ -4,7 +4,7 @@ import android.app.Activity
 import android.view.MotionEvent
 import android.view.View
 import android.widget.FrameLayout
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Java6Assertions.assertThat
 import org.junit.Test

lib/android/app/src/test/java/com/reactnativenavigation/utils/UiThreadTest.java

@@ -13,7 +13,7 @@ public void postOnUiThread() throws Exception {
         Runnable task = mock(Runnable.class);
         ShadowLooper.pauseMainLooper();
         UiThread.post(task);
-        verifyZeroInteractions(task);
+        verifyNoInteractions(task);
         ShadowLooper.runUiThreadTasks();
         verify(task, times(1)).run();
     }
@@ -22,7 +22,7 @@ public void postOnUiThread() throws Exception {
     public void postDelayedOnUiThread() throws Exception {
         Runnable task = mock(Runnable.class);
         UiThread.postDelayed(task, 1000);
-        verifyZeroInteractions(task);
+        verifyNoInteractions(task);
         ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
         verify(task, times(1)).run();
     }

lib/android/app/src/test/java/com/reactnativenavigation/utils/UiUtilsTest.java

@@ -13,7 +13,7 @@ public class UiUtilsTest extends BaseTest {
     public void runOnPreDrawOnce() {
         View view = new View(newActivity());
         Runnable task = mock(Runnable.class);
-        verifyZeroInteractions(task);
+        verifyNoInteractions(task);
 
         UiUtils.runOnPreDrawOnce(view, task);
         dispatchPreDraw(view);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsPresenterTest.kt

@@ -3,7 +3,7 @@ package com.reactnativenavigation.viewcontrollers.bottomtabs
 import android.animation.AnimatorSet
 import android.content.res.Configuration
 import android.graphics.Color
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.mocks.SimpleViewController
 import com.reactnativenavigation.options.Options

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewControllerTest.java

@@ -138,7 +138,7 @@ public void mergeOptions_delegatesToPresenterIfViewIsNotShown() {
         Options options = new Options();
         Java6Assertions.assertThat(uut.isViewShown()).isFalse();
         uut.mergeOptions(options);
-        Mockito.verifyZeroInteractions(presenter);
+        Mockito.verifyNoInteractions(presenter);
 
         Mockito.when(uut.isViewShown()).thenReturn(true);
         uut.mergeOptions(options);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/fakes/FakeParentController.kt

@@ -2,7 +2,7 @@ package com.reactnativenavigation.viewcontrollers.fakes
 
 import android.app.Activity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
 import com.reactnativenavigation.options.Options
 import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter
 import com.reactnativenavigation.utils.CompatUtils

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalAnimatorTest.kt

@@ -1,7 +1,7 @@
 package com.reactnativenavigation.viewcontrollers.modal
 
 import android.app.Activity
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.mocks.SimpleViewController
 import com.reactnativenavigation.options.*

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -34,7 +34,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 public class ModalPresenterTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
@@ -109,7 +109,7 @@ public void showModal_resolvesDefaultOptions() throws JSONException {
         defaultOptions.animations.showModal = TransitionAnimationOptionsKt.parseTransitionAnimationOptions(disabledShowModalAnimation);
         uut.setDefaultOptions(defaultOptions);
         uut.showModal(modal1, root, new CommandListenerAdapter());
-        verifyZeroInteractions(animator);
+        verifyNoInteractions(animator);
     }
 
     @Test
@@ -163,7 +163,7 @@ public void showModal_waitForRender() {
         modal1.options.animations.showModal.setWaitForRender(new Bool(true));
         uut.showModal(modal1, root, new CommandListenerAdapter());
         verify(modal1).addOnAppearedListener(any());
-        verifyZeroInteractions(animator);
+        verifyNoInteractions(animator);
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -30,7 +30,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 public class ModalStackTest extends BaseTest {
@@ -152,7 +152,7 @@ public void run() {
         uut.dismissModal(MODAL_ID_1, root, listener);
         verify(onModalWillDismiss, times(0)).run();
         verify(listener, times(1)).onError(anyString());
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
     }
 
     @Test
@@ -188,7 +188,7 @@ public void onSuccess(String childId) {
         });
         uut.dismissAllModals(root, Options.EMPTY, listener);
         verify(listener, times(1)).onSuccess(anyString());
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/RootPresenterTest.kt

@@ -3,9 +3,6 @@ package com.reactnativenavigation.viewcontrollers.navigator
 import android.app.Activity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.facebook.react.ReactInstanceManager
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.never
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.TestActivity
 import com.reactnativenavigation.hierarchy.root.RootAnimator
@@ -22,6 +19,9 @@ import org.assertj.core.api.Java6Assertions
 import org.junit.Test
 import org.mockito.ArgumentCaptor
 import org.mockito.Mockito
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.never
 import org.robolectric.android.controller.ActivityController
 
 class RootPresenterTest : BaseTest() {
@@ -76,7 +76,7 @@ class RootPresenterTest : BaseTest() {
     fun setRoot_doesNotAnimateByDefault() {
         val listener = Mockito.spy(CommandListenerAdapter())
         uut.setRoot(root, null, defaultOptions, listener, reactInstanceManager)
-        Mockito.verifyZeroInteractions(animator)
+        Mockito.verifyNoInteractions(animator)
         Mockito.verify(listener).onSuccess(root.id)
     }
 
@@ -210,7 +210,7 @@ class RootPresenterTest : BaseTest() {
         uut.setRoot(spy, null, defaultOptions, listener, reactInstanceManager)
         Mockito.verify(spy).addOnAppearedListener(any())
         Java6Assertions.assertThat(spy.view.alpha).isZero()
-        Mockito.verifyZeroInteractions(listener)
+        Mockito.verifyNoInteractions(listener)
         spy.onViewWillAppear()
         idleMainLooper()
         Java6Assertions.assertThat(spy.view.alpha).isOne()

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackAnimatorTest.kt

@@ -4,7 +4,7 @@ import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.app.Activity
 import android.widget.FrameLayout
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.mocks.Mocks
 import com.reactnativenavigation.mocks.SimpleViewController

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import android.view.View
 import android.widget.FrameLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.TestUtils
 import com.reactnativenavigation.mocks.*

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenterTest.kt

@@ -7,7 +7,7 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.view.View
 import android.view.ViewGroup
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.TestUtils
 import com.reactnativenavigation.fakes.IconResolverFake

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/TopBarControllerTest.kt

@@ -4,7 +4,7 @@ import android.animation.AnimatorSet
 import android.app.Activity
 import android.content.Context
 import android.view.View
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.fakes.IconResolverFake
 import com.reactnativenavigation.mocks.TitleBarButtonCreatorMock

lib/android/app/src/test/java/com/reactnativenavigation/views/TitleAndButtonsContainerTest.kt

@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.LinearLayout
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.options.Alignment
 import com.reactnativenavigation.options.params.Colour

lib/android/app/src/test/java/com/reactnativenavigation/views/animations/BaseViewAnimatorTest.kt

@@ -2,14 +2,14 @@ package com.reactnativenavigation.views.animations
 
 import android.animation.Animator
 import android.view.View
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
 import com.reactnativenavigation.BaseTest
 import com.reactnativenavigation.options.AnimationOptions
 import org.assertj.core.api.Java6Assertions.assertThat
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 
 class BaseViewAnimatorTest : BaseTest() {
     private lateinit var uut: BaseViewAnimator<View>

lib/android/app/src/test/java/com/reactnativenavigation/views/bottomtabs/BottomTabsContainerTest.kt

@@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.graphics.ColorUtils
-import com.nhaarman.mockitokotlin2.*
+import org.mockito.kotlin.*
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test

lib/android/app/src/test/java/com/reactnativenavigation/views/bottomtabs/BottomTabsTest.kt

@@ -1,9 +1,9 @@
 package com.reactnativenavigation.views.bottomtabs
 
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.never
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import com.reactnativenavigation.BaseTest
 import org.junit.Test