Fix unmockkAll to work if constructor was mocked multiple times

dsl/common/src/main/kotlin/io/mockk/API.kt

@@ -526,7 +526,7 @@ object MockKDsl {
 
             MockKCancellationRegistry
                 .subRegistry(MockKCancellationRegistry.Type.CONSTRUCTOR)
-                .putIfNotThere(it, cancellation)
+                .cancelPut(it, cancellation)
         }
     }
 
@@ -2302,13 +2302,6 @@ object MockKCancellationRegistry {
             map[key] = newCancellation
         }
 
-        fun putIfNotThere(key: Any, newCancellation: MockKCancellation) {
-            val map = mapTl.value
-            if (!map.containsKey(key)) {
-                map[key] = newCancellation
-            }
-        }
-
         fun cancelAll() {
             val map = mapTl.value
             map.values.forEach { it() }

mockk/common/src/test/kotlin/io/mockk/it/ConstructorMockTest.kt

@@ -3,17 +3,13 @@ package io.mockk.it
 import io.mockk.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class ConstructorMockTest {
     class ExampleClass {
         val exampleProperty: Int = 1
     }
 
-    object ExampleObject {
-        private val exampleClass = ExampleClass()
-        fun getExampleProperty(): Int = exampleClass.exampleProperty
-    }
-
     data class MockCls(private val x: Int = 0) {
 
         constructor(x: String) : this(x.toInt())
@@ -31,16 +27,27 @@ class ConstructorMockTest {
 
         every { anyConstructed<ExampleClass>().exampleProperty } returns 0
 
-        assertEquals(0, ExampleObject.getExampleProperty())
+        assertEquals(0, ExampleClass().exampleProperty)
     }
 
     @Test
-    fun test2() {
+    fun unmockkAllTest() {
+        mockkConstructor(ExampleClass::class)
         mockkConstructor(ExampleClass::class)
 
         every { anyConstructed<ExampleClass>().exampleProperty } returns 0
 
-        assertEquals(0, ExampleObject.getExampleProperty())
+        assertEquals(0, ExampleClass().exampleProperty)
+
+        unmockkAll()
+
+        // mockkConstructor called multiple times, but unmockkAll should still be able to unmock it
+        assertEquals(1, ExampleClass().exampleProperty)
+
+        // Constructor not mocked -> MockkException
+        assertFailsWith<MockKException> {
+            every { anyConstructed<ExampleClass>().exampleProperty } returns 0
+        }
     }
 
     @Test
@@ -143,6 +150,48 @@ class ConstructorMockTest {
         }
     }
 
+    @Test
+    fun unmockkAllconstructedWith() {
+        mockkConstructor(MockCls::class)
+        mockkConstructor(MockCls::class)
+
+        val checkConstructedWith = { a: Int, b: Int, c: Int ->
+            every {
+                constructedWith<MockCls>(OfTypeMatcher<String>(String::class)).op(any(), any())
+            } returns a
+            every {
+                constructedWith<MockCls>(EqMatcher(6)).op(any(), any())
+            } returns b
+            every {
+                constructedWith<MockCls>(OfTypeMatcher<Int>(Int::class)).op(any(), any())
+            } returns c
+
+            assertEquals(a, MockCls("5").op(1, 2))
+            assertEquals(b, MockCls(6).op(1, 2))
+            assertEquals(c, MockCls(5).op(1, 2))
+        }
+
+        checkConstructedWith(23, 55, 35)
+
+        // New mockkConstructor -> we can still mock as expected
+        mockkConstructor(MockCls::class)
+        checkConstructedWith(44, 101, 42)
+
+        // mockkConstructor was called multiple times, but we can still unmock it via unmockkAll
+        unmockkAll()
+
+        assertEquals(8, MockCls("5").op(1, 2))
+        assertEquals(8, MockCls(5).op(1, 2))
+        assertEquals(9, MockCls(6).op(1, 2))
+
+        // Constructor not mocked anymore -> MockkException expected
+        assertFailsWith<MockKException> {
+            every {
+                constructedWith<MockCls>(OfTypeMatcher<String>(String::class)).op(any(), any())
+            } returns 23
+        }
+    }
+
     @Test
     fun returnObject() {
         mockkConstructor(MockCls::class)