Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Mockito-kotlin dependency updated #148

Merged
merged 2 commits into from
Jul 15, 2021
Merged

Mockito-kotlin dependency updated #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459e5ae
Mockito-kotlin dependency updated.
Jul 12, 2021
f97d8f0
Removed wildcard imports.
Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binder/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {

testImplementation deps('junit:junit')
testImplementation deps('org.jetbrains.kotlin:kotlin-test-junit')
testImplementation deps('com.nhaarman:mockito-kotlin')
testImplementation deps('org.mockito.kotlin:mockito-kotlin')
}

sourceCompatibility = "1.7"
Expand Down
8 changes: 4 additions & 4 deletions binder/src/test/java/com/badoo/binder/LifecycleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package com.badoo.binder

import com.badoo.binder.lifecycle.Lifecycle
import com.badoo.binder.lifecycle.ManualLifecycle
import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.times
import com.nhaarman.mockito_kotlin.verify
import io.reactivex.ObservableSource
import io.reactivex.functions.Consumer
import io.reactivex.subjects.PublishSubject
import org.junit.Test
import org.mockito.kotlin.any
import org.mockito.kotlin.mock
import org.mockito.kotlin.times
import org.mockito.kotlin.verify


class LifecycleTest {
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ext {
junitVersion = '4.12'
kluentVersion = '1.23'
supportTestVersion = '1.3.0'
mockitoKotlinVersion = '1.3.0'
mockitoKotlinVersion = '3.2.0'

depsWithVersion = [
// Kotlin
Expand Down Expand Up @@ -100,7 +100,7 @@ ext {
"junit:junit" : junitVersion,
"org.jetbrains.kotlin:kotlin-test-junit" : kotlinVersion,
"org.amshove.kluent:kluent" : kluentVersion,
"com.nhaarman:mockito-kotlin" : mockitoKotlinVersion,
"org.mockito.kotlin:mockito-kotlin" : mockitoKotlinVersion,
"androidx.test:runner" : supportTestVersion,
"androidx.test:orchestrator" : supportTestVersion,
"androidx.test:rules" : supportTestVersion,
Expand Down
2 changes: 1 addition & 1 deletion mvicore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
testImplementation deps('junit:junit')
testImplementation deps('org.jetbrains.kotlin:kotlin-test-junit')
testImplementation deps('org.amshove.kluent:kluent')
testImplementation deps('com.nhaarman:mockito-kotlin')
testImplementation deps('org.mockito.kotlin:mockito-kotlin')
}

sourceCompatibility = "1.7"
Expand Down
10 changes: 5 additions & 5 deletions mvicore/src/test/java/com/badoo/mvicore/newspublishing/NewsPublishingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ import com.badoo.mvicore.newspublishing.TestNews.News3
import com.badoo.mvicore.newspublishing.TestWish.Wish1
import com.badoo.mvicore.newspublishing.TestWish.Wish2
import com.badoo.mvicore.newspublishing.TestWish.Wish3
import com.nhaarman.mockito_kotlin.argumentCaptor
import com.nhaarman.mockito_kotlin.spy
import com.nhaarman.mockito_kotlin.times
import com.nhaarman.mockito_kotlin.verify
import com.nhaarman.mockito_kotlin.whenever
import io.reactivex.Observable
import io.reactivex.functions.Consumer
import io.reactivex.observers.TestObserver
Expand All @@ -32,6 +27,11 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
import org.junit.runners.Parameterized.Parameters
import org.mockito.kotlin.argumentCaptor
import org.mockito.kotlin.spy
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import kotlin.test.assertEquals

sealed class TestWish {
Expand Down