@@ -18,7 +18,7 @@ import com.intellij.testFramework.runInEdtAndWait
1818import com.intellij.testFramework.utils.io.createFile
1919import com.intellij.util.io.HttpRequests
2020import com.intellij.util.io.delete
21- import kotlinx.coroutines.runBlocking
21+ import kotlinx.coroutines.test.runTest
2222import org.apache.commons.codec.digest.DigestUtils
2323import org.assertj.core.api.Assertions.assertThat
2424import org.assertj.core.api.Assertions.fail
@@ -492,15 +492,13 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
492492 }
493493
494494 @Test
495- fun `CodeModernizer can poll job for status updates` () {
495+ fun `CodeModernizer can poll job for status updates` () = runTest {
496496 doReturn(exampleGetCodeMigrationResponse, * happyPathMigrationResponses.toTypedArray()).whenever(clientAdaptorSpy).getCodeModernizationJob(any())
497497 doReturn(exampleGetCodeMigrationPlanResponse).whenever(clientAdaptorSpy).getCodeModernizationPlan(any())
498498 doReturn(exampleStartCodeMigrationResponse).whenever(clientAdaptorSpy).startCodeModernization(any(), any(), any())
499499
500500 doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
501- val result = runBlocking {
502- testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
503- }
501+ val result = testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
504502 assertEquals(CodeModernizerJobCompletedResult .JobCompletedSuccessfully (jobId), result)
505503
506504 // two polls to check status as we 1. check for plan existing and 2. check if job completed
@@ -510,7 +508,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
510508 }
511509
512510 @Test
513- fun `CodeModernizer detects partially migrated code` () {
511+ fun `CodeModernizer detects partially migrated code` () = runTest {
514512 doReturn(
515513 exampleGetCodeMigrationResponse.replace(TransformationStatus .STARTED ),
516514 exampleGetCodeMigrationResponse.replace(TransformationStatus .PLANNED ),
@@ -521,9 +519,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
521519 doReturn(exampleStartCodeMigrationResponse).whenever(clientAdaptorSpy).startCodeModernization(any(), any(), any())
522520
523521 doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
524- val result = runBlocking {
525- testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
526- }
522+ val result = testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
527523 assertEquals(CodeModernizerJobCompletedResult .JobPartiallySucceeded (jobId, testSessionContextSpy.targetJavaVersion), result)
528524 verify(clientAdaptorSpy, times(4 )).getCodeModernizationJob(any())
529525 verify(clientAdaptorSpy, atLeastOnce()).getCodeModernizationPlan(any())
0 commit comments