Merge pull request #28 from nhaarman/create-class-objects

Account for Class<T> when creating instances.
mockito · Mar 27, 2016 · 129f9e6 · 129f9e6
2 parents a013a48 + ae4ab17
commit 129f9e6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/CreateInstance.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/CreateInstance.kt
@@ -37,6 +37,7 @@ import kotlin.reflect.KType
 import kotlin.reflect.defaultType
 import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.javaType
+import kotlin.reflect.jvm.jvmName
 
 /**
  * A collection of functions that tries to create an instance of
@@ -54,6 +55,7 @@ fun <T : Any> createInstance(kClass: KClass<T>): T {
         kClass.isPrimitive() -> kClass.toDefaultPrimitiveValue()
         kClass.isEnum() -> kClass.java.enumConstants.first()
         kClass.isArray() -> kClass.toArrayInstance()
+        kClass.isClassObject() -> kClass.toClassObject()
         else -> kClass.easiestConstructor().newInstance()
     }
 }
@@ -84,6 +86,7 @@ private fun KClass<*>.hasObjectInstance() = objectInstance != null
 private fun KClass<*>.isMockable() = !Modifier.isFinal(java.modifiers)
 private fun KClass<*>.isEnum() = java.isEnum
 private fun KClass<*>.isArray() = java.isArray
+private fun KClass<*>.isClassObject() = jvmName.equals("java.lang.Class")
 private fun KClass<*>.isPrimitive() =
         java.isPrimitive || !defaultType.isMarkedNullable && simpleName in arrayOf(
                 "Boolean",
@@ -124,6 +127,11 @@ private fun <T : Any> KClass<T>.toArrayInstance(): T {
     } as T
 }
 
+@Suppress("UNCHECKED_CAST")
+private fun <T : Any> KClass<T>.toClassObject(): T {
+    return Class.forName("java.lang.Object") as T
+}
+
 private fun <T : Any> KFunction<T>.newInstance(): T {
     isAccessible = true
     return callBy(parameters.associate {

diff --git a/mockito-kotlin/src/test/kotlin/CreateInstanceTest.kt b/mockito-kotlin/src/test/kotlin/CreateInstanceTest.kt
@@ -27,6 +27,7 @@ import com.nhaarman.expect.expect
 import com.nhaarman.mockito_kotlin.createInstance
 import org.junit.Test
 import java.util.*
+import kotlin.reflect.KClass
 
 class CreateInstanceTest {
 
@@ -369,6 +370,24 @@ class CreateInstanceTest {
         expect(result).toNotBeNull()
     }
 
+    @Test
+    fun classObject() {
+        /* When */
+        val result = createInstance<Class<String>>()
+
+        /* Then */
+        expect(result).toNotBeNull()
+    }
+
+    @Test
+    fun kClassObject() {
+        /* When */
+        val result = createInstance<KClass<String>>()
+
+        /* Then */
+        expect(result).toNotBeNull()
+    }
+
     @Test
     fun uuid() {
         /**