Skip to content

Commit 6330fe3

Browse files
nhaarmannhaarman
authored
Merge pull request #150 from nhaarman/release-1.2.0
Release 1.2.0
2 parents 3dbe0d0 + 26a139f commit 6330fe3

File tree

7 files changed

+484
-208
lines changed

7 files changed

+484
-208
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ matrix:
77
- jdk: oraclejdk7
88
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.6
99
- jdk: oraclejdk7
10-
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M04
10+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.0-beta-18
1111
- jdk: oraclejdk8
1212
env: TERM=dumb KOTLIN_VERSION=1.0.6
1313
- jdk: oraclejdk8
14-
env: TERM=dumb KOTLIN_VERSION=1.1-M04
14+
env: TERM=dumb KOTLIN_VERSION=1.1.0-beta-18
1515

1616

1717
env:

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎mockito-kotlin/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313

1414
dependencies {
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
16-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.11"
16+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.13"
1717
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
1818
classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
1919
}
@@ -28,11 +28,11 @@ repositories {
2828
dependencies {
2929
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3030
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
31-
compile "org.mockito:mockito-core:2.4.5"
31+
compile "org.mockito:mockito-core:2.6.5"
3232

3333
/* Tests */
3434
testCompile "junit:junit:4.12"
35-
testCompile "com.nhaarman:expect.kt:0.6.0"
35+
testCompile "com.nhaarman:expect.kt:0.6.2"
3636
}
3737

3838
dokka {

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Mockito.kt

Lines changed: 94 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
package com.nhaarman.mockito_kotlin
2727

2828
import com.nhaarman.mockito_kotlin.createinstance.createInstance
29-
import org.mockito.InOrder
30-
import org.mockito.MockSettings
31-
import org.mockito.MockingDetails
32-
import org.mockito.Mockito
29+
import org.mockito.*
3330
import org.mockito.invocation.InvocationOnMock
31+
import org.mockito.listeners.InvocationListener
32+
import org.mockito.mock.SerializableMode
3433
import org.mockito.stubbing.Answer
3534
import org.mockito.stubbing.OngoingStubbing
3635
import org.mockito.stubbing.Stubber
3736
import org.mockito.verification.VerificationMode
3837
import org.mockito.verification.VerificationWithTimeout
38+
import kotlin.DeprecationLevel.WARNING
3939
import kotlin.reflect.KClass
4040

4141
fun after(millis: Long) = Mockito.after(millis)
@@ -74,7 +74,7 @@ inline fun <reified T : Any> argForWhich(noinline predicate: T.() -> Boolean) =
7474
*
7575
* @param predicate A function that returns `true` when given [T] matches the predicate.
7676
*/
77-
inline fun <reified T: Any> argWhere(noinline predicate: (T) -> Boolean) = argThat(predicate)
77+
inline fun <reified T : Any> argWhere(noinline predicate: (T) -> Boolean) = argThat(predicate)
7878

7979
/**
8080
* For usage with verification only.
@@ -120,16 +120,70 @@ inline fun <reified T : Any> isA(): T = Mockito.isA(T::class.java) ?: createInst
120120
fun <T : Any> isNotNull(): T? = Mockito.isNotNull()
121121
fun <T : Any> isNull(): T? = Mockito.isNull()
122122

123-
inline fun <reified T : Any> mock(): T = Mockito.mock(T::class.java)!!
124-
inline fun <reified T : Any> mock(defaultAnswer: Answer<Any>): T = Mockito.mock(T::class.java, defaultAnswer)!!
123+
inline fun <reified T : Any> mock(
124+
extraInterfaces: Array<KClass<out Any>>? = null,
125+
name: String? = null,
126+
spiedInstance: Any? = null,
127+
defaultAnswer: Answer<Any>? = null,
128+
serializable: Boolean = false,
129+
serializableMode: SerializableMode? = null,
130+
verboseLogging: Boolean = false,
131+
invocationListeners: Array<InvocationListener>? = null,
132+
stubOnly: Boolean = false,
133+
@Incubating useConstructor: Boolean = false,
134+
@Incubating outerInstance: Any? = null
135+
): T = Mockito.mock(T::class.java, withSettings(
136+
extraInterfaces = extraInterfaces,
137+
name = name,
138+
spiedInstance = spiedInstance,
139+
defaultAnswer = defaultAnswer,
140+
serializable = serializable,
141+
serializableMode = serializableMode,
142+
verboseLogging = verboseLogging,
143+
invocationListeners = invocationListeners,
144+
stubOnly = stubOnly,
145+
useConstructor = useConstructor,
146+
outerInstance = outerInstance
147+
))!!
148+
149+
inline fun <reified T : Any> mock(
150+
extraInterfaces: Array<KClass<out Any>>? = null,
151+
name: String? = null,
152+
spiedInstance: Any? = null,
153+
defaultAnswer: Answer<Any>? = null,
154+
serializable: Boolean = false,
155+
serializableMode: SerializableMode? = null,
156+
verboseLogging: Boolean = false,
157+
invocationListeners: Array<InvocationListener>? = null,
158+
stubOnly: Boolean = false,
159+
@Incubating useConstructor: Boolean = false,
160+
@Incubating outerInstance: Any? = null,
161+
stubbing: KStubbing<T>.(T) -> Unit
162+
): T = Mockito.mock(T::class.java, withSettings(
163+
extraInterfaces = extraInterfaces,
164+
name = name,
165+
spiedInstance = spiedInstance,
166+
defaultAnswer = defaultAnswer,
167+
serializable = serializable,
168+
serializableMode = serializableMode,
169+
verboseLogging = verboseLogging,
170+
invocationListeners = invocationListeners,
171+
stubOnly = stubOnly,
172+
useConstructor = useConstructor,
173+
outerInstance = outerInstance
174+
)).apply {
175+
KStubbing(this).stubbing(this)
176+
}!!
177+
178+
@Deprecated("Use mock() with optional arguments instead.", ReplaceWith("mock<T>(defaultAnswer = a)"), level = WARNING)
179+
inline fun <reified T : Any> mock(a: Answer<Any>): T = mock(defaultAnswer = a)
180+
181+
@Deprecated("Use mock() with optional arguments instead.", ReplaceWith("mock<T>(name = s)"), level = WARNING)
182+
inline fun <reified T : Any> mock(s: String): T = mock(name = s)
183+
184+
@Suppress("DeprecatedCallableAddReplaceWith")
185+
@Deprecated("Use mock() with optional arguments instead.", level = WARNING)
125186
inline fun <reified T : Any> mock(s: MockSettings): T = Mockito.mock(T::class.java, s)!!
126-
inline fun <reified T : Any> mock(s: String): T = Mockito.mock(T::class.java, s)!!
127-
128-
inline fun <reified T : Any> mock(stubbing: KStubbing<T>.(T) -> Unit): T {
129-
return mock<T>().apply {
130-
KStubbing(this).stubbing(this)
131-
}
132-
}
133187

134188
class KStubbing<out T>(private val mock: T) {
135189
fun <R> on(methodCall: R) = Mockito.`when`(methodCall)
@@ -193,4 +247,29 @@ fun <T> verifyNoMoreInteractions(vararg mocks: T) = Mockito.verifyNoMoreInteract
193247
fun verifyZeroInteractions(vararg mocks: Any) = Mockito.verifyZeroInteractions(*mocks)
194248

195249
fun <T> whenever(methodCall: T): OngoingStubbing<T> = Mockito.`when`(methodCall)!!
196-
fun withSettings(): MockSettings = Mockito.withSettings()!!
250+
251+
fun withSettings(
252+
extraInterfaces: Array<KClass<out Any>>? = null,
253+
name: String? = null,
254+
spiedInstance: Any? = null,
255+
defaultAnswer: Answer<Any>? = null,
256+
serializable: Boolean = false,
257+
serializableMode: SerializableMode? = null,
258+
verboseLogging: Boolean = false,
259+
invocationListeners: Array<InvocationListener>? = null,
260+
stubOnly: Boolean = false,
261+
@Incubating useConstructor: Boolean = false,
262+
@Incubating outerInstance: Any? = null
263+
): MockSettings = Mockito.withSettings().apply {
264+
extraInterfaces?.let { extraInterfaces(*it.map { it.java }.toTypedArray()) }
265+
name?.let { name(it) }
266+
spiedInstance?.let { spiedInstance(it) }
267+
defaultAnswer?.let { defaultAnswer(it) }
268+
if (serializable) serializable()
269+
serializableMode?.let { serializable(it) }
270+
if (verboseLogging) verboseLogging()
271+
invocationListeners?.let { invocationListeners(*it) }
272+
if (stubOnly) stubOnly()
273+
if (useConstructor) useConstructor()
274+
outerInstance?.let { outerInstance(it) }
275+
}

‎mockito-kotlin/src/test/kotlin/test/Classes.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ interface Methods {
6060
fun stringResult(s: String): String
6161
fun nullableStringResult(): String?
6262
fun builderMethod(): Methods
63+
64+
fun nonDefaultReturnType(): ExtraInterface
65+
}
66+
67+
interface ExtraInterface
68+
69+
abstract class ThrowingConstructor {
70+
71+
constructor() {
72+
error("Error in constructor")
73+
}
6374
}
6475

6576
interface GenericMethods<T> {

0 commit comments

Comments
 (0)