add test and fix broken test due to merge

Author: Will-ShaoHua

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/workspace/context/ProjectContextProviderTest.kt

@@ -13,7 +13,10 @@ import com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
 import com.github.tomakehurst.wiremock.http.Body
 import com.github.tomakehurst.wiremock.junit.WireMockRule
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
+import com.intellij.testFramework.DisposableRule
+import com.intellij.testFramework.replaceService
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
@@ -22,6 +25,7 @@ import org.junit.Rule
 import org.junit.jupiter.api.assertThrows
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.stub
 import org.mockito.kotlin.times
@@ -36,6 +40,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.project.QueryChatRequest
 import software.aws.toolkits.jetbrains.services.amazonq.project.QueryInlineCompletionRequest
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 import software.aws.toolkits.jetbrains.services.amazonq.project.UpdateIndexRequest
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.jetbrains.utils.rules.CodeInsightTestFixtureRule
 import software.aws.toolkits.jetbrains.utils.rules.JavaCodeInsightTestFixtureRule
 import java.net.ConnectException
@@ -47,6 +52,10 @@ class ProjectContextProviderTest {
     @JvmField
     val projectRule: CodeInsightTestFixtureRule = JavaCodeInsightTestFixtureRule()
 
+    @Rule
+    @JvmField
+    val disposableRule: DisposableRule = DisposableRule()
+
     @Rule
     @JvmField
     val wireMock: WireMockRule = createMockServer()
@@ -114,7 +123,13 @@ class ProjectContextProviderTest {
     }
 
     @Test
-    fun `index should send files within the project to lsp`() {
+    fun `index should send files within the project to lsp - vector index enabled`() {
+        ApplicationManager.getApplication().replaceService(
+            CodeWhispererSettings::class.java,
+            mock { on { isProjectContextEnabled() } doReturn true },
+            disposableRule.disposable
+        )
+
         projectRule.fixture.addFileToProject("Foo.java", "foo")
         projectRule.fixture.addFileToProject("Bar.java", "bar")
         projectRule.fixture.addFileToProject("Baz.java", "baz")
@@ -139,13 +154,45 @@ class ProjectContextProviderTest {
         )
     }
 
+    @Test
+    fun `index should send files within the project to lsp - vector index disabled`() {
+        ApplicationManager.getApplication().replaceService(
+            CodeWhispererSettings::class.java,
+            mock { on { isProjectContextEnabled() } doReturn false },
+            disposableRule.disposable
+        )
+
+        projectRule.fixture.addFileToProject("Foo.java", "foo")
+        projectRule.fixture.addFileToProject("Bar.java", "bar")
+        projectRule.fixture.addFileToProject("Baz.java", "baz")
+
+        sut.index()
+
+        val request = IndexRequest(listOf("/src/Foo.java", "/src/Bar.java", "/src/Baz.java"), "/src", "default", "")
+        assertThat(request.filePaths).hasSize(3)
+        assertThat(request.filePaths).satisfies({
+            it.contains("/src/Foo.java") &&
+                it.contains("/src/Baz.java") &&
+                it.contains("/src/Bar.java")
+        })
+        assertThat(request.config).isEqualTo("default")
+
+        wireMock.verify(
+            1,
+            postRequestedFor(urlPathEqualTo("/buildIndex"))
+                .withHeader("Content-Type", equalTo("text/plain"))
+            // comment it out because order matters and will cause json string different
+//                .withRequestBody(equalTo(encryptedRequest))
+        )
+    }
+
     @Test
     fun `updateIndex should send correct encrypted request to lsp`() {
         sut.updateIndex(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE)
         val request = UpdateIndexRequest(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE.value)
         val requestJson = mapper.writeValueAsString(request)
 
-        assertThat(mapper.readTree(requestJson)).isEqualTo(mapper.readTree("""{ "filePath": "foo.java" }"""))
+        assertThat(mapper.readTree(requestJson)).isEqualTo(mapper.readTree("""{ "filePaths": ["foo.java"], "mode": "update" }"""))
 
         val encryptedRequest = encoderServer.encrypt(requestJson)
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt

@@ -139,7 +139,8 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
         var duration = (System.currentTimeMillis() - indexStartTime).toDouble()
         logger.debug { "time elapsed to collect project context files: ${duration}ms, collected ${filesResult.files.size} files" }
 
-        val encrypted = encryptRequest(IndexRequest(filesResult.files, projectRoot, "all", ""))
+        val indexOption = if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) IndexOption.ALL else IndexOption.DEFAULT
+        val encrypted = encryptRequest(IndexRequest(filesResult.files, projectRoot, indexOption, ""))
         val response = sendMsgToLsp(LspMessage.Index, encrypted)
 
         duration = (System.currentTimeMillis() - indexStartTime).toDouble()
@@ -191,7 +192,6 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
     }
 
     fun updateIndex(filePaths: List<String>, mode: IndexUpdateMode) {
-        if (!isIndexComplete.get()) return
         val encrypted = encryptRequest(UpdateIndexRequest(filePaths, mode.value))
         sendMsgToLsp(LspMessage.UpdateIndex, encrypted)
     }
@@ -336,5 +336,9 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
 
     companion object {
         private val logger = getLogger<ProjectContextProvider>()
+        private object IndexOption {
+            const val ALL = "all"
+            const val DEFAULT = "default"
+        }
     }
 }