Skip to content

Fix utbot inspection on inner classes #2000

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 2 commits into from
Mar 21, 2023
Merged

Fix utbot inspection on inner classes #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b921e26
Fix utbot inspection on inner classes
mmvpm Mar 21, 2023
150047f
Merge branch 'main' into ideaseeker/fix_inner_classes_inspection
Vassiliy-Kudryashov Mar 21, 2023
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
3 changes: 3 additions & 0 deletions utbot-framework/src/main/kotlin/org/utbot/sarif/DataClasses.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ data class Sarif(
.writerWithDefaultPrettyPrinter()
.writeValueAsString(this)

operator fun plus(other: Sarif): Sarif =
this.copy(runs = this.runs + other.runs)

@JsonIgnore
fun getAllResults(): List<SarifResult> =
runs.flatMap { it.results }
Expand Down
2 changes: 1 addition & 1 deletion utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SarifReport(
*/
fun mergeReports(reports: List<String>): String =
reports.fold(Sarif.empty()) { sarif: Sarif, report: String ->
sarif.copy(runs = sarif.runs + Sarif.fromJson(report).runs)
sarif + Sarif.fromJson(report)
}.toJson()

/**
Expand Down
5 changes: 3 additions & 2 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/sarif/SarifReportIdea.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ object SarifReportIdea {
IntelliJApiHelper.run(IntelliJApiHelper.Target.THREAD_POOL, indicator, "Save SARIF report for ${classId.name}") {
try {
val sarifReportAsJson = proc.writeSarif(reportFilePath, testSetsId, generatedTestsCode, sourceFinding)
val sarifReport = Sarif.fromJson(sarifReportAsJson)
srcClassPathToSarifReport[srcClassPath] = sarifReport
val newSarifReport = Sarif.fromJson(sarifReportAsJson)
val oldSarifReport = srcClassPathToSarifReport[srcClassPath] ?: Sarif.empty()
srcClassPathToSarifReport[srcClassPath] = oldSarifReport + newSarifReport
} catch (e: Exception) {
logger.error { e }
} finally {
Expand Down