Skip to content

Telemetry(amazonq): Discrepancy between NumOfUnitTestCasesGenerated with LinesGenerated and CharsGenerated #5254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 15, 2025
Merged

Telemetry(amazonq): Discrepancy between NumOfUnitTestCasesGenerated with LinesGenerated and CharsGenerated #5254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d099ca4
lint
Randall-Jiang Jan 11, 2025
da94667
Merge remote-tracking branch 'upstream/main'
Randall-Jiang Jan 13, 2025
6fa3c9d
fix the issue about the discrepancy between NumOfUnitTestCasesGenera…
Randall-Jiang Jan 13, 2025
420951f
fix format issue
Randall-Jiang Jan 13, 2025
1477564
remove print command
Randall-Jiang Jan 13, 2025
56816d2
Merge branch 'main' into dataMismatch
Randall-Jiang Jan 15, 2025
538cd54
Merge branch 'main' into dataMismatch
Randall-Jiang Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...c/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
try {
launchTestGenFlow(prompt, codeTestChatHelper, previousIterationContext, selectionRange)
} catch (e: Exception) {
// reset number of unitTestGenerated to null
session.numberOfUnitTestCasesGenerated = null
// Add an answer for displaying error message
val errorMessage = when {
e is CodeTestException &&
Expand Down
21 changes: 12 additions & 9 deletions ...ware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.intellij.diff.DiffManagerEx
import com.intellij.diff.requests.SimpleDiffRequest
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.guessProjectDir
Expand Down Expand Up @@ -473,16 +472,14 @@ class CodeTestChatController(
)
session.openedDiffFile = FileEditorManager.getInstance(context.project).selectedEditor?.file
ApplicationManager.getApplication().runReadAction {
generatedFileContent = getFileContentAtTestFilePath(
session.projectRoot,
session.testFileRelativePathToProjectRoot
)
val selectedFile = FileEditorManager.getInstance(context.project).selectedEditor?.file
selectedFileContent = selectedFile?.let {
FileDocumentManager.getInstance().getDocument(it)?.text
}.orEmpty()
generatedFileContent = getGeneratedFileContent(session)
}

selectedFileContent = getFileContentAtTestFilePath(
session.projectRoot,
session.testFileRelativePathToProjectRoot,
)

// Line difference calculation: linesOfCodeGenerated = number of lines in generated test file - number of lines in original test file
numberOfLinesGenerated = generatedFileContent.lines().size
numberOfLinesSelected = selectedFileContent.lines().size
Expand Down Expand Up @@ -1070,6 +1067,12 @@ class CodeTestChatController(
}
}

// Return generated test file content
private fun getGeneratedFileContent(session: Session): String {
val generateFileContent = session.generatedTestDiffs[session.testFileRelativePathToProjectRoot].toString()
return generateFileContent
}

/*
If shortAnswer has buildCommand, use it, if it doesn't hardcode it according to the user type(internal or not)
private fun getBuildCommand(tabId: String): String {
Expand Down
Loading