From 0526d37fbda8e3241967bdc29ea3339353736298 Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Wed, 26 Jul 2023 09:26:05 +0200 Subject: [PATCH] Use official version of mockito-kotlin --- uhabits-android/build.gradle.kts | 4 ++-- .../uhabits/HabitsActivityTestComponent.kt | 2 +- .../habits/list/views/HeaderViewTest.kt | 10 +++++----- .../habits/list/views/HintViewTest.kt | 6 +++--- .../org/isoron/uhabits/BaseAndroidJVMTest.kt | 2 +- .../receivers/ReminderControllerTest.kt | 6 +++--- uhabits-core/build.gradle.kts | 2 +- .../org/isoron/uhabits/core/BaseUnitTest.kt | 4 ++-- .../core/models/sqlite/SQLiteHabitListTest.kt | 4 ++-- .../core/preferences/PreferencesTest.kt | 2 +- .../core/reminders/ReminderSchedulerTest.kt | 8 ++++---- .../core/tasks/SingleThreadTaskRunnerTest.kt | 4 ++-- .../habits/list/HabitCardListCacheTest.kt | 8 ++++---- .../ui/screens/habits/list/HintListTest.kt | 6 +++--- .../habits/list/ListHabitsBehaviorTest.kt | 16 ++++++++-------- .../habits/list/ListHabitsMenuBehaviorTest.kt | 18 +++++++++--------- .../ListHabitsSelectionMenuBehaviorTest.kt | 12 ++++++------ .../habits/show/ShowHabitMenuPresenterTest.kt | 6 +++--- .../uhabits/core/ui/views/HistoryChartTest.kt | 8 ++++---- .../core/ui/widgets/WidgetBehaviorTest.kt | 10 +++++----- uhabits-server/build.gradle.kts | 2 +- .../uhabits/sync/app/BaseApplicationTest.kt | 2 +- .../isoron/uhabits/sync/app/LinksModuleTest.kt | 2 +- .../uhabits/sync/app/RegistrationModuleTest.kt | 2 +- .../uhabits/sync/app/StorageModuleTest.kt | 4 ++-- 25 files changed, 75 insertions(+), 75 deletions(-) diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 736ad1caf..d8e3f4060 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -96,7 +96,7 @@ dependencies { androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0") androidTestImplementation("androidx.test:rules:1.5.0") - androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") + androidTestImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11") compileOnly("javax.annotation:jsr250-api:1.0") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") implementation("com.github.AppIntro:AppIntro:6.2.0") @@ -120,7 +120,7 @@ dependencies { kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion") testImplementation("com.google.dagger:dagger:$daggerVersion") testImplementation("junit:junit:4.13.2") - testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") + testImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11") } kapt { diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt index a7a1b2759..38df23db2 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt @@ -19,7 +19,6 @@ package org.isoron.uhabits -import com.nhaarman.mockitokotlin2.mock import dagger.Component import dagger.Module import dagger.Provides @@ -35,6 +34,7 @@ import org.isoron.uhabits.inject.ActivityScope import org.isoron.uhabits.inject.HabitModule import org.isoron.uhabits.inject.HabitsActivityModule import org.isoron.uhabits.inject.HabitsApplicationComponent +import org.mockito.kotlin.mock @Module class TestModule { diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt index 6bf7e2a81..3a972a57c 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.kt @@ -20,15 +20,15 @@ package org.isoron.uhabits.activities.habits.list.views import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions -import com.nhaarman.mockitokotlin2.whenever import org.isoron.uhabits.BaseViewTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) @MediumTest diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt index af1f30df8..f065d8c37 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.kt @@ -20,9 +20,6 @@ package org.isoron.uhabits.activities.habits.list.views import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat import org.isoron.uhabits.BaseViewTest @@ -30,6 +27,9 @@ import org.isoron.uhabits.core.ui.screens.habits.list.HintList import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) @MediumTest diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt index a6a1e5021..ccfb1b453 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt +++ b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.kt @@ -18,7 +18,6 @@ */ package org.isoron.uhabits -import com.nhaarman.mockitokotlin2.spy import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.memory.MemoryModelFactory @@ -31,6 +30,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.junit.MockitoJUnitRunner +import org.mockito.kotlin.spy @RunWith(MockitoJUnitRunner::class) open class BaseAndroidJVMTest { diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt index a855a9018..0c6bfe84f 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt +++ b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.kt @@ -18,9 +18,6 @@ */ package org.isoron.uhabits.receivers -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import org.isoron.uhabits.BaseAndroidJVMTest import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.Timestamp @@ -28,6 +25,9 @@ import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.reminders.ReminderScheduler import org.isoron.uhabits.core.ui.NotificationTray import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions class ReminderControllerTest : BaseAndroidJVMTest() { private lateinit var controller: ReminderController diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts index c0854f067..3b28fb535 100644 --- a/uhabits-core/build.gradle.kts +++ b/uhabits-core/build.gradle.kts @@ -61,7 +61,7 @@ kotlin { implementation("org.xerial:sqlite-jdbc:3.40.0.0") implementation("org.hamcrest:hamcrest:2.2") implementation("org.apache.commons:commons-io:1.3.2") - implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") + implementation("org.mockito.kotlin:mockito-kotlin:2.2.11") } } } diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt index 4079600ab..b8fd183db 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/BaseUnitTest.kt @@ -18,8 +18,6 @@ */ package org.isoron.uhabits.core -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.validateMockitoUsage import org.apache.commons.io.IOUtils import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.database.Database @@ -40,6 +38,8 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.junit.MockitoJUnitRunner +import org.mockito.kotlin.spy +import org.mockito.kotlin.validateMockitoUsage import java.io.File import java.io.FileInputStream import java.io.FileOutputStream diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt index d432920a3..c6cb93ec8 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.kt @@ -18,8 +18,6 @@ */ package org.isoron.uhabits.core.models.sqlite -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import junit.framework.Assert.assertNull import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat @@ -37,6 +35,8 @@ import org.isoron.uhabits.core.test.HabitFixtures import org.junit.Rule import org.junit.Test import org.junit.rules.ExpectedException +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import java.util.ArrayList class SQLiteHabitListTest : BaseUnitTest() { diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt index 52117c181..2f54ac25a 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/preferences/PreferencesTest.kt @@ -18,7 +18,6 @@ */ package org.isoron.uhabits.core.preferences -import com.nhaarman.mockitokotlin2.mock import junit.framework.Assert.assertFalse import junit.framework.Assert.assertNull import junit.framework.Assert.assertTrue @@ -30,6 +29,7 @@ import org.isoron.uhabits.core.models.Timestamp.Companion.ZERO import org.isoron.uhabits.core.ui.ThemeSwitcher import org.junit.Before import org.junit.Test +import org.mockito.kotlin.mock import java.io.File class PreferencesTest : BaseUnitTest() { diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt index e9eb93cdf..8772ce4d3 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.kt @@ -18,10 +18,6 @@ */ package org.isoron.uhabits.core.reminders -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.Reminder @@ -37,6 +33,10 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyLong import org.mockito.junit.MockitoJUnitRunner +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import java.util.Calendar import java.util.TimeZone diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt index 0dbc97bfd..6bb10c0c9 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.kt @@ -18,12 +18,12 @@ */ package org.isoron.uhabits.core.tasks -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.mock import org.isoron.uhabits.core.BaseUnitTest import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.mock @RunWith(JUnit4::class) class SingleThreadTaskRunnerTest : BaseUnitTest() { diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt index 97da833a5..e3ff88c18 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.kt @@ -18,10 +18,6 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.reset -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat import org.isoron.uhabits.core.BaseUnitTest @@ -30,6 +26,10 @@ import org.isoron.uhabits.core.commands.DeleteHabitsCommand import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.reset +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions class HabitCardListCacheTest : BaseUnitTest() { private lateinit var cache: HabitCardListCache diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt index 1bc588d9a..b420604b8 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt @@ -18,9 +18,6 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever import junit.framework.Assert.assertFalse import junit.framework.Assert.assertNull import junit.framework.Assert.assertTrue @@ -31,6 +28,9 @@ import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever class HintListTest : BaseUnitTest() { private lateinit var hintList: HintList diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt index c5e5f7b44..6926b4384 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt @@ -18,14 +18,6 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list -import com.nhaarman.mockitokotlin2.KArgumentCaptor -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever import junit.framework.Assert.assertFalse import junit.framework.Assert.assertTrue import org.apache.commons.io.FileUtils @@ -39,6 +31,14 @@ import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday import org.isoron.uhabits.core.utils.DateUtils.Companion.getTodayWithOffset import org.junit.Before import org.junit.Test +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import java.io.IOException import java.nio.file.Files diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt index 2485c8ba5..466daa304 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.kt @@ -18,15 +18,6 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list -import com.nhaarman.mockitokotlin2.KArgumentCaptor -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.clearInvocations -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions -import com.nhaarman.mockitokotlin2.whenever import junit.framework.Assert.assertFalse import junit.framework.Assert.assertTrue import org.hamcrest.MatcherAssert.assertThat @@ -37,6 +28,15 @@ import org.isoron.uhabits.core.models.HabitMatcher import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.ThemeSwitcher import org.junit.Test +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.clearInvocations +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever class ListHabitsMenuBehaviorTest : BaseUnitTest() { private lateinit var behavior: ListHabitsMenuBehavior diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt index 56fe20a3f..b67a43d8e 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt @@ -18,12 +18,6 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list -import com.nhaarman.mockitokotlin2.KArgumentCaptor -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever import junit.framework.Assert.assertFalse import junit.framework.Assert.assertNull import junit.framework.Assert.assertTrue @@ -35,6 +29,12 @@ import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback import org.junit.Test +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever class ListHabitsSelectionMenuBehaviorTest : BaseUnitTest() { private val screen: ListHabitsSelectionMenuBehavior.Screen = mock() diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt index aac1cf320..cbb889f82 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.kt @@ -18,15 +18,15 @@ */ package org.isoron.uhabits.core.ui.screens.habits.show -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever import org.apache.commons.io.FileUtils import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Habit import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import java.nio.file.Files class ShowHabitMenuPresenterTest : BaseUnitTest() { diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt index b2b8d6871..72cfb8b7e 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt @@ -19,10 +19,6 @@ package org.isoron.uhabits.core.ui.views -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.reset -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import kotlinx.coroutines.runBlocking import org.isoron.platform.gui.assertRenders import org.isoron.platform.time.DayOfWeek @@ -35,6 +31,10 @@ import org.isoron.uhabits.core.ui.views.HistoryChart.Square.HATCHED import org.isoron.uhabits.core.ui.views.HistoryChart.Square.OFF import org.isoron.uhabits.core.ui.views.HistoryChart.Square.ON import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.reset +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions import java.util.Locale class HistoryChartTest { diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt index 087bf341f..27a1c8cba 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt @@ -18,11 +18,6 @@ */ package org.isoron.uhabits.core.ui.widgets -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.reset -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyZeroInteractions -import com.nhaarman.mockitokotlin2.whenever import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.commands.CreateRepetitionCommand import org.isoron.uhabits.core.models.Entry @@ -34,6 +29,11 @@ import org.isoron.uhabits.core.ui.NotificationTray import org.isoron.uhabits.core.utils.DateUtils.Companion.getTodayWithOffset import org.junit.Before import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.reset +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.whenever class WidgetBehaviorTest : BaseUnitTest() { private lateinit var notificationTray: NotificationTray diff --git a/uhabits-server/build.gradle.kts b/uhabits-server/build.gradle.kts index 9a59b33a8..a96d02131 100644 --- a/uhabits-server/build.gradle.kts +++ b/uhabits-server/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { implementation("io.prometheus:simpleclient_httpserver:0.16.0") implementation("io.prometheus:simpleclient_hotspot:0.16.0") testImplementation("io.ktor:ktor-server-tests:$ktorVersion") - testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") + testImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) } diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt index 7b5c6d27b..3c1aa33dd 100644 --- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt +++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/BaseApplicationTest.kt @@ -19,7 +19,7 @@ package org.isoron.uhabits.sync.app -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import io.ktor.application.* import org.isoron.uhabits.sync.server.* diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt index ef2bc8963..7ee49aa14 100644 --- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt +++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/LinksModuleTest.kt @@ -19,7 +19,7 @@ package org.isoron.uhabits.sync.app -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import io.ktor.http.ContentType import io.ktor.http.HttpHeaders import io.ktor.http.HttpMethod diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt index 8fa80883a..8b5710743 100644 --- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt +++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/RegistrationModuleTest.kt @@ -19,7 +19,7 @@ package org.isoron.uhabits.sync.app -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import io.ktor.http.HttpMethod import io.ktor.http.HttpStatusCode import io.ktor.server.testing.handleRequest diff --git a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt index 7609587e0..36872a194 100644 --- a/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt +++ b/uhabits-server/src/test/kotlin/org/isoron/uhabits/sync/app/StorageModuleTest.kt @@ -19,8 +19,8 @@ package org.isoron.uhabits.sync.app -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import io.ktor.http.* import io.ktor.server.testing.* import kotlinx.coroutines.*