Splitting improved

Author: EgorkaKulikov

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

@@ -29,6 +29,7 @@ import org.utbot.framework.plugin.api.util.isPrimitive
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.longClassId
 import org.utbot.framework.plugin.api.util.method
+import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.primitiveTypeJvmNameOrNull
 import org.utbot.framework.plugin.api.util.shortClassId
 import org.utbot.framework.plugin.api.util.toReferenceTypeBytecodeSignature
@@ -98,26 +99,46 @@ data class UtMethodTestSet(
     val clustersInfo: List<Pair<UtClusterInfo?, IntRange>> = listOf(null to executions.indices)
 )
 
-data class CgMethodTestSet internal constructor(
+data class CgMethodTestSet private constructor(
     val executableId: ExecutableId,
-    val executions: List<UtExecution> = emptyList(),
     val jimpleBody: JimpleBody? = null,
     val errors: Map<String, Int> = emptyMap(),
-    val clustersInfo: List<Pair<UtClusterInfo?, IntRange>> = listOf(null to executions.indices)
+    val clustersInfo: List<Pair<UtClusterInfo?, IntRange>>,
 ) {
+    var executions: List<UtExecution> = emptyList()
+        private set
+
     constructor(from: UtMethodTestSet) : this(
         from.method.callable.executableId,
-        from.executions,
         from.jimpleBody,
         from.errors,
         from.clustersInfo
-    )
-}
+    ) {
+        executions = from.executions
+    }
 
-fun CgMethodTestSet.substituteExecutions(executions: List<UtExecution>): CgMethodTestSet {
-    return CgMethodTestSet(this.executableId, executions, this.jimpleBody, this.errors, this.clustersInfo)
+    /**
+     * Splits [CgMethodTestSet] into separate test sets having
+     * unique result model [ClassId] in each subset.
+     */
+    fun splitExecutionsByResult() : List<CgMethodTestSet> {
+        val executionsByResult: Map<ClassId, List<UtExecution>> =
+            if (executions.any { it.result is UtExecutionSuccess })
+                executions
+                    .filter { it.result is UtExecutionSuccess }
+                    .groupBy { (it.result as UtExecutionSuccess).model.classId }
+            else {
+                mapOf(objectClassId to executions)
+            }
+
+        return executionsByResult.map{ (_, executions) -> substituteExecutions(executions) }
+    }
+
+    private fun substituteExecutions(newExecutions: List<UtExecution>): CgMethodTestSet =
+        this.copy().apply { executions = newExecutions }
 }
 
+
 data class Step(
     val stmt: Stmt,
     val depth: Int,

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt

@@ -26,9 +26,7 @@ import org.utbot.framework.codegen.model.visitor.importUtilMethodDependencies
 import org.utbot.framework.plugin.api.CgMethodTestSet
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.MethodId
-import org.utbot.framework.plugin.api.UtExecutionSuccess
 import org.utbot.framework.plugin.api.UtMethodTestSet
-import org.utbot.framework.plugin.api.substituteExecutions
 import org.utbot.framework.plugin.api.util.description
 import org.utbot.framework.plugin.api.util.kClass
 import kotlin.reflect.KClass
@@ -85,7 +83,7 @@ internal class CgTestClassConstructor(val context: CgContext) :
             return null
         }
 
-        val (methodUnderTest, executions, _, _, clustersInfo) = testSet
+        val (methodUnderTest, _, _, clustersInfo) = testSet
         val regions = mutableListOf<CgRegion<CgMethod>>()
         val requiredFields = mutableListOf<CgParameterDeclaration>()
 
@@ -96,7 +94,7 @@ internal class CgTestClassConstructor(val context: CgContext) :
                     emptyLineIfNeeded()
                     for (i in executionIndices) {
                         runCatching {
-                            currentTestCaseTestMethods += methodConstructor.createTestMethod(methodUnderTest, executions[i])
+                            currentTestCaseTestMethods += methodConstructor.createTestMethod(methodUnderTest, testSet.executions[i])
                         }.onFailure { e -> processFailure(testSet, e) }
                     }
                     val clusterHeader = clusterSummary?.header
@@ -109,28 +107,8 @@ internal class CgTestClassConstructor(val context: CgContext) :
                 }
             }
             ParametrizedTestSource.PARAMETRIZE -> {
-                val groupedExecutions = executions
-                    .filter { it.result is UtExecutionSuccess }
-                    .groupBy { (it.result as UtExecutionSuccess).model.classId }
-
-                if (groupedExecutions.isEmpty()) {
-                    processParametrizedTestSet(
-                        testSet,
-                        requiredFields,
-                        regions,
-                        methodUnderTest,
-                    )
-                } else {
-                    for (executionsGroup in groupedExecutions.values) {
-                        val testSet = testSet.substituteExecutions(executionsGroup)
-
-                        processParametrizedTestSet(
-                            testSet,
-                            requiredFields,
-                            regions,
-                            methodUnderTest,
-                        )
-                    }
+                for (currentTestSet in testSet.splitExecutionsByResult()) {
+                    processParametrizedTestSet(currentTestSet, requiredFields, regions, methodUnderTest)
                 }
             }
         }