Skip to content

Commit 4a97630

Browse files
committed
Fix test failures caused by mockk not cleaning up
1 parent 2226148 commit 4a97630

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/ThreadingUtilsKtTest.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import com.intellij.openapi.progress.ProgressManager
1010
import com.intellij.testFramework.ApplicationRule
1111
import com.intellij.util.concurrency.AppExecutorUtil
1212
import io.mockk.every
13-
import io.mockk.mockk
13+
import io.mockk.impl.annotations.MockK
14+
import io.mockk.junit4.MockKRule
1415
import org.assertj.core.api.Assertions.assertThatThrownBy
1516
import org.junit.Assert.assertEquals
1617
import org.junit.Rule
@@ -26,6 +27,12 @@ class ThreadingUtilsKtTest {
2627
@JvmField
2728
val application = ApplicationRule()
2829

30+
@get:Rule
31+
val mockkRule = MockKRule(this)
32+
33+
@MockK
34+
private lateinit var pluginResolver: PluginResolver
35+
2936
@Test
3037
fun `computeOnEdt runs on edt`() {
3138
computeOnEdt {
@@ -78,9 +85,7 @@ class ThreadingUtilsKtTest {
7885

7986
@Test
8087
fun `pluginAwareExecuteOnPooledThread inherits plugin resolver`() {
81-
val pluginResolver = mockk<PluginResolver> {
82-
every { product } returns AWSProduct.AMAZON_Q_FOR_JET_BRAINS
83-
}
88+
every { pluginResolver.product } returns AWSProduct.AMAZON_Q_FOR_JET_BRAINS
8489
PluginResolver.setThreadLocal(pluginResolver)
8590

8691
pluginAwareExecuteOnPooledThread {

0 commit comments

Comments
 (0)