Minor fixes and refactoring in CTCChatController, CWSPRUTGChatManager and UTGChatUtil files

Author: laileni-aws

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

@@ -269,12 +269,10 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 }
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = true,
-                    promptInputProgress = if (session.listOfTestGenerationJobId.size == 1) {
-                        testGenProgressField(progressRate)
-                    } else {
-                        createProgressField("testgen.progressbar.fixing_test_cases")
+                    promptInputProgress = when (session.listOfTestGenerationJobId.size) {
+                        1 -> testGenProgressField(progressRate)
+                        else -> createProgressField("testgen.progressbar.fixing_test_cases")
                     }
-
                 )
             }
             throwIfCancelled(session)

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

@@ -571,11 +571,10 @@ class CodeTestChatController(
                     session.charsOfCodeGenerated = charDifference.coerceAtLeast(0)
                     session.latencyOfTestGeneration = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
                     UiTelemetry.click(
-                        null as Project?,
-                        if (session.listOfTestGenerationJobId.size == 1) {
-                            "unitTestGeneration_viewDiff"
-                        } else {
-                            "unitTestGeneration_viewDiff_Iteration"
+                        context.project,
+                        when (session.listOfTestGenerationJobId.size) {
+                            1 -> "unitTestGeneration_viewDiff"
+                            else -> "unitTestGeneration_viewDiff_Iteration"
                         }
                     )
 
@@ -646,11 +645,10 @@ class CodeTestChatController(
                 }
 
                 UiTelemetry.click(
-                    null as Project?,
-                    if (session.listOfTestGenerationJobId.size == 1) {
-                        "unitTestGeneration_acceptDiff"
-                    } else {
-                        "unitTestGeneration_acceptDiff_Iteration"
+                    context.project,
+                    when (session.listOfTestGenerationJobId.size) {
+                        1 -> "unitTestGeneration_acceptDiff"
+                        else -> "unitTestGeneration_acceptDiff_Iteration"
                     }
                 )
 
@@ -889,11 +887,10 @@ class CodeTestChatController(
                         testGenerationEventResponse.responseMetadata().requestId()}"
                 }
                 UiTelemetry.click(
-                    null as Project?,
-                    if (session.listOfTestGenerationJobId.size == 1) {
-                        "unitTestGeneration_rejectDiff"
-                    } else {
-                        "unitTestGeneration_rejectDiff_Iteration"
+                    context.project,
+                    when (session.listOfTestGenerationJobId.size) {
+                        1 -> "unitTestGeneration_rejectDiff"
+                        else -> "unitTestGeneration_rejectDiff_Iteration"
                     }
                 )
                 if (session.listOfTestGenerationJobId.size == 1) {
@@ -1164,7 +1161,7 @@ class CodeTestChatController(
                 return
             }
             "stop_fixing_test_cases" -> {
-                UiTelemetry.click(null as Project?, "unitTestGeneration_cancelFixingTest")
+                UiTelemetry.click(context.project, "unitTestGeneration_cancelFixingTest")
                 session.isGeneratingTests = false
                 return
             }

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

@@ -14,6 +14,7 @@ import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.ui.content.impl.ContentImpl
@@ -137,7 +138,7 @@ fun runBuildOrTestCommand(
     // Find the nearest Gradle root directory
     var packageRoot: File? = testFileAbsolutePath.parentFile
     var foundGradleRoot = false
-    while (packageRoot != null && packageRoot != projectRoot) {
+    while (packageRoot != null && !FileUtil.filesEqual(packageRoot, projectRoot)) {
         if (File(packageRoot, "settings.gradle.kts").exists() || File(packageRoot, "build.gradle.kts").exists() ||
             File(packageRoot, "settings.gradle").exists() || File(packageRoot, "build.gradle").exists()
         ) {