From 3a48e4843cf67b6abf5be3affad5101bcd6e03a3 Mon Sep 17 00:00:00 2001
From: amandelpie <amandelpie@gmail.com>
Date: Wed, 6 Jul 2022 11:57:38 +0300
Subject: [PATCH 1/2] Disabled clustering of tests generated by Fuzzer

---
 .../kotlin/org/utbot/summary/Summarization.kt | 36 +++++++++++++------
 .../kotlin/org/utbot/summary/TagGenerator.kt  | 11 +++---
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt b/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt
index dfc0547821..47138fd0ff 100644
--- a/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt
+++ b/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt
@@ -68,12 +68,32 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
             }
             return listOf(UtExecutionCluster(UtClusterInfo(), testCase.executions))
         }
+
+
+
         // init
         val sootToAST = sootToAST(testCase)
         val jimpleBody = testCase.jimpleBody
         val updatedExecutions = mutableListOf<UtExecution>()
         val clustersToReturn = mutableListOf<UtExecutionCluster>()
 
+        // TODO: Now it excludes tests generated by Fuzzer, handle it properly, related to the https://github.com/UnitTestBot/UTBotJava/issues/428
+        if (testCase.executions.any { it.path.isEmpty() }) {
+            testCase.executions.filter { it.path.isEmpty() }.forEach {
+                logger.info {
+                    "The path for test ${it.testMethodName} " +
+                            "for method ${testCase.method.clazz.qualifiedName} is empty and summaries could not be generated."
+                }
+            }
+
+            clustersToReturn.add(
+                UtExecutionCluster(
+                    UtClusterInfo(),
+                    testCase.executions.filter { it.path.isEmpty() }
+                )
+            )
+        }
+
         // analyze
         if (jimpleBody != null && sootToAST != null) {
             val methodUnderTest = jimpleBody.method
@@ -83,9 +103,9 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
             for (clusterTraceTags in clusteredTags) {
                 val clusterHeader = clusterTraceTags.summary.takeIf { GENERATE_CLUSTER_COMMENTS }
                 val clusterContent = if (
-                    GENERATE_CLUSTER_COMMENTS && clusterTraceTags.isSuccessful //add only for successful executions
-                    && numberOfSuccessfulClusters > 1 //there is more than one successful execution
-                    && clusterTraceTags.traceTags.size > 1 //add if there is more than 1 execution
+                    GENERATE_CLUSTER_COMMENTS && clusterTraceTags.isSuccessful // add only for successful executions
+                    && numberOfSuccessfulClusters > 1 // there is more than one successful execution
+                    && clusterTraceTags.traceTags.size > 1 // add if there is more than 1 execution
                 ) {
                     SimpleClusterCommentBuilder(clusterTraceTags.commonStepsTraceTag, sootToAST)
                             .buildString(methodUnderTest)
@@ -113,20 +133,14 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
                         val nameIndex = namesCounter.getOrPut(name) { 0 }
                         namesCounter[name] = nameIndex + 1
                         updatedExecutions += traceTags.execution
-                        if (GENERATE_DISPLAY_NAMES
-                            // todo extract these options into more suitable place (https://github.com/UnitTestBot/UTBotJava/issues/359)
-                            // do not rewrite display name if already set
-                            && traceTags.execution.displayName.isNullOrBlank()) {
+                        if (GENERATE_DISPLAY_NAMES) {
                             if (!GENERATE_DISPLAYNAME_FROM_TO_STYLE) {
                                 traceTags.execution.displayName = displayName
                             } else {
                                 traceTags.execution.displayName = fromToName
                             }
                         }
-                        if (GENERATE_NAMES
-                            // todo extract these options into more suitable place (https://github.com/UnitTestBot/UTBotJava/issues/359)
-                            // do not rewrite display name if already set
-                            && traceTags.execution.testMethodName.isNullOrBlank()) {
+                        if (GENERATE_NAMES) {
                             traceTags.execution.testMethodName = name
                             if (nameIndex != 0) traceTags.execution.testMethodName += "_$nameIndex"
                         }
diff --git a/utbot-summary/src/main/kotlin/org/utbot/summary/TagGenerator.kt b/utbot-summary/src/main/kotlin/org/utbot/summary/TagGenerator.kt
index b7d6caffce..862d2a261e 100644
--- a/utbot-summary/src/main/kotlin/org/utbot/summary/TagGenerator.kt
+++ b/utbot-summary/src/main/kotlin/org/utbot/summary/TagGenerator.kt
@@ -29,10 +29,10 @@ class TagGenerator {
                 mUniqueness.splitSteps()
             }
 
-            //intersections of steps ONLY in successful clusters
+            // intersections of steps ONLY in successful clusters
             var stepsIntersections = listOf<Step>()
 
-            //we only want to find intersections if there is more than one successful execution
+            // we only want to find intersections if there is more than one successful execution
             if (numberOfSuccessfulClusters > 1 && REMOVE_INTERSECTIONS) {
                 val commonStepsInSuccessfulEx = listOfSplitSteps
                     .filterIndexed { i, _ -> clusteredExecutions[i] is SuccessfulExecutionCluster } //search only in successful
@@ -46,7 +46,7 @@ class TagGenerator {
                 }
             }
 
-            //for every cluster and step add TraceTagCluster
+            // for every cluster and step add TraceTagCluster
             clusteredExecutions.zip(listOfSplitSteps) { cluster, splitSteps ->
                 val commonStepsInCluster =
                     if (stepsIntersections.isNotEmpty() && numberOfSuccessfulClusters > 1) {
@@ -70,11 +70,10 @@ class TagGenerator {
                     )
                 )
             }
-        }//clusteredExecutions should not be empty!
+        } // clusteredExecutions should not be empty!
 
         return traceTagClusters
     }
-
 }
 
 /**
@@ -95,7 +94,7 @@ private fun generateExecutionTags(executions: List<UtExecution>, splitSteps: Spl
  * @return clustered executions
  */
 private fun toClusterExecutions(testCase: UtTestCase): List<ExecutionCluster> {
-    val methodExecutions = testCase.executions
+    val methodExecutions = testCase.executions.filter { it.path.isNotEmpty() } // TODO: Now it excludes tests generated by Fuzzer, handle it properly, related to the https://github.com/UnitTestBot/UTBotJava/issues/428
     val clusters = mutableListOf<ExecutionCluster>()
     val commentPostfix = "for method ${testCase.method.displayName}"
 

From bce94d99a3662802be1baacbc2225ac665eaabf3 Mon Sep 17 00:00:00 2001
From: amandelpie <amandelpie@gmail.com>
Date: Wed, 6 Jul 2022 12:42:37 +0300
Subject: [PATCH 2/2] Refactored the multiple calls

---
 .../main/kotlin/org/utbot/summary/Summarization.kt  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt b/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt
index 47138fd0ff..fb473101e5 100644
--- a/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt
+++ b/utbot-summary/src/main/kotlin/org/utbot/summary/Summarization.kt
@@ -69,8 +69,6 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
             return listOf(UtExecutionCluster(UtClusterInfo(), testCase.executions))
         }
 
-
-
         // init
         val sootToAST = sootToAST(testCase)
         val jimpleBody = testCase.jimpleBody
@@ -78,8 +76,10 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
         val clustersToReturn = mutableListOf<UtExecutionCluster>()
 
         // TODO: Now it excludes tests generated by Fuzzer, handle it properly, related to the https://github.com/UnitTestBot/UTBotJava/issues/428
-        if (testCase.executions.any { it.path.isEmpty() }) {
-            testCase.executions.filter { it.path.isEmpty() }.forEach {
+        val executionsProducedByFuzzer = getExecutionsWithEmptyPath(testCase)
+
+        if (executionsProducedByFuzzer.isNotEmpty()) {
+            executionsProducedByFuzzer.forEach {
                 logger.info {
                     "The path for test ${it.testMethodName} " +
                             "for method ${testCase.method.clazz.qualifiedName} is empty and summaries could not be generated."
@@ -89,7 +89,7 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
             clustersToReturn.add(
                 UtExecutionCluster(
                     UtClusterInfo(),
-                    testCase.executions.filter { it.path.isEmpty() }
+                    executionsProducedByFuzzer
                 )
             )
         }
@@ -164,6 +164,9 @@ class Summarization(val sourceFile: File?, val invokeDescriptions: List<InvokeDe
         return listOf(UtExecutionCluster(UtClusterInfo(), testCase.executions))
     }
 
+    private fun getExecutionsWithEmptyPath(testCase: UtTestCase) =
+        testCase.executions.filter { it.path.isEmpty() }
+
     /*
     * asts of invokes also included
     * */