Skip to content

Fix test failures caused by mockk not cleaning up #5207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 10, 2025
Merged

Fix test failures caused by mockk not cleaning up #5207

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a97630
Fix test failures caused by mockk not cleaning up
rli Dec 13, 2024
94f423a
Update ThreadingUtilsKtTest.kt
rli Dec 14, 2024
d3fe524
test
rli Dec 23, 2024
0465bbe
Merge branch 'main' into rli/fix-mockk-cleanup
rli Dec 23, 2024
795d1f0
Merge branch 'main' into rli/fix-mockk-cleanup
rli Jan 9, 2025
25adb00
Merge branch 'main' into rli/fix-mockk-cleanup
rli Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...ore/jetbrains-community/tst/software/aws/toolkits/jetbrains/utils/ThreadingUtilsKtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import com.intellij.openapi.progress.ProgressManager
import com.intellij.testFramework.ApplicationRule
import com.intellij.util.concurrency.AppExecutorUtil
import io.mockk.every
import io.mockk.mockk
import io.mockk.impl.annotations.MockK
import io.mockk.junit4.MockKRule
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.Assert.assertEquals
import org.junit.Rule
Expand All @@ -26,6 +27,12 @@ class ThreadingUtilsKtTest {
@JvmField
val application = ApplicationRule()

@get:Rule
val mockkRule = MockKRule(this)

@MockK
private lateinit var pluginResolver: PluginResolver

@Test
fun `computeOnEdt runs on edt`() {
computeOnEdt {
Expand Down Expand Up @@ -78,9 +85,7 @@ class ThreadingUtilsKtTest {

@Test
fun `pluginAwareExecuteOnPooledThread inherits plugin resolver`() {
val pluginResolver = mockk<PluginResolver> {
every { product } returns AWSProduct.AMAZON_Q_FOR_JET_BRAINS
}
every { pluginResolver.product } returns AWSProduct.AMAZON_Q_FOR_JET_BRAINS
PluginResolver.setThreadLocal(pluginResolver)

pluginAwareExecuteOnPooledThread {
Expand Down
Loading