tst

Author: rli

buildSrc/settings.gradle.kts

@@ -43,5 +43,11 @@ dependencyResolutionManagement {
                 includeGroupByRegex("org\\.jetbrains\\.intellij\\.platform.*")
             }
         }
+        maven {
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            content {
+                includeGroupByRegex("org\\.mockito\\.kotlin")
+            }
+        }
     }
 }

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

@@ -313,15 +313,7 @@ open class CodeWhispererTestBase {
         val psiFileCaptor = argumentCaptor<PsiFile>()
         val latencyContextCaptor = argumentCaptor<LatencyContext>()
 
-        wheneverBlocking {
-            codewhispererService.getRequestContext(
-                triggerTypeCaptor.capture(),
-                editorCaptor.capture(),
-                projectCaptor.capture(),
-                psiFileCaptor.capture(),
-                latencyContextCaptor.capture()
-            )
-        }.doSuspendableAnswer {
+        doSuspendableAnswer {
             val requestContext = codewhispererService.getRequestContext(
                 triggerTypeCaptor.firstValue,
                 editorCaptor.firstValue,
@@ -331,7 +323,15 @@ open class CodeWhispererTestBase {
             )
             projectRule.fixture.type(userInput)
             requestContext
-        }.thenCallRealMethod()
+        }.wheneverBlocking(codewhispererService) {
+            getRequestContext(
+                triggerTypeCaptor.capture(),
+                editorCaptor.capture(),
+                projectCaptor.capture(),
+                psiFileCaptor.capture(),
+                latencyContextCaptor.capture()
+            )
+        }
     }
 
     fun mockLspInlineCompletionResponse(response: InlineCompletionListWithReferences) {

settings.gradle.kts

@@ -38,6 +38,12 @@ dependencyResolutionManagement {
     repositories {
         codeArtifactMavenRepo()
         mavenCentral()
+        maven {
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            content {
+                includeGroupByRegex("org\\.mockito\\.kotlin")
+            }
+        }
 
         intellijPlatform {
             defaultRepositories()