From 8d2aebaf7f9a0b00d47a6db77db7482c5ab633ef Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Wed, 27 Jan 2021 11:22:56 +0100 Subject: [PATCH] Delete obsolete mockito dependencies --- uhabits-android/build.gradle.kts | 3 --- uhabits-core/build.gradle.kts | 1 - .../core/ui/screens/habits/list/HintListTest.kt | 2 -- .../isoron/uhabits/core/ui/views/HistoryChartTest.kt | 10 +++++----- uhabits-server/build.gradle.kts | 1 - 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 74ca26df4..79145006b 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -80,7 +80,6 @@ dependencies { androidTestImplementation("com.linkedin.testbutler:test-butler-library:2.1.1") androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion") androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion") - androidTestImplementation("org.mockito:mockito-core:2.28.2") androidTestImplementation("androidx.annotation:annotation:1.1.0") androidTestImplementation("androidx.test.ext:junit:1.1.2") androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0") @@ -110,8 +109,6 @@ dependencies { kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion") testImplementation("com.google.dagger:dagger:$daggerVersion") testImplementation("junit:junit:4.13.1") - testImplementation("org.mockito:mockito-core:2.28.2") - testImplementation("org.mockito:mockito-inline:2.8.9") testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") } diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts index 4c6faaa6e..1785a6f6f 100644 --- a/uhabits-core/build.gradle.kts +++ b/uhabits-core/build.gradle.kts @@ -63,7 +63,6 @@ kotlin { implementation("org.hamcrest:hamcrest:2.1") implementation("nl.jqno.equalsverifier:equalsverifier:2.4.8") implementation("org.apache.commons:commons-io:1.3.2") - implementation("org.mockito:mockito-core:2.28.2") implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") } } 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 333236614..1bc588d9a 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 @@ -31,13 +31,11 @@ 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.Mock class HintListTest : BaseUnitTest() { private lateinit var hintList: HintList private lateinit var hints: Array - @Mock private val prefs: Preferences = mock() private lateinit var today: Timestamp private lateinit var yesterday: Timestamp 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 4a511c04b..bce63bcec 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,6 +19,10 @@ 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 @@ -31,16 +35,12 @@ 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.Mockito.mock -import org.mockito.Mockito.reset -import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyNoMoreInteractions import java.util.Locale class HistoryChartTest { val base = "views/HistoryChart" - private val dateClickedListener = mock(OnDateClickedListener::class.java)!! + private val dateClickedListener: OnDateClickedListener = mock() val view = HistoryChart( today = LocalDate(2015, 1, 25), diff --git a/uhabits-server/build.gradle.kts b/uhabits-server/build.gradle.kts index 7e2fe8775..bbc70af70 100644 --- a/uhabits-server/build.gradle.kts +++ b/uhabits-server/build.gradle.kts @@ -47,7 +47,6 @@ dependencies { implementation("io.prometheus:simpleclient_httpserver:0.10.0") implementation("io.prometheus:simpleclient_hotspot:0.9.0") testImplementation("io.ktor:ktor-server-tests:$ktorVersion") - testImplementation("org.mockito:mockito-core:2.28.2") testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") }