- fixing capture nullable

- remove synchronized warning
mockk · Apr 19, 2020 · e79f1fb · e79f1fb
1 parent 449a527
commit e79f1fb
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 26 deletions.
diff --git a/dsl/common/src/main/kotlin/io/mockk/API.kt b/dsl/common/src/main/kotlin/io/mockk/API.kt
@@ -683,7 +683,7 @@ open class MockKMatcherScope(
     inline fun <reified T : Any> any(): T = match(ConstantMatcher(true))
     inline fun <reified T : Any> capture(lst: MutableList<T>): T = match(CaptureMatcher(lst, T::class))
     inline fun <reified T : Any> capture(lst: CapturingSlot<T>): T = match(CapturingSlotMatcher(lst, T::class))
-    inline fun <reified T : Any> captureNullable(lst: MutableList<T?>): T = match(CaptureNullableMatcher(lst, T::class))
+    inline fun <reified T : Any> captureNullable(lst: MutableList<T?>): T? = match(CaptureNullableMatcher(lst, T::class))
     inline fun <reified T : Comparable<T>> cmpEq(value: T): T = match(ComparingMatcher(value, 0, T::class))
     inline fun <reified T : Comparable<T>> more(value: T, andEquals: Boolean = false): T =
         match(ComparingMatcher(value, if (andEquals) 2 else 1, T::class))
@@ -3763,7 +3763,7 @@ data class InvocationMatcher(
             }
         }
 
-        for (i in 0 until invocation.args.size) {
+        for (i in invocation.args.indices) {
             val matcher = args[i]
             val arg = invocation.args[i]
 

diff --git a/dsl/common/src/main/kotlin/io/mockk/Matchers.kt b/dsl/common/src/main/kotlin/io/mockk/Matchers.kt
@@ -105,7 +105,7 @@ data class CaptureNullableMatcher<T : Any>(
     val captureList: MutableList<T?>,
     override val argumentType: KClass<*>
 ) : Matcher<T>, CapturingMatcher, TypedMatcher, EquivalentMatcher {
-    override fun equivalent(): Matcher<Any> = ConstantMatcher<Any>(true)
+    override fun equivalent(): Matcher<Any> = ConstantMatcher(true)
 
     @Suppress("UNCHECKED_CAST")
     override fun capture(arg: Any?) {
@@ -114,7 +114,15 @@ data class CaptureNullableMatcher<T : Any>(
 
     override fun match(arg: T?): Boolean = true
 
-    override fun toString(): String = "captureNullable<${argumentType.simpleName}>()"
+    override fun checkType(arg: Any?): Boolean {
+        if(arg == null) {
+            return true
+        }
+
+        return super.checkType(arg)
+    }
+
+    override fun toString(): String = "capture<${argumentType.simpleName}?>()"
 }
 
 /**

diff --git a/mockk/common/src/main/kotlin/io/mockk/impl/InternalPlatform.kt b/mockk/common/src/main/kotlin/io/mockk/impl/InternalPlatform.kt
@@ -33,7 +33,9 @@ expect object InternalPlatform {
 
     fun weakRef(value: Any): WeakRef
 
-    fun multiNotifier() : MultiNotifier
+    fun multiNotifier(): MultiNotifier
+
+    inline fun <T> synchronized(obj: Any, block: () -> T): T
 }
 
 interface Ref {

diff --git a/mockk/common/src/main/kotlin/io/mockk/impl/instantiation/CommonInstanceFactoryRegistry.kt b/mockk/common/src/main/kotlin/io/mockk/impl/instantiation/CommonInstanceFactoryRegistry.kt
@@ -8,7 +8,7 @@ class CommonInstanceFactoryRegistry : InstanceFactoryRegistry {
     private val factories = InternalPlatform.synchronizedMutableList<InstanceFactory>()
 
     val instanceFactories: List<InstanceFactory>
-        get() = synchronized(factories) {
+        get() = InternalPlatform.synchronized(factories) {
             factories.toList()
         }
 

diff --git a/mockk/common/src/main/kotlin/io/mockk/impl/stub/AnswerAnsweringOpportunity.kt b/mockk/common/src/main/kotlin/io/mockk/impl/stub/AnswerAnsweringOpportunity.kt
@@ -1,6 +1,7 @@
 package io.mockk.impl.stub
 
 import io.mockk.*
+import io.mockk.impl.InternalPlatform
 
 class AnswerAnsweringOpportunity<T>(
     private val matcherStr: () -> String
@@ -14,7 +15,7 @@ class AnswerAnsweringOpportunity<T>(
     override suspend fun coAnswer(call: Call) = getAnswer().answer(call)
 
     override fun provideAnswer(answer: Answer<T>) {
-        synchronized(this) {
+        InternalPlatform.synchronized(this) {
             val currentAnswer = this.storedAnswer
             this.storedAnswer = if (currentAnswer == null) {
                 notifyFirstAnswerHandlers(answer)
@@ -30,7 +31,7 @@ class AnswerAnsweringOpportunity<T>(
     }
 
     fun onFirstAnswer(handler: (Answer<T>) -> Unit) {
-        synchronized(this) {
+        InternalPlatform.synchronized(this) {
             firstAnswerHandlers.add(handler)
         }
     }

diff --git a/mockk/common/src/main/kotlin/io/mockk/impl/stub/MockKStub.kt b/mockk/common/src/main/kotlin/io/mockk/impl/stub/MockKStub.kt
@@ -35,7 +35,7 @@ open class MockKStub(
     }
 
     override fun answer(invocation: Invocation): Any? {
-        val invocationAndMatcher = synchronized(answers) {
+        val invocationAndMatcher = InternalPlatform.synchronized(answers) {
             answers
                 .reversed()
                 .firstOrNull { it.matcher.match(invocation) }
@@ -112,7 +112,7 @@ open class MockKStub(
         if (record) {
             recordedCalls.add(invocation)
 
-            synchronized(recordedCallsByMethod) {
+            InternalPlatform.synchronized(recordedCallsByMethod) {
                 recordedCallsByMethod.getOrPut(invocation.method) { mutableListOf() }
                     .add(invocation)
             }
@@ -121,18 +121,18 @@ open class MockKStub(
         }
     }
 
-    private fun checkExcluded(invocation: Invocation) = synchronized(exclusions) {
+    private fun checkExcluded(invocation: Invocation) = InternalPlatform.synchronized(exclusions) {
         exclusions.any { it.match(invocation) }
     }
 
     override fun allRecordedCalls(): List<Invocation> {
-        synchronized(recordedCalls) {
+        InternalPlatform.synchronized(recordedCalls) {
             return recordedCalls.toList()
         }
     }
 
     override fun allRecordedCalls(method: MethodDescription): List<Invocation> {
-        synchronized(recordedCallsByMethod) {
+        InternalPlatform.synchronized(recordedCallsByMethod) {
             return recordedCallsByMethod[method]?.toList() ?: listOf()
         }
     }
@@ -144,7 +144,7 @@ open class MockKStub(
         exclusions.add(matcher)
 
         if (params.current) {
-            synchronized(recordedCalls) {
+            InternalPlatform.synchronized(recordedCalls) {
                 val callsToExclude = recordedCalls
                     .filter(matcher::match)
 
@@ -157,15 +157,15 @@ open class MockKStub(
                 callsToExclude
                     .forEach { recordedCalls.remove(it) }
 
-                synchronized(recordedCallsByMethod) {
+                InternalPlatform.synchronized(recordedCallsByMethod) {
 
                     recordedCallsByMethod[matcher.method]?.apply {
                         filter(matcher::match)
                             .forEach { remove(it) }
                     }
                 }
 
-                synchronized(verifiedCalls) {
+                InternalPlatform.synchronized(verifiedCalls) {
                     verifiedCalls
                         .filter(matcher::match)
                         .forEach { verifiedCalls.remove(it) }
@@ -179,15 +179,15 @@ open class MockKStub(
     }
 
     override fun verifiedCalls(): List<Invocation> {
-        synchronized(verifiedCalls) {
+        InternalPlatform.synchronized(verifiedCalls) {
             return verifiedCalls.toList()
         }
     }
 
     override fun toStr() = "${type.simpleName}($name)"
 
     override fun childMockK(matcher: InvocationMatcher, childType: KClass<*>): Any {
-        return synchronized(childs) {
+        return InternalPlatform.synchronized(childs) {
             gatewayAccess.safeToString.exec {
                 childs.customComputeIfAbsent(matcher) {
                     gatewayAccess.mockFactory!!.mockk(

diff --git a/mockk/common/src/test/kotlin/io/mockk/it/AnswersTest.kt b/mockk/common/src/test/kotlin/io/mockk/it/AnswersTest.kt
@@ -6,7 +6,7 @@ import kotlin.test.assertEquals
 
 class AnswersTest {
     class MockCls {
-        fun op(a: Int, b: Int, c: Int = 10, d: Int = 25) = a + b + c + d
+        fun op(a: Int, b: Int, c: Int = 10, d: Int = 25, e: Int? = 55) = a + b + c + d
 
         fun lambdaOp(a: Int, b: () -> Int) = a + b()
     }
@@ -39,24 +39,24 @@ class AnswersTest {
 
     @Test
     fun answerLastArg() {
-        every { spy.op(any(), 7, d = any()) } answers { if (lastArg<Int>() == 11) 7 else 8 }
+        every { spy.op(any(), 7, e = any()) } answers { if (lastArg<Int>() == 11) 7 else 8 }
 
-        assertEquals(7, spy.op(2, 7, d = 11))
-        assertEquals(8, spy.op(3, 7, d = 12))
+        assertEquals(7, spy.op(2, 7, e = 11))
+        assertEquals(8, spy.op(3, 7, e = 12))
     }
 
     @Test
     fun answerNArgs() {
         every { spy.op(any(), 1) } answers { nArgs }
 
-        assertEquals(4, spy.op(2, 1))
+        assertEquals(5, spy.op(2, 1))
     }
 
     @Test
     fun answerParamTypesCount() {
         every { spy.op(any(), 2) } answers { method.paramTypes.size }
 
-        assertEquals(4, spy.op(2, 2))
+        assertEquals(5, spy.op(2, 2))
     }
 
     @Test
@@ -70,9 +70,13 @@ class AnswersTest {
     @Test
     fun answerCaptureListNullable() {
         val lst = mutableListOf<Int?>()
-        every { spy.op(3, 4, d = captureNullable(lst)) } answers { lst.captured()!! }
+        every { spy.op(3, 4, e = captureNullable(lst)) } answers { lst.captured() ?: 55 }
 
-        assertEquals(33, spy.op(3, 4, d = 33))
+        spy.op(3, 4, e = 1)
+        spy.op(3, 4, e = null)
+        spy.op(3, 4, e = 2)
+        spy.op(3, 4, e = 3)
+        assertEquals(listOf(1, null, 2, 3), lst)
     }
 
     @Test

diff --git a/mockk/jvm/src/main/kotlin/io/mockk/impl/InternalPlatform.kt b/mockk/jvm/src/main/kotlin/io/mockk/impl/InternalPlatform.kt
@@ -143,6 +143,8 @@ actual object InternalPlatform {
 
     actual fun multiNotifier(): MultiNotifier = JvmMultiNotifier()
 
+    actual inline fun <T> synchronized(obj: Any, block: () -> T) = kotlin.synchronized(obj, block)
+
     inline fun <reified T : Any> loadPlugin(className: String, msg: String = "") =
         try {
             T::class.cast(Class.forName(className).newInstance())