isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #743 from hiqua/update_mockito

Browse Source 
Delete obsolete mockito dependencies
This commit is contained in:
Alinson S. Xavier
2021-01-27 20:01:40 -06:00
committed by GitHub
parent f36bc788c7 8d2aebaf7f
commit b80344a443
5 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
uhabits-android/build.gradle.kts
View File

@@ -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")
}

1
uhabits-core/build.gradle.kts
View File

@@ -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")
}
}

2
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.kt
View File

@@ -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<String>
@Mock
private val prefs: Preferences = mock()
private lateinit var today: Timestamp
private lateinit var yesterday: Timestamp

10
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
View File

@@ -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),

1
uhabits-server/build.gradle.kts
View File

@@ -47,7 +47,6 @@ dependencies {
implementation("io.prometheus:simpleclient_httpserver:0.10.0")
implementation("io.prometheus:simpleclient_hotspot:0.10.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")
}