Generate separated parametrized tests for test sets with different result type

Author: sofurihafe

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

@@ -98,7 +98,7 @@ data class UtMethodTestSet(
     val clustersInfo: List<Pair<UtClusterInfo?, IntRange>> = listOf(null to executions.indices)
 )
 
-data class CgMethodTestSet private constructor(
+data class CgMethodTestSet internal constructor(
     val executableId: ExecutableId,
     val executions: List<UtExecution> = emptyList(),
     val jimpleBody: JimpleBody? = null,
@@ -114,6 +114,10 @@ data class CgMethodTestSet private constructor(
     )
 }
 
+fun CgMethodTestSet.substituteExecutions(executions: List<UtExecution>): CgMethodTestSet {
+    return CgMethodTestSet(this.executableId, executions, this.jimpleBody, this.errors, this.clustersInfo)
+}
+
 data class Step(
     val stmt: Stmt,
     val depth: Int,

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

@@ -26,7 +26,9 @@ 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
@@ -107,22 +109,29 @@ internal class CgTestClassConstructor(val context: CgContext) :
                 }
             }
             ParametrizedTestSource.PARAMETRIZE -> {
-                runCatching {
-                    val dataProviderMethodName = nameGenerator.dataProviderMethodNameFor(testSet.executableId)
-
-                    val parameterizedTestMethod =
-                        methodConstructor.createParameterizedTestMethod(testSet, dataProviderMethodName)
-
-                    requiredFields += parameterizedTestMethod.requiredFields
-
-                    cgDataProviderMethods +=
-                        methodConstructor.createParameterizedTestDataProvider(testSet, dataProviderMethodName)
-
-                    regions += CgSimpleRegion(
-                        "Parameterized test for method ${methodUnderTest.displayName}",
-                        listOf(parameterizedTestMethod),
+                val groupedExecutions = executions
+                    .filter { it.result is UtExecutionSuccess }
+                    .groupBy { (it.result as UtExecutionSuccess).model.classId }
+
+                if (groupedExecutions.isEmpty()) {
+                    processParametrizedTestSet(
+                        testSet,
+                        requiredFields,
+                        regions,
+                        methodUnderTest,
                     )
-                }.onFailure { error -> processFailure(testSet, error) }
+                } else {
+                    for (executionsGroup in groupedExecutions.values) {
+                        val testSet = testSet.substituteExecutions(executionsGroup)
+
+                        processParametrizedTestSet(
+                            testSet,
+                            requiredFields,
+                            regions,
+                            methodUnderTest,
+                        )
+                    }
+                }
             }
         }
 
@@ -141,6 +150,30 @@ internal class CgTestClassConstructor(val context: CgContext) :
             .merge(failure.description, 1, Int::plus)
     }
 
+    private fun processParametrizedTestSet(
+        testSet: CgMethodTestSet,
+        requiredFields: MutableList<CgParameterDeclaration>,
+        regions: MutableList<CgRegion<CgMethod>>,
+        methodUnderTest: ExecutableId,
+    ) {
+        runCatching {
+            val dataProviderMethodName = nameGenerator.dataProviderMethodNameFor(testSet.executableId)
+
+            val parameterizedTestMethod =
+                methodConstructor.createParameterizedTestMethod(testSet, dataProviderMethodName)
+
+            requiredFields += parameterizedTestMethod.requiredFields
+
+            cgDataProviderMethods +=
+                methodConstructor.createParameterizedTestDataProvider(testSet, dataProviderMethodName)
+
+            regions += CgSimpleRegion(
+                "Parameterized test for method ${methodUnderTest.displayName}",
+                listOf(parameterizedTestMethod),
+            )
+        }.onFailure { error -> processFailure(testSet, error) }
+    }
+
     // TODO: collect imports of util methods
     private fun createUtilMethods(): List<CgUtilMethod> {
         val utilMethods = mutableListOf<CgUtilMethod>()

utbot-framework/src/test/kotlin/org/utbot/framework/codegen/TestCodeGeneratorPipeline.kt

@@ -129,10 +129,12 @@ class TestCodeGeneratorPipeline(private val testFrameworkConfiguration: TestFram
                     "Errors regions has been generated: $errorText"
                 }
 
-                require(generatedMethodsCount == expectedNumberOfGeneratedMethods) {
-                    "Something went wrong during the code generation for ${classUnderTest.simpleName}. " +
-                            "Expected to generate $expectedNumberOfGeneratedMethods test methods, " +
-                            "but got only $generatedMethodsCount"
+                if (parametrizedTestSource != ParametrizedTestSource.PARAMETRIZE) {
+                    require(generatedMethodsCount == expectedNumberOfGeneratedMethods) {
+                        "Something went wrong during the code generation for ${classUnderTest.simpleName}. " +
+                                "Expected to generate $expectedNumberOfGeneratedMethods test methods, " +
+                                "but got only $generatedMethodsCount"
+                    }
                 }
             }.onFailure {
                 val classes = listOf(classPipeline).retrieveClasses()