Strip methods from file identifiers.

mockito · Oct 3, 2016 · 1d65fc0 · 1d65fc0
1 parent 1025568
commit 1d65fc0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/MockitoKotlin.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/MockitoKotlin.kt
@@ -78,6 +78,8 @@ class MockitoKotlin {
                     ?.second
         }
 
-        private fun StackTraceElement.toFileIdentifier() = "$fileName$className"
+        private fun StackTraceElement.toFileIdentifier() = "$fileName$className".let {
+            if (it.contains("$")) it.substring(0..it.indexOf("$") - 1) else it
+        }
     }
 }
diff --git a/mockito-kotlin/src/test/kotlin/MockitoKotlinTest.kt b/mockito-kotlin/src/test/kotlin/MockitoKotlinTest.kt
@@ -24,12 +24,17 @@
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.MockitoKotlin
-import com.nhaarman.mockito_kotlin.createInstance
+import com.nhaarman.mockito_kotlin.*
+import org.junit.After
 import org.junit.Test
 
 class MockitoKotlinTest {
 
+    @After
+    fun teardown() {
+        MockitoKotlin.resetInstanceCreators()
+    }
+
     @Test
     fun register() {
         /* Given */
@@ -56,4 +61,18 @@ class MockitoKotlinTest {
         /* Then */
         expect(result).toNotBeTheSameAs(closed)
     }
+
+    @Test
+    fun usingInstanceCreatorInsideLambda() {
+        MockitoKotlin.registerInstanceCreator { CreateInstanceTest.ForbiddenConstructor(2) }
+
+        mock<TestClass> {
+            on { doSomething(any()) } doReturn ""
+        }
+    }
+
+    interface TestClass {
+
+        fun doSomething(c: CreateInstanceTest.ForbiddenConstructor): String
+    }
 }