@@ -18,6 +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
2122import kotlinx.coroutines.test.runTest
2223import org.apache.commons.codec.digest.DigestUtils
2324import org.assertj.core.api.Assertions.assertThat
@@ -410,7 +411,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
410411 }
411412
412413 @Test
413- fun `CodeModernizer can create modernization job` () {
414+ fun `CodeModernizer can create modernization job` () = runTest {
414415 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
415416 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
416417 doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
@@ -425,7 +426,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
425426 }
426427
427428 @Test
428- fun `CodeModernizer cannot upload payload due to already disposed` () {
429+ fun `CodeModernizer cannot upload payload due to already disposed` () = runTest {
429430 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
430431 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
431432 doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
@@ -435,7 +436,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
435436 }
436437
437438 @Test
438- fun `CodeModernizer returns credentials expired when SsoOidcException during upload` () {
439+ fun `CodeModernizer returns credentials expired when SsoOidcException during upload` () = runTest {
439440 setupConnection(BearerTokenAuthState .AUTHORIZED )
440441 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
441442 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
@@ -445,7 +446,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
445446 }
446447
447448 @Test
448- fun `CodeModernizer returns credentials expired when expired before upload` () {
449+ fun `CodeModernizer returns credentials expired when expired before upload` () = runTest {
449450 listOf (BearerTokenAuthState .NEEDS_REFRESH , BearerTokenAuthState .NOT_AUTHENTICATED ).forEach {
450451 setupConnection(it)
451452 val result = testSessionSpy.createModernizationJob(MavenCopyCommandsResult .Success (File (" ./mock/path/" )))
@@ -454,7 +455,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
454455 }
455456
456457 @Test
457- fun `CodeModernizer cannot upload payload due to presigned url issue` () {
458+ fun `CodeModernizer cannot upload payload due to presigned url issue` () = runTest {
458459 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
459460 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
460461 doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
@@ -467,7 +468,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
467468 }
468469
469470 @Test
470- fun `CodeModernizer cannot upload payload due to other status code` () {
471+ fun `CodeModernizer cannot upload payload due to other status code` () = runTest {
471472 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
472473 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
473474 doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
@@ -480,7 +481,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
480481 }
481482
482483 @Test
483- fun `CodeModernizer cannot upload payload due to unknown issue` () {
484+ fun `CodeModernizer cannot upload payload due to unknown issue` () = runTest {
484485 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
485486 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
486487 doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
@@ -492,7 +493,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
492493 }
493494
494495 @Test
495- fun `CodeModernizer cannot upload payload due to connection refused` () {
496+ fun `CodeModernizer cannot upload payload due to connection refused` () = runTest {
496497 doReturn(ZipCreationResult .Succeeded (File (" ./tst-resources/codemodernizer/test.txt" )))
497498 .whenever(testSessionContextSpy).createZipWithModuleFiles(any())
498499 doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
@@ -549,7 +550,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
549550 }
550551
551552 @Test
552- fun `test uploadPayload()` () {
553+ fun `test uploadPayload()` () = runTest {
553554 val s3endpoint = " http://127.0.0.1:${wireMock.port()} "
554555 val gumbyUploadUrlResponse = CreateUploadUrlResponse .builder()
555556 .uploadUrl(s3endpoint)
0 commit comments