Cleanup CgMethodTestSet class

Author: EgorkaKulikov

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

@@ -2,7 +2,6 @@ package org.utbot.framework.codegen.model.constructor
 
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ExecutableId
-import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.UtClusterInfo
 import org.utbot.framework.plugin.api.UtExecution
 import org.utbot.framework.plugin.api.UtExecutionFailure
@@ -12,51 +11,28 @@ import org.utbot.framework.plugin.api.UtSymbolicExecution
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.voidClassId
 import org.utbot.fuzzer.UtFuzzedExecution
-import soot.jimple.JimpleBody
 
 data class CgMethodTestSet constructor(
     val executableId: ExecutableId,
-    val jimpleBody: JimpleBody? = null,
     val errors: Map<String, Int> = emptyMap(),
     val clustersInfo: List<Pair<UtClusterInfo?, IntRange>>,
 ) {
     var executions: List<UtExecution> = emptyList()
         private set
 
-    constructor(from: UtMethodTestSet) : this(
-        from.method,
-        from.jimpleBody,
-        from.errors,
-        from.clustersInfo
-    ) {
+    constructor(from: UtMethodTestSet) : this(from.method, from.errors) {
         executions = from.executions
     }
+
     /**
-     * For JavaScript purposes.
+     * Constructor for JavaScript and Python purposes.
      */
     constructor(
         executableId: ExecutableId,
-        execs: List<UtExecution> = emptyList(),
-        errors: Map<String, Int> = emptyMap()
-    ) : this(
-        executableId,
-        null,
-        errors,
-        listOf(null to execs.indices)
-    ) {
-        executions = execs
-    }
-
-    constructor(
-        executableId: ExecutableId,
+        errors: Map<String, Int> = emptyMap(),
         executions: List<UtExecution> = emptyList(),
-    ) : this(
-        executableId,
-        null,
-        emptyMap(),
-
-        listOf(null to executions.indices)
-    ) {
+        clustersInfo: List<Pair<UtClusterInfo?, IntRange>> = listOf(null to executions.indices),
+    ) : this(executableId, errors, clustersInfo) {
         this.executions = executions
     }
 

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

@@ -173,7 +173,7 @@ open class CgTestClassConstructor(val context: CgContext) :
         testSet: CgMethodTestSet,
         regions: MutableList<CgRegion<CgMethod>>
     ) {
-        val (methodUnderTest, _, _, clustersInfo) = testSet
+        val (methodUnderTest, _, clustersInfo) = testSet
 
         for ((clusterSummary, executionIndices) in clustersInfo) {
             val currentTestCaseTestMethods = mutableListOf<CgTestMethod>()
@@ -208,7 +208,7 @@ open class CgTestClassConstructor(val context: CgContext) :
         testSet: CgMethodTestSet,
         regions: MutableList<CgRegion<CgMethod>>
     ) {
-        val (methodUnderTest, _, _, _) = testSet
+        val (methodUnderTest, _, _) = testSet
 
         for (preparedTestSet in testSet.prepareTestSetsForParameterizedTestGeneration()) {
             val dataProviderMethodName = nameGenerator.dataProviderMethodNameFor(preparedTestSet.executableId)

utbot-js/src/main/kotlin/api/JsTestGenerator.kt

@@ -162,9 +162,9 @@ class JsTestGenerator(
             )
         }
         val testSet = CgMethodTestSet(
-            execId,
-            testsForGenerator,
-            errorsForGenerator
+            executableId = execId,
+            errors = errorsForGenerator,
+            executions = testsForGenerator,
         )
         testSets += testSet
         paramNames[execId] = funcNode.parameters.map { it.name.toString() }

utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationProcessor.kt

@@ -187,8 +187,8 @@ object PythonTestGenerationProcessor {
                 val testCode = codegen.pythonGenerateAsStringWithTestReport(
                     notEmptyTests.map { testSet ->
                         CgMethodTestSet(
-                            methodIds[testSet.method] as ExecutableId,
-                            testSet.executions
+                            executableId = methodIds[testSet.method] as ExecutableId,
+                            executions = testSet.executions
                         )
                     },
                     allImports