Fix broken summaries JavaDoc rendering #1605 (#1767)

Fix ternary return line alignment

Author: sofurihafe

utbot-sample/src/main/java/org/utbot/examples/controlflow/Conditions.java

@@ -1,6 +1,21 @@
 package org.utbot.examples.controlflow;
 
 public class Conditions {
+
+    /**
+     * This Doc is here in order to check whether the summaries and display names are rendered correctly.
+     * Had not in hours of peace,
+     * It learned to lightly look on life.
+     *
+     * @param a some long value
+     * @param b some int value
+     * @return the result you won't expect.
+     */
+    public int returnCastFromTernaryOperator(long a, int b) {
+        a = a % b;
+        return (int) (a < 0 ? a + b : a);
+    }
+
     public int simpleCondition(boolean condition) {
         if (condition) {
             return 1;

utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt

@@ -51,4 +51,49 @@ class SummaryConditionsTest : SummaryTestCaseGeneratorTest(
 
         summaryCheck(method, mockStrategy, coverage, summaryKeys, methodNames, displayNames)
     }
+
+    @Test
+    fun testReturnCastFromTernaryOperator() {
+        val summary1 = "@utbot.classUnderTest {@link Conditions}\n" +
+                "@utbot.methodUnderTest {@link org.utbot.examples.controlflow.Conditions#returnCastFromTernaryOperator(long,int)}\n" +
+                "@utbot.returnsFrom {@code return (int) (a < 0 ? a + b : a);}\n"
+        val summary2 = "@utbot.classUnderTest {@link Conditions}\n" +
+                "@utbot.methodUnderTest {@link org.utbot.examples.controlflow.Conditions#returnCastFromTernaryOperator(long,int)}\n" +
+                "@utbot.returnsFrom {@code return (int) (a < 0 ? a + b : a);}\n"
+        val summary3 = "@utbot.classUnderTest {@link Conditions}\n" +
+                "@utbot.methodUnderTest {@link org.utbot.examples.controlflow.Conditions#returnCastFromTernaryOperator(long,int)}\n" +
+                "@utbot.throwsException {@link java.lang.ArithmeticException} in: a = a % b;\n"
+
+        val methodName1 = "testReturnCastFromTernaryOperator_A0aba"
+        val methodName2 = "testReturnCastFromTernaryOperator_A0aba_1"
+        val methodName3 = "testReturnCastFromTernaryOperator_ThrowArithmeticException"
+
+        val displayName1 = "return (int) (a < 0 ? a + b : a) : False -> return (int) (a < 0 ? a + b : a)"
+        val displayName2 = "return (int) (a < 0 ? a + b : a) : True -> return (int) (a < 0 ? a + b : a)"
+        val displayName3 = "a = a % b -> ThrowArithmeticException"
+
+        val summaryKeys = listOf(
+            summary1,
+            summary2,
+            summary3
+        )
+
+        val displayNames = listOf(
+            displayName1,
+            displayName2,
+            displayName3
+        )
+
+        val methodNames = listOf(
+            methodName1,
+            methodName2,
+            methodName3
+        )
+
+        val method = Conditions::returnCastFromTernaryOperator
+        val mockStrategy = MockStrategyApi.NO_MOCKS
+        val coverage = DoNotCalculate
+
+        summaryCheck(method, mockStrategy, coverage, summaryKeys, methodNames, displayNames)
+    }
 }

utbot-summary/src/main/kotlin/org/utbot/summary/ast/JimpleToASTMap.kt

@@ -188,9 +188,9 @@ class JimpleToASTMap(stmts: Iterable<Unit>, methodDeclaration: MethodDeclaration
         val stmts = stmtToASTNode.keys.toTypedArray()
         for (nonAlignedReturn in nonAlignedReturns) {
             val index = stmts.indexOf(nonAlignedReturn)
-            if (index - 1 >= 0 && stmts[index - 1] is JIfStmt) {
-                stmtToASTNode[nonAlignedReturn] = stmtToASTNode[stmts[index - 1]]
-            }
+            val ternaryIfStmtIndex = stmts.indexOfLast { it is JIfStmt && stmts.indexOf(it) <= index }
+
+            stmtToASTNode[nonAlignedReturn] = stmtToASTNode[stmts[ternaryIfStmtIndex]]
         }
     }