Merge pull request mockito#1 from nhaarman/release-0.1.1

Release 0.1.1
neworld · Jan 24, 2016 · 78505b7 · 78505b7
2 parents b113029 + b5a4e87
commit 78505b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Any.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Any.kt
@@ -74,6 +74,10 @@ private fun <T : Any> createInstance(jClass: Class<T>): T {
         return defaultPrimitive(jClass)
     }
 
+    if (jClass.isEnum) {
+        return  jClass.enumConstants.first()
+    }
+
     if (jClass.isArray) {
         return jClass.toArrayInstance()
     }

diff --git a/mockito-kotlin/src/test/kotlin/AnyTest.kt b/mockito-kotlin/src/test/kotlin/AnyTest.kt
@@ -27,7 +27,6 @@ import com.nhaarman.expect.expect
 import com.nhaarman.mockito_kotlin.any
 import com.nhaarman.mockito_kotlin.anyArray
 import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.verify
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -377,6 +376,15 @@ class AnyTest {
         expect(result).toNotBeNull()
     }
 
+    @Test
+    fun anyEnum() {
+        /* When */
+        val result = any<MyEnum>()
+
+        /* Then */
+        expect(result).toBe(MyEnum.VALUE)
+    }
+
     open class Fake {
         open fun go(arg: Any?) {
         }
@@ -404,4 +412,6 @@ class AnyTest {
 
     class ParameterizedClass<T>(val t: T)
     class NullableParameterClass(val s: String?)
+
+    enum class MyEnum { VALUE, ANOTHER_VALUE }
 }