Skip to content

Commit 0cc78ba

Browse files
committed
Merge pull request #3 from nhaarman/release-0.1.3
Release 0.1.3
2 parents c4bde0f + 65d6a5f commit 0cc78ba

File tree

2 files changed

+13
-0
lines changed
  • mockito-kotlin/src

2 files changed

+13
-0
lines changed

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Any.kt

+4
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ private fun <T : Any> createInstance(jClass: Class<T>): T {
8282
return jClass.toArrayInstance()
8383
}
8484

85+
jClass.kotlin.objectInstance?.let {
86+
return it
87+
}
88+
8589
val constructor = jClass.constructors
8690
.sortedBy { it.parameterTypes.size }
8791
.first()

mockito-kotlin/src/test/kotlin/AnyTest.kt

+9
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,15 @@ class AnyTest {
369369
expect(result).toBe(MyEnum.VALUE)
370370
}
371371

372+
@Test
373+
fun anyUnit() {
374+
/* When */
375+
val result = any<Unit>()
376+
377+
/* Then */
378+
expect(result).toBe(Unit)
379+
}
380+
372381
class ClosedClass
373382
class ClosedParameterizedClass(val fake: Fake)
374383
class ClosedClosedParameterizedClass(val closed: ClosedParameterizedClass)

0 commit comments

Comments
 (0)