tst

Author: rli

gradle/libs.versions.toml

@@ -24,7 +24,7 @@ kotlin = "2.1.20"
 kotlinCoroutines = "1.8.0"
 lsp4j = "0.24.0"
 mockito = "5.12.0"
-mockitoKotlin = "5.4.0"
+mockitoKotlin = "5.4.1-SNAPSHOT"
 mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestBase.kt

@@ -20,7 +20,6 @@ import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.yield
 import org.assertj.core.api.Assertions.assertThat
@@ -314,26 +313,26 @@ open class CodeWhispererTestBase {
         val psiFileCaptor = argumentCaptor<PsiFile>()
         val latencyContextCaptor = argumentCaptor<LatencyContext>()
 
-        runBlocking {
-            whenever(codewhispererService.getRequestContext(
-                triggerTypeCaptor.capture(),
-                editorCaptor.capture(),
-                projectCaptor.capture(),
-                psiFileCaptor.capture(),
-                latencyContextCaptor.capture()
+        doSuspendableAnswer {
+            val requestContext = codewhispererService.getRequestContext(
+                triggerTypeCaptor.firstValue,
+                editorCaptor.firstValue,
+                projectRule.project,
+                psiFileCaptor.firstValue,
+                latencyContextCaptor.firstValue
+            )
+            projectRule.fixture.type(userInput)
+            requestContext
+        }.doCallRealMethod()
+            .wheneverBlocking(codewhispererService) {
+                getRequestContext(
+                    triggerTypeCaptor.capture(),
+                    editorCaptor.capture(),
+                    projectCaptor.capture(),
+                    psiFileCaptor.capture(),
+                    latencyContextCaptor.capture()
                 )
-            ).doSuspendableAnswer {
-                val requestContext = codewhispererService.getRequestContext(
-                    triggerTypeCaptor.firstValue,
-                    editorCaptor.firstValue,
-                    projectRule.project,
-                    psiFileCaptor.firstValue,
-                    latencyContextCaptor.firstValue
-                )
-                projectRule.fixture.type(userInput)
-                requestContext
-            }.thenCallRealMethod()
-        }
+            }
     }
 
     fun mockLspInlineCompletionResponse(response: InlineCompletionListWithReferences) {