Merge pull request #1238 from Evenprime/fix_parallel_testing

Raibaz · web-flow · commit 143f6bb6350c · 2024-04-02T17:11:23.000+02:00
Fix parallel testing flag
diff --git a/modules/mockk/src/jvmMain/kotlin/io/mockk/junit5/MockKExtension.kt b/modules/mockk/src/jvmMain/kotlin/io/mockk/junit5/MockKExtension.kt
@@ -124,7 +124,7 @@ class MockKExtension : TestInstancePostProcessor, ParameterResolver, AfterAllCal
             }
         } finally {
             // Clear all mocks after missed verifications or unnecessary stubs. Solves Issue #963.
-            if (!context.keepMocks || context.requireParallelTesting) {
+            if (!context.keepMocks && !context.requireParallelTesting) {
                 clearAllMocks()
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ class MockKExtension : TestInstancePostProcessor, ParameterResolver, AfterAllCal`
`124`	`124`	`}`
`125`	`125`	`} finally {`
`126`	`126`	`// Clear all mocks after missed verifications or unnecessary stubs. Solves Issue #963.`
`127`		`- if (!context.keepMocks \|\| context.requireParallelTesting) {`
	`127`	`+ if (!context.keepMocks && !context.requireParallelTesting) {`
`128`	`128`	`clearAllMocks()`
`129`	`129`	`}`
`130`	`130`	`}`