diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt index 4d9b5f5b..03acadba 100644 --- a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt +++ b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/CreateInstance.kt @@ -38,6 +38,7 @@ inline fun createInstance(): T { Long::class -> 0L as T Float::class -> 0f as T Double::class -> 0.0 as T + String::class -> "" as T else -> createInstance(T::class) } } diff --git a/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt b/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt index b214fcc0..6352805f 100644 --- a/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt +++ b/tests/src/test/kotlin/test/createinstance/NullCasterTest.kt @@ -11,7 +11,7 @@ class NullCasterTest : TestBase() { @Test fun createInstance() { /* When */ - val result = createInstance(String::class) + val result = createInstance(Any::class) /* Then */ expect(result).toBeNull() @@ -20,12 +20,12 @@ class NullCasterTest : TestBase() { @Test fun kotlinAcceptsNullValue() { /* Given */ - val s: String = createInstance(String::class) + val mockObject: Any = createInstance(Any::class) /* When */ - acceptNonNullableString(s) + acceptNonNullableObject(mockObject) } - private fun acceptNonNullableString(@Suppress("UNUSED_PARAMETER") s: String) { + private fun acceptNonNullableObject(@Suppress("UNUSED_PARAMETER") mockObject: Any) { } }