addressing comments

Author: Randall-Jiang

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -58,6 +58,7 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
+import java.nio.file.Path
 import java.nio.file.Paths
 import java.time.Duration
 import java.time.Instant
@@ -263,25 +264,23 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     if (shortAnswer.stopIteration == "true") {
                         throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", "TestGenFailedError", shortAnswer.planSummary)
                     }
+                    val fileName = shortAnswer.sourceFilePath?.let { Path.of(it).fileName.toString() } ?: path.fileName.toString()
                     codeTestChatHelper.updateAnswer(
                         CodeTestChatMessageContent(
-                            message = generateSummaryMessage(path.fileName.toString()) + shortAnswer.planSummary,
+                            message = generateSummaryMessage(fileName) + shortAnswer.planSummary,
                             type = ChatMessageType.Answer
                         ),
                         messageIdOverride = codeTestResponseContext.testSummaryMessageId
                     )
                 }
-                if (session.iteration == 1) {
-                    codeTestChatHelper.updateUI(
-                        promptInputDisabledState = true,
-                        promptInputProgress = testGenProgressField(0),
-                    )
-                } else {
-                    codeTestChatHelper.updateUI(
-                        promptInputDisabledState = true,
-                        promptInputProgress = buildAndExecuteProgrogressField,
-                    )
-                }
+                codeTestChatHelper.updateUI(
+                    promptInputDisabledState = true,
+                    promptInputProgress = if (session.iteration == 1) {
+                        testGenProgressField(0)
+                    } else {
+                        buildAndExecuteProgrogressField
+                    }
+                )
             }
 
             // polling every 2 seconds to reduce # of API calls

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt

@@ -201,27 +201,3 @@ private fun cleanText(input: String): String {
     return cleaned.toString()
 }
 
-suspend fun combineBuildAndExecuteLogFiles(
-    buildLogFile: VirtualFile?,
-    testLogFile: VirtualFile?,
-): VirtualFile? {
-    if (buildLogFile == null || testLogFile == null) return null
-    val buildLogFileContent = String(buildLogFile.contentsToByteArray(), StandardCharsets.UTF_8)
-    val testLogFileContent = String(testLogFile.contentsToByteArray(), StandardCharsets.UTF_8)
-
-    val combinedContent = "Build Output:\n$buildLogFileContent\nTest Execution Output:\n$testLogFileContent"
-
-    // Create a new virtual file and write combined content
-    val newFile = VirtualFileManager.getInstance().findFileByNioPath(
-        withContext(currentCoroutineContext()) {
-            Files.createTempFile(null, null)
-        }
-    )
-    withContext(EDT) {
-        ApplicationManager.getApplication().runWriteAction {
-            newFile?.setBinaryContent(combinedContent.toByteArray(StandardCharsets.UTF_8))
-        }
-    }
-
-    return newFile
-}