Skip to content

Commit 79d90f6

Browse files
committed
Fix utbot inspection on inner classes (#2000)
1 parent 94f7a74 commit 79d90f6

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

utbot-framework/src/main/kotlin/org/utbot/sarif/DataClasses.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ data class Sarif(
4747
.writerWithDefaultPrettyPrinter()
4848
.writeValueAsString(this)
4949

50+
operator fun plus(other: Sarif): Sarif =
51+
this.copy(runs = this.runs + other.runs)
52+
5053
@JsonIgnore
5154
fun getAllResults(): List<SarifResult> =
5255
runs.flatMap { it.results }

utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SarifReport(
2929
*/
3030
fun mergeReports(reports: List<String>): String =
3131
reports.fold(Sarif.empty()) { sarif: Sarif, report: String ->
32-
sarif.copy(runs = sarif.runs + Sarif.fromJson(report).runs)
32+
sarif + Sarif.fromJson(report)
3333
}.toJson()
3434

3535
/**

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/sarif/SarifReportIdea.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ object SarifReportIdea {
4444
IntelliJApiHelper.run(IntelliJApiHelper.Target.THREAD_POOL, indicator, "Save SARIF report for ${classId.name}") {
4545
try {
4646
val sarifReportAsJson = proc.writeSarif(reportFilePath, testSetsId, generatedTestsCode, sourceFinding)
47-
val sarifReport = Sarif.fromJson(sarifReportAsJson)
48-
srcClassPathToSarifReport[srcClassPath] = sarifReport
47+
val newSarifReport = Sarif.fromJson(sarifReportAsJson)
48+
val oldSarifReport = srcClassPathToSarifReport[srcClassPath] ?: Sarif.empty()
49+
srcClassPathToSarifReport[srcClassPath] = oldSarifReport + newSarifReport
4950
} catch (e: Exception) {
5051
logger.error { e }
5152
} finally {

0 commit comments

Comments
 (0)