@@ -18,7 +18,7 @@ import com.intellij.testFramework.runInEdtAndWait
18
18
import com.intellij.testFramework.utils.io.createFile
19
19
import com.intellij.util.io.HttpRequests
20
20
import com.intellij.util.io.delete
21
- import kotlinx.coroutines.runBlocking
21
+ import kotlinx.coroutines.test.runTest
22
22
import org.apache.commons.codec.digest.DigestUtils
23
23
import org.assertj.core.api.Assertions.assertThat
24
24
import org.assertj.core.api.Assertions.fail
@@ -492,15 +492,13 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
492
492
}
493
493
494
494
@Test
495
- fun `CodeModernizer can poll job for status updates` () {
495
+ fun `CodeModernizer can poll job for status updates` () = runTest {
496
496
doReturn(exampleGetCodeMigrationResponse, * happyPathMigrationResponses.toTypedArray()).whenever(clientAdaptorSpy).getCodeModernizationJob(any())
497
497
doReturn(exampleGetCodeMigrationPlanResponse).whenever(clientAdaptorSpy).getCodeModernizationPlan(any())
498
498
doReturn(exampleStartCodeMigrationResponse).whenever(clientAdaptorSpy).startCodeModernization(any(), any(), any())
499
499
500
500
doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
501
- val result = runBlocking {
502
- testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
503
- }
501
+ val result = testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
504
502
assertEquals(CodeModernizerJobCompletedResult .JobCompletedSuccessfully (jobId), result)
505
503
506
504
// 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
510
508
}
511
509
512
510
@Test
513
- fun `CodeModernizer detects partially migrated code` () {
511
+ fun `CodeModernizer detects partially migrated code` () = runTest {
514
512
doReturn(
515
513
exampleGetCodeMigrationResponse.replace(TransformationStatus .STARTED ),
516
514
exampleGetCodeMigrationResponse.replace(TransformationStatus .PLANNED ),
@@ -521,9 +519,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
521
519
doReturn(exampleStartCodeMigrationResponse).whenever(clientAdaptorSpy).startCodeModernization(any(), any(), any())
522
520
523
521
doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
524
- val result = runBlocking {
525
- testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
526
- }
522
+ val result = testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
527
523
assertEquals(CodeModernizerJobCompletedResult .JobPartiallySucceeded (jobId, testSessionContextSpy.targetJavaVersion), result)
528
524
verify(clientAdaptorSpy, times(4 )).getCodeModernizationJob(any())
529
525
verify(clientAdaptorSpy, atLeastOnce()).getCodeModernizationPlan(any())
0 commit comments