Add another way to find the last line (#460)

mmvpm · mmvpm · commit cc43bc340958 · 2022-07-11T16:12:23.000+03:00
diff --git a/utbot-framework/src/main/kotlin/org/utbot/sarif/DataClasses.kt b/utbot-framework/src/main/kotlin/org/utbot/sarif/DataClasses.kt
@@ -156,8 +156,8 @@ data class SarifRegion(
          */
         fun withStartLine(text: String, startLine: Int): SarifRegion {
             val neededLine = text.split('\n').getOrNull(startLine - 1) // to zero-based
-            val startColumn = neededLine?.let {
-                neededLine.takeWhile { it.toString().isBlank() }.length + 1 // to one-based
+            val startColumn = neededLine?.run {
+                takeWhile { it.toString().isBlank() }.length + 1 // to one-based
             }
             return SarifRegion(startLine = startLine, startColumn = startColumn)
         }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt b/utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt
@@ -66,16 +66,13 @@ class SarifReport(
      */
     private val relatedLocationId = 1 // for attaching link to generated test in related locations
 
-    private fun shouldProcessUncheckedException(result: UtExecutionResult) = (result is UtImplicitlyThrownException)
-            || ((result is UtOverflowFailure) && UtSettings.treatOverflowAsError)
-
     private fun constructSarif(): Sarif {
         val sarifResults = mutableListOf<SarifResult>()
         val sarifRules = mutableSetOf<SarifRule>()
 
         for (testCase in testCases) {
             for (execution in testCase.executions) {
-                if (shouldProcessUncheckedException(execution.result)) {
+                if (shouldProcessExecutionResult(execution.result)) {
                     val (sarifResult, sarifRule) = processUncheckedException(
                         method = testCase.method,
                         utExecution = execution,
@@ -144,7 +141,7 @@ class SarifReport(
         if (classFqn == null)
             return listOf()
         val sourceRelativePath = sourceFinding.getSourceRelativePath(classFqn)
-        val startLine = extractLineNumber(utExecution) ?: defaultLineNumber
+        val startLine = getLastLineNumber(utExecution) ?: defaultLineNumber
         val sourceCode = sourceFinding.getSourceFile(classFqn)?.readText() ?: ""
         val sourceRegion = SarifRegion.withStartLine(sourceCode, startLine)
         return listOf(
@@ -301,10 +298,24 @@ class SarifReport(
         return "..."
     }
 
-    private fun extractLineNumber(utExecution: UtExecution): Int? =
-        try {
+    /**
+     * Returns the number of the last line in the execution path.
+     */
+    private fun getLastLineNumber(utExecution: UtExecution): Int? {
+        val lastPathLine = try {
             utExecution.path.lastOrNull()?.stmt?.javaSourceStartLineNumber
         } catch (t: Throwable) {
             null
         }
+        // if for some reason we can't extract the last line from the path
+        val lastCoveredInstruction =
+            utExecution.coverage?.coveredInstructions?.lastOrNull()?.lineNumber
+        return lastPathLine ?: lastCoveredInstruction
+    }
+
+    private fun shouldProcessExecutionResult(result: UtExecutionResult): Boolean {
+        val implicitlyThrown = result is UtImplicitlyThrownException
+        val overflowFailure = result is UtOverflowFailure && UtSettings.treatOverflowAsError
+        return implicitlyThrown || overflowFailure
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,8 @@ data class SarifRegion(`
`156`	`156`	`*/`
`157`	`157`	`fun withStartLine(text: String, startLine: Int): SarifRegion {`
`158`	`158`	`val neededLine = text.split('\n').getOrNull(startLine - 1) // to zero-based`
`159`		`- val startColumn = neededLine?.let {`
`160`		`- neededLine.takeWhile { it.toString().isBlank() }.length + 1 // to one-based`
	`159`	`+ val startColumn = neededLine?.run {`
	`160`	`+ takeWhile { it.toString().isBlank() }.length + 1 // to one-based`
`161`	`161`	`}`
`162`	`162`	`return SarifRegion(startLine = startLine, startColumn = startColumn)`
`163`	`163`	`}`