Merge pull request #1108 from bboeck/issue-963

Issue 963: Unnecessary stubbings detected - false positive
mockk · Jul 3, 2023 · f559626 · f559626
2 parents 80e43ea + 1eeff45
commit f559626
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/modules/mockk/src/jvmMain/kotlin/io/mockk/junit5/MockKExtension.kt b/modules/mockk/src/jvmMain/kotlin/io/mockk/junit5/MockKExtension.kt
@@ -114,15 +114,18 @@ class MockKExtension : TestInstancePostProcessor, ParameterResolver, AfterAllCal
             unmockkAll()
         }
 
-        if (context.confirmVerification) {
-            confirmVerified()
-        }
+        try {
+            if (context.confirmVerification) {
+                confirmVerified()
+            }
 
-        if (context.checkUnnecessaryStub) {
-            checkUnnecessaryStub()
+            if (context.checkUnnecessaryStub) {
+                checkUnnecessaryStub()
+            }
+        } finally {
+            // Clear all mocks after missed verifications or unnecessary stubs. Solves Issue #963.
+            clearAllMocks()
         }
-
-        clearAllMocks()
     }
 
     private val ExtensionContext.keepMocks: Boolean