tst

Author: rli

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerTest.kt

@@ -170,7 +170,7 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
         whenever(featureDevClient.createTaskAssistConversation()).thenReturn(exampleCreateTaskAssistConversationResponse)
         whenever(featureDevClient.sendFeatureDevTelemetryEvent(any())).thenReturn(exampleSendTelemetryEventResponse)
         whenever(chatSessionStorage.getSession(any(), any())).thenReturn(spySession)
-        doNothing().`when`(chatSessionStorage).deleteSession(any())
+        doNothing().whenever(chatSessionStorage).deleteSession(any())
 
         mockkObject(AmazonqTelemetry)
         every { AmazonqTelemetry.endChat(amazonqConversationId = any(), amazonqEndOfTheConversationLatency = any()) } just runs

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

@@ -23,6 +23,7 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doNothing
 import org.mockito.kotlin.eq
+import org.mockito.kotlin.whenever
 import software.aws.toolkits.jetbrains.services.amazonq.QConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererLearnMoreAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererShowSettingsAction
@@ -78,7 +79,7 @@ class CodeWhispererActionTest : CodeWhispererTestBase() {
     @Test
     fun `CodeWhispererShowSettingsAction actionPerformed should show settings dialog`() {
         val settingsSpy = spy(ShowSettingsUtil.getInstance())
-        doNothing().`when`(settingsSpy).showSettingsDialog(any(), any<Class<out Configurable>>())
+        doNothing().whenever(settingsSpy).showSettingsDialog(any(), any<Class<out Configurable>>())
         ApplicationManager.getApplication().replaceService(ShowSettingsUtil::class.java, settingsSpy, disposableRule.disposable)
         val action = CodeWhispererShowSettingsAction()
         runInEdtAndWait {

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

@@ -8,6 +8,7 @@ import com.intellij.ui.dsl.builder.components.DslLabel
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.mockito.kotlin.doNothing
+import org.mockito.kotlin.whenever
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
 import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
 import software.aws.toolkits.resources.message
@@ -19,9 +20,9 @@ class CodeWhispererConfigurableTest : CodeWhispererTestBase() {
 
     @Test
     fun `test CodeWhisperer configurable`() {
-        doNothing().`when`(codeScanManager).buildCodeScanUI()
-        doNothing().`when`(codeScanManager).showCodeScanUI()
-        doNothing().`when`(codeScanManager).removeCodeScanUI()
+        doNothing().whenever(codeScanManager).buildCodeScanUI()
+        doNothing().whenever(codeScanManager).showCodeScanUI()
+        doNothing().whenever(codeScanManager).removeCodeScanUI()
         val configurable = CodeWhispererConfigurable(projectRule.project)
 
         // A workaround to initialize disposable in the DslConfigurableBase since somehow the disposable is

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

@@ -14,6 +14,7 @@ import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doNothing
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
+import org.mockito.kotlin.whenever
 import software.aws.toolkits.core.telemetry.MetricEvent
 import software.aws.toolkits.core.telemetry.TelemetryBatcher
 import software.aws.toolkits.core.telemetry.TelemetryPublisher
@@ -51,7 +52,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
     @Test
     fun `test toggle autoSuggestion will emit autoSuggestionActivation telemetry (popup)`() {
         val metricCaptor = argumentCaptor<MetricEvent>()
-        doNothing().`when`(batcher).enqueue(metricCaptor.capture())
+        doNothing().whenever(batcher).enqueue(metricCaptor.capture())
 
         Pause().actionPerformed(TestActionEvent { projectRule.project })
         assertEventsContainsFieldsAndCount(

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

@@ -17,15 +17,14 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.yield
 import org.assertj.core.api.Assertions.assertThat
 import org.eclipse.lsp4j.jsonrpc.Launcher
 import org.eclipse.lsp4j.jsonrpc.RemoteEndpoint
 import org.junit.After
 import org.junit.Before
-import org.junit.BeforeClass
 import org.junit.Rule
 import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
@@ -35,6 +34,7 @@ import org.mockito.kotlin.spy
 import org.mockito.kotlin.stub
 import org.mockito.kotlin.timeout
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import software.amazon.awssdk.services.ssooidc.SsoOidcClient
 import software.aws.toolkits.jetbrains.core.MockClientManagerRule
 import software.aws.toolkits.jetbrains.core.credentials.ManagedSsoProfile
@@ -111,16 +111,16 @@ open class CodeWhispererTestBase {
     @Before
     open fun setUp() {
         mockLanguageServer = mockk()
-        mockLspService = spy(object : AmazonQLspService(projectRule.project, mockk()) {
+        mockLspService = spy(object : AmazonQLspService(projectRule.project, TestScope()) {
             override fun start() = CompletableDeferred(object : AmazonQServerInstanceFacade {
                 override val launcher: Launcher<AmazonQLanguageServer>
                     get() = TODO("Not yet implemented")
 
                 override val launcherFuture: Future<Void>
-                    get() = TODO("Not yet implemented")
+                    get() = CompletableFuture()
 
                 override val initializeResult: Deferred<AwsExtendedInitializeResult>
-                    get() = TODO("Not yet implemented")
+                    get() = CompletableDeferred(AwsExtendedInitializeResult())
 
                 override val encryptionManager: JwtEncryptionManager
                     get() = TODO("Not yet implemented")
@@ -144,7 +144,7 @@ open class CodeWhispererTestBase {
 
         popupManagerSpy = spy(CodeWhispererPopupManager.getInstance())
         popupManagerSpy.reset()
-        doNothing().`when`(popupManagerSpy).showPopup(any(), any(), any(), any())
+        doNothing().whenever(popupManagerSpy).showPopup(any(), any(), any(), any())
         popupManagerSpy.stub {
             onGeneric {
                 showPopup(any(), any(), any(), any())
@@ -323,12 +323,6 @@ open class CodeWhispererTestBase {
     }
 
     fun mockLspInlineCompletionResponse(response: InlineCompletionListWithReferences) {
-        mockLspService.stub {
-            onGeneric {
-                executeSync<CompletableFuture<InlineCompletionListWithReferences>>(any())
-            } doAnswer {
-                CompletableFuture.completedFuture(response)
-            }
-        }
+        every { mockLanguageServer.inlineCompletionWithReferences(any()) } returns CompletableFuture.completedFuture(response)
     }
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

@@ -50,7 +50,6 @@ import org.eclipse.lsp4j.ClientInfo
 import org.eclipse.lsp4j.DidChangeConfigurationParams
 import org.eclipse.lsp4j.FileOperationsWorkspaceCapabilities
 import org.eclipse.lsp4j.InitializeParams
-import org.eclipse.lsp4j.InitializeResult
 import org.eclipse.lsp4j.InitializedParams
 import org.eclipse.lsp4j.SynchronizationCapabilities
 import org.eclipse.lsp4j.TextDocumentClientCapabilities
@@ -303,12 +302,12 @@ open class AmazonQLspService(private val project: Project, private val cs: Corou
     }
 
     fun<T> executeSync(runnable: suspend AmazonQLspService.(AmazonQLanguageServer) -> T): T =
-        runBlocking(cs.coroutineContext) {
+        runBlocking {
             execute(runnable)
         }
 
     fun<T> syncExecuteIfRunning(runnable: suspend AmazonQLspService.(AmazonQLanguageServer) -> T): T? =
-        runBlocking(cs.coroutineContext) {
+        runBlocking {
             executeIfRunning(runnable)
         }
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt

@@ -29,7 +29,7 @@ class ManifestFetcher(
         private val logger = getLogger<ManifestFetcher>()
 
         private const val DEFAULT_MANIFEST_URL =
-            "https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json"
+            "https://aws-language-servers-gamma.amazonaws.com/qAgenticChatServer/0/manifest.json"
 
         private val DEFAULT_MANIFEST_PATH: Path = getToolkitsCommonCacheRoot()
             .resolve("aws")