diff options
author | Tim van der Lippe <tvanderlippe@google.com> | 2021-03-16 13:49:10 +0000 |
---|---|---|
committer | Tim van der Lippe <tvanderlippe@google.com> | 2021-03-16 13:49:10 +0000 |
commit | e740c576e46b2391c3a7b9a9394949cc041a81e7 (patch) | |
tree | 1604d579210d8340f5503c495479bc9d009ff254 | |
parent | 68237d06e33540ff0c9000538f7be2ea95125680 (diff) | |
download | mockito-kotlin-e740c576e46b2391c3a7b9a9394949cc041a81e7.tar.gz |
Rename packages to org.mockito.kotlin
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/ArgumentCaptor.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt) | 4 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/BDDMockito.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/KStubbing.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/KStubbing.kt) | 4 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Matchers.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Matchers.kt) | 4 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mocking.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mocking.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mockito.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/MockitoKotlinException.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/MockitoKotlinException.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/OngoingStubbing.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/OngoingStubbing.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Spying.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Spying.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Stubber.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Stubber.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Verification.kt) | 4 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/VerifyScope.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/VerifyScope.kt) | 4 | ||||
-rw-r--r-- | mockito-kotlin/src/main/kotlin/org/mockito/kotlin/internal/CreateInstance.kt (renamed from mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt) | 2 | ||||
-rw-r--r-- | mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt | 2 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/ArgumentCaptorTest.kt | 2 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/BDDMockitoTest.kt | 4 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/EqTest.kt | 4 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/MatchersTest.kt | 3 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/MockingTest.kt | 12 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/OngoingStubbingTest.kt | 3 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/SpyTest.kt | 2 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/StubberTest.kt | 2 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/VerificationTest.kt | 3 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/VerifyTest.kt | 6 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/createinstance/NullCasterTest.kt | 2 | ||||
-rw-r--r-- | tests/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt | 2 |
27 files changed, 46 insertions, 43 deletions
@@ -1,5 +1,5 @@ # Mockito-Kotlin -[ ![Download](https://maven-badges.herokuapp.com/maven-central/com.nhaarman.mockitokotlin2/mockito-kotlin/badge.svg) ](https://maven-badges.herokuapp.com/maven-central/com.nhaarman.mockitokotlin2/mockito-kotlin) +[ ![Download](https://maven-badges.herokuapp.com/maven-central/org.mockito/mockito-kotlin/badge.svg) ](https://maven-badges.herokuapp.com/maven-central/org.mockito/mockito-kotlin) A small library that provides helper functions to work with [Mockito](https://github.com/mockito/mockito) in Kotlin. @@ -9,7 +9,7 @@ Mockito-Kotlin is available on Maven Central and JCenter. For Gradle users, add the following to your `build.gradle`, replacing `x.x.x` with the latest version: ```groovy -testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:x.x.x" +testImplementation "org.mockito:mockito-kotlin:x.x.x" ``` ## Example @@ -33,7 +33,7 @@ fun doAction_doesSomething(){ } ``` -For more info and samples, see the [Wiki](https://github.com/nhaarman/mockito-kotlin/wiki). +For more info and samples, see the [Wiki](https://github.com/mockito/mockito-kotlin/wiki). ## Building diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/ArgumentCaptor.kt index be69337..253a58c 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/ArgumentCaptor.kt @@ -23,9 +23,9 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin -import com.nhaarman.mockitokotlin2.internal.createInstance +import org.mockito.kotlin.internal.createInstance import org.mockito.ArgumentCaptor import kotlin.reflect.KClass diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/BDDMockito.kt index ead224d..867f4c1 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/BDDMockito.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin import org.mockito.BDDMockito import org.mockito.BDDMockito.BDDMyOngoingStubbing diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/KStubbing.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/KStubbing.kt index 4844240..bbf36bf 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/KStubbing.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/KStubbing.kt @@ -23,9 +23,9 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin -import com.nhaarman.mockitokotlin2.internal.createInstance +import org.mockito.kotlin.internal.createInstance import kotlinx.coroutines.runBlocking import org.mockito.Mockito import org.mockito.stubbing.OngoingStubbing diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Matchers.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Matchers.kt index 1d89902..a17da95 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Matchers.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Matchers.kt @@ -23,9 +23,9 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin -import com.nhaarman.mockitokotlin2.internal.createInstance +import org.mockito.kotlin.internal.createInstance import org.mockito.ArgumentMatcher import org.mockito.Mockito diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mocking.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mocking.kt index 521575b..9f6acd2 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mocking.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mocking.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin import org.mockito.Incubating import org.mockito.MockSettings diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mockito.kt index 3f52873..0f80e0c 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mockito.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin import org.mockito.MockingDetails import org.mockito.Mockito diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/MockitoKotlinException.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/MockitoKotlinException.kt index d079b8f..3e209ae 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/MockitoKotlinException.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/MockitoKotlinException.kt @@ -23,6 +23,6 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin class MockitoKotlinException(message: String?, cause: Throwable?) : RuntimeException(message, cause) diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/OngoingStubbing.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/OngoingStubbing.kt index 5ec16be..3d97ce1 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/OngoingStubbing.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/OngoingStubbing.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin import org.mockito.Mockito import org.mockito.invocation.InvocationOnMock diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Spying.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Spying.kt index 340c562..55fa9c0 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Spying.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Spying.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin import org.mockito.Mockito diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Stubber.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Stubber.kt index a6aee54..fb417fc 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Stubber.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Stubber.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin import org.mockito.Mockito import org.mockito.invocation.InvocationOnMock diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Verification.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt index b8e124c..e79dd92 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Verification.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Verification.kt @@ -23,9 +23,9 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin -import com.nhaarman.mockitokotlin2.internal.createInstance +import org.mockito.kotlin.internal.createInstance import kotlinx.coroutines.runBlocking import org.mockito.InOrder import org.mockito.Mockito diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/VerifyScope.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/VerifyScope.kt index 6ef3c33..72ac6e2 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/VerifyScope.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/VerifyScope.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2 +package org.mockito.kotlin /** @@ -43,6 +43,6 @@ inline fun <T> verify(mock: T, block: VerifyScope<T>.() -> Unit) { class VerifyScope<out T>(val mock: T) { operator inline fun Int.times(call: T.() -> Unit) { - verify(mock, com.nhaarman.mockitokotlin2.times(this)).call() + verify(mock, org.mockito.kotlin.times(this)).call() } }
\ No newline at end of file diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/internal/CreateInstance.kt index 4d9b5f5..59ede91 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt +++ b/mockito-kotlin/src/main/kotlin/org/mockito/kotlin/internal/CreateInstance.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -package com.nhaarman.mockitokotlin2.internal +package org.mockito.kotlin.internal import kotlin.reflect.KClass import java.lang.reflect.Array as JavaArray diff --git a/mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt b/mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt index 86d35b2..5ca6eb6 100644 --- a/mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt +++ b/mockito-kotlin/src/test/kotlin/test/CoroutinesTest.kt @@ -3,12 +3,12 @@ package test import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import org.junit.Test +import org.mockito.kotlin.* class CoroutinesTest { diff --git a/tests/src/test/kotlin/test/ArgumentCaptorTest.kt b/tests/src/test/kotlin/test/ArgumentCaptorTest.kt index 10ddb5e..703e750 100644 --- a/tests/src/test/kotlin/test/ArgumentCaptorTest.kt +++ b/tests/src/test/kotlin/test/ArgumentCaptorTest.kt @@ -2,8 +2,8 @@ package test import com.nhaarman.expect.expect import com.nhaarman.expect.expectErrorWithMessage -import com.nhaarman.mockitokotlin2.* import org.junit.Test +import org.mockito.kotlin.* import java.util.* class ArgumentCaptorTest : TestBase() { diff --git a/tests/src/test/kotlin/test/BDDMockitoTest.kt b/tests/src/test/kotlin/test/BDDMockitoTest.kt index 3d43ac4..0472163 100644 --- a/tests/src/test/kotlin/test/BDDMockitoTest.kt +++ b/tests/src/test/kotlin/test/BDDMockitoTest.kt @@ -1,8 +1,8 @@ package test import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.* import org.junit.Test +import org.mockito.kotlin.* import org.mockito.stubbing.Answer class BDDMockitoTest { @@ -126,6 +126,6 @@ class BDDMockitoTest { mock.stringResult() /* Then */ - then(mock).should().stringResult() + org.mockito.kotlin.then(mock).should().stringResult() } } diff --git a/tests/src/test/kotlin/test/EqTest.kt b/tests/src/test/kotlin/test/EqTest.kt index fe993c6..2f64c09 100644 --- a/tests/src/test/kotlin/test/EqTest.kt +++ b/tests/src/test/kotlin/test/EqTest.kt @@ -26,8 +26,8 @@ package test */ import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock import org.junit.After import org.junit.Before import org.junit.Test diff --git a/tests/src/test/kotlin/test/MatchersTest.kt b/tests/src/test/kotlin/test/MatchersTest.kt index 4aea90e..afed69f 100644 --- a/tests/src/test/kotlin/test/MatchersTest.kt +++ b/tests/src/test/kotlin/test/MatchersTest.kt @@ -2,13 +2,14 @@ package test import com.nhaarman.expect.expect import com.nhaarman.expect.expectErrorWithMessage -import com.nhaarman.mockitokotlin2.* import org.junit.Test import org.mockito.ArgumentMatcher import org.mockito.internal.matchers.VarargMatcher import org.mockito.invocation.InvocationOnMock +import org.mockito.kotlin.* import org.mockito.stubbing.Answer import java.io.IOException +import kotlin.check class MatchersTest : TestBase() { diff --git a/tests/src/test/kotlin/test/MockingTest.kt b/tests/src/test/kotlin/test/MockingTest.kt index 0bb19ce..43e6413 100644 --- a/tests/src/test/kotlin/test/MockingTest.kt +++ b/tests/src/test/kotlin/test/MockingTest.kt @@ -3,12 +3,12 @@ package test import com.nhaarman.expect.expect import com.nhaarman.expect.expectErrorWithMessage import com.nhaarman.expect.fail -import com.nhaarman.mockitokotlin2.UseConstructor.Companion.parameterless -import com.nhaarman.mockitokotlin2.UseConstructor.Companion.withArguments -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.UseConstructor.Companion.parameterless +import org.mockito.kotlin.UseConstructor.Companion.withArguments +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import org.junit.Test import org.mockito.Mockito import org.mockito.exceptions.verification.WantedButNotInvoked diff --git a/tests/src/test/kotlin/test/OngoingStubbingTest.kt b/tests/src/test/kotlin/test/OngoingStubbingTest.kt index 64ce9b3..3c9268e 100644 --- a/tests/src/test/kotlin/test/OngoingStubbingTest.kt +++ b/tests/src/test/kotlin/test/OngoingStubbingTest.kt @@ -3,12 +3,13 @@ package test import com.nhaarman.expect.expect import com.nhaarman.expect.expectErrorWithMessage import com.nhaarman.expect.fail -import com.nhaarman.mockitokotlin2.* import org.junit.Assume.assumeFalse import org.junit.Test import org.mockito.Mockito import org.mockito.exceptions.misusing.UnfinishedStubbingException +import org.mockito.kotlin.* import org.mockito.stubbing.Answer +import kotlin.check class OngoingStubbingTest : TestBase() { diff --git a/tests/src/test/kotlin/test/SpyTest.kt b/tests/src/test/kotlin/test/SpyTest.kt index c2f2bca..500faee 100644 --- a/tests/src/test/kotlin/test/SpyTest.kt +++ b/tests/src/test/kotlin/test/SpyTest.kt @@ -26,10 +26,10 @@ package test */ import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.* import org.junit.After import org.junit.Test import org.mockito.Mockito +import org.mockito.kotlin.* import java.util.* class SpyTest : TestBase() { diff --git a/tests/src/test/kotlin/test/StubberTest.kt b/tests/src/test/kotlin/test/StubberTest.kt index 0e7ce65..eb6e28c 100644 --- a/tests/src/test/kotlin/test/StubberTest.kt +++ b/tests/src/test/kotlin/test/StubberTest.kt @@ -2,8 +2,8 @@ package test import com.nhaarman.expect.expect import com.nhaarman.expect.expectErrorWithMessage -import com.nhaarman.mockitokotlin2.* import org.junit.Test +import org.mockito.kotlin.* class StubberTest : TestBase() { diff --git a/tests/src/test/kotlin/test/VerificationTest.kt b/tests/src/test/kotlin/test/VerificationTest.kt index 1858dec..f2f92fd 100644 --- a/tests/src/test/kotlin/test/VerificationTest.kt +++ b/tests/src/test/kotlin/test/VerificationTest.kt @@ -1,9 +1,10 @@ package test import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.* import org.junit.Test import org.mockito.exceptions.base.MockitoAssertionError +import org.mockito.kotlin.* +import org.mockito.kotlin.verify class VerificationTest : TestBase() { diff --git a/tests/src/test/kotlin/test/VerifyTest.kt b/tests/src/test/kotlin/test/VerifyTest.kt index 85915f3..0a93832 100644 --- a/tests/src/test/kotlin/test/VerifyTest.kt +++ b/tests/src/test/kotlin/test/VerifyTest.kt @@ -1,8 +1,8 @@ package test -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import org.junit.Test import org.mockito.exceptions.verification.TooLittleActualInvocations import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent diff --git a/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt b/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt index b214fcc..6d160c7 100644 --- a/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt +++ b/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt @@ -1,7 +1,7 @@ package test.createinstance import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.internal.createInstance +import org.mockito.kotlin.internal.createInstance import org.junit.Test import test.TestBase diff --git a/tests/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt b/tests/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt index 6c69ccb..b03d77e 100644 --- a/tests/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt +++ b/tests/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt @@ -23,10 +23,10 @@ */ import com.nhaarman.expect.expect -import com.nhaarman.mockitokotlin2.* import org.junit.Assume.assumeTrue import org.junit.Before import org.junit.Test +import org.mockito.kotlin.* import test.mockMakerInlineEnabled import java.io.IOException import java.math.BigInteger |